am 33783a96: am 500f7811: Merge "Fix the ordering of extra values in the PI." into lmp-mr1-dev

* commit '33783a962f3336400d12cd739ae33b9452ea14be':
  Fix the ordering of extra values in the PI.
This commit is contained in:
Jeremy Joslin
2014-12-01 20:01:02 +00:00
committed by Android Git Automerger

View File

@@ -3768,8 +3768,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
int notificationType) {
if (notificationType == ConnectivityManager.CALLBACK_AVAILABLE) {
Intent intent = new Intent();
intent.putExtra(ConnectivityManager.EXTRA_NETWORK, nri.request);
intent.putExtra(ConnectivityManager.EXTRA_NETWORK_REQUEST, networkAgent.network);
intent.putExtra(ConnectivityManager.EXTRA_NETWORK, networkAgent.network);
intent.putExtra(ConnectivityManager.EXTRA_NETWORK_REQUEST, nri.request);
sendIntent(nri.mPendingIntent, intent);
}
// else not handled