From de802a29a1fa3c714957b3b1babbb2af99eaf48c Mon Sep 17 00:00:00 2001 From: Jeremy Joslin Date: Wed, 26 Nov 2014 14:24:15 -0800 Subject: [PATCH] Fix the ordering of extra values in the PI. Bug: 18539720 Change-Id: I6bb69394b05923ca25bc1b4902bc2540a13812bd --- .../core/java/com/android/server/ConnectivityService.java | 4 ++-- 1 file 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 8b3739dff5..2e64640033 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