diff options
| author | Erik Kline <ek@google.com> | 2014-11-19 12:12:24 +0900 |
|---|---|---|
| committer | Erik Kline <ek@google.com> | 2014-11-20 13:16:31 +0900 |
| commit | 90e9307e8fa713081aeccd8f5f212c0f1255bd07 (patch) | |
| tree | 821a5ad88106c408b6d956906dfb6d018c94f96f /core/java/android | |
| parent | d4340f89f830e9caec3230cba01dfae79580d8aa (diff) | |
Rename EXTRA_NETWORK ConnectivityManager constants.
Per b/18414703:
s/\<EXTRA_NETWORK_REQUEST_NETWORK\>/EXTRA_NETWORK/g
s/\<EXTRA_NETWORK_REQUEST_NETWORK_REQUEST\>/EXTRA_NETWORK_REQUEST/g
Additionally, associated string values updated to:
android.net.extra.NETWORK
android.net.extra.NETWORK_REQUEST
Bug: 18414703
Change-Id: I7aeed2161829742affc666e835a97ce2c28356fe
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/net/ConnectivityManager.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index 1c9f4c68b0df..ec24ded3a43b 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 * <p> * 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 |