OSDN Git Service

Fix the ordering of extra values in the PI.
authorJeremy Joslin <jjoslin@google.com>
Wed, 26 Nov 2014 22:24:15 +0000 (14:24 -0800)
committerJeremy Joslin <jjoslin@google.com>
Wed, 26 Nov 2014 22:24:15 +0000 (14:24 -0800)
Bug: 18539720
Change-Id: I6bb69394b05923ca25bc1b4902bc2540a13812bd

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

index 8b3739d..2e64640 100644 (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