commit 425aacdce000e00b52578b9b4fdf6b0952db5383
author Lorenzo Colitti <lorenzo@google.com> Tue Dec 02 06:47:49 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 02 06:47:52 2014 +0000
tree 83f1aba17a31d9138c0967a2039fd046cd86ee66
parent de802a29a1fa3c714957b3b1babbb2af99eaf48c
parent 20068c2d12dbccb7a57fcfca9ec63460268f65d2

Merge "Only use mDefaultDns if the network claims to offer Internet" into lmp-mr1-dev

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 9f86d9a..5eec0b7 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -3775,8 +3775,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