commit de802a29a1fa3c714957b3b1babbb2af99eaf48c
author Jeremy Joslin <jjoslin@google.com> Wed Nov 26 14:24:15 2014 -0800
committer Jeremy Joslin <jjoslin@google.com> Wed Nov 26 14:24:15 2014 -0800
tree 3fa6e8d4e7ecf38f1635884759a0ad9e1e1bcefb
parent 1d27e7d678b3d9ae03bf15ceb4979b133a92d693

Fix the ordering of extra values in the PI.

Bug: 18539720
Change-Id: I6bb69394b05923ca25bc1b4902bc2540a13812bd

services/core/java/com/android/server/ConnectivityService.java

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 8b3739d..2e64640 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -3768,8 +3768,8 @@
             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