diff options
| author | 2014-12-01 19:42:24 +0000 | |
|---|---|---|
| committer | 2014-12-01 19:42:24 +0000 | |
| commit | 33783a962f3336400d12cd739ae33b9452ea14be (patch) | |
| tree | 78279f574e9ebfafa6a028d121660f13cbb1f048 | |
| parent | 53644fb5acd394b875723b6483215ba837f8e6c0 (diff) | |
| parent | 500f781110dee5aad53410e9ef9b4003123c6981 (diff) | |
am 500f7811: Merge "Fix the ordering of extra values in the PI." into lmp-mr1-dev
* commit '500f781110dee5aad53410e9ef9b4003123c6981':
Fix the ordering of extra values in the PI.
| -rw-r--r-- | services/core/java/com/android/server/ConnectivityService.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 8b3739dff5c9..2e64640033df 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -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 |