From 8a82621cdbca09b5eff38e8e31067be53f01ef5f Mon Sep 17 00:00:00 2001 From: Erik Kline Date: Wed, 19 Nov 2014 12:12:24 +0900 Subject: [PATCH] Rename EXTRA_NETWORK ConnectivityManager constants. Per b/18414703: s/\/EXTRA_NETWORK/g s/\/EXTRA_NETWORK_REQUEST/g Additionally, associated string values updated to: android.net.extra.NETWORK android.net.extra.NETWORK_REQUEST Bug: 18414703 Change-Id: I7aeed2161829742affc666e835a97ce2c28356fe --- core/java/android/net/ConnectivityManager.java | 9 ++++----- .../java/com/android/server/ConnectivityService.java | 5 ++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index 1c9f4c68b0..ec24ded3a4 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -2381,15 +2381,14 @@ public class ConnectivityManager { * successfully finding a network for the applications request. Retrieve it with * {@link android.content.Intent#getParcelableExtra(String)}. */ - public static final String EXTRA_NETWORK_REQUEST_NETWORK = "networkRequestNetwork"; + public static final String EXTRA_NETWORK = "android.net.extra.NETWORK"; /** * The lookup key for a {@link NetworkRequest} object included with the intent after * successfully finding a network for the applications request. Retrieve it with * {@link android.content.Intent#getParcelableExtra(String)}. */ - public static final String EXTRA_NETWORK_REQUEST_NETWORK_REQUEST = - "networkRequestNetworkRequest"; + public static final String EXTRA_NETWORK_REQUEST = "android.net.extra.NETWORK_REQUEST"; /** @@ -2405,8 +2404,8 @@ public class ConnectivityManager { * <receiver> tag in an AndroidManifest.xml file *

* The operation Intent is delivered with two extras, a {@link Network} typed - * extra called {@link #EXTRA_NETWORK_REQUEST_NETWORK} and a {@link NetworkRequest} - * typed extra called {@link #EXTRA_NETWORK_REQUEST_NETWORK_REQUEST} containing + * extra called {@link #EXTRA_NETWORK} and a {@link NetworkRequest} + * typed extra called {@link #EXTRA_NETWORK_REQUEST} containing * the original requests parameters. It is important to create a new, * {@link NetworkCallback} based request before completing the processing of the * Intent to reserve the network or it will be released shortly after the Intent diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 17889eae77..c26df02840 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -3839,9 +3839,8 @@ public class ConnectivityService extends IConnectivityManager.Stub int notificationType) { if (notificationType == ConnectivityManager.CALLBACK_AVAILABLE) { Intent intent = new Intent(); - intent.putExtra(ConnectivityManager.EXTRA_NETWORK_REQUEST_NETWORK, nri.request); - intent.putExtra(ConnectivityManager.EXTRA_NETWORK_REQUEST_NETWORK_REQUEST, - networkAgent.network); + intent.putExtra(ConnectivityManager.EXTRA_NETWORK, nri.request); + intent.putExtra(ConnectivityManager.EXTRA_NETWORK_REQUEST, networkAgent.network); sendIntent(nri.mPendingIntent, intent); } // else not handled