LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 4e9ea5e9: Merge "Rename EXTRA_NETWORK ConnectivityManager constants." into lmp-mr1-dev

Browse Source 
automerge: dedd42a

* commit 'dedd42a2bdfafd6195d793949766d1c53f80ae51':
  Rename EXTRA_NETWORK ConnectivityManager constants.
This commit is contained in:
Erik Kline
2014-11-21 02:57:09 +00:00
committed by android-build-merger
parent 13b551e033 8a82621cdb
commit 398bd1e774
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/net/ConnectivityManager.java
View File

@@ -2381,15 +2381,14 @@ public class ConnectivityManager {
* successfully finding a network for the applications request. Retrieve it with * successfully finding a network for the applications request. Retrieve it with
* {@link android.content.Intent#getParcelableExtra(String)}. * {@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 * The lookup key for a {@link NetworkRequest} object included with the intent after
* successfully finding a network for the applications request. Retrieve it with * successfully finding a network for the applications request. Retrieve it with
* {@link android.content.Intent#getParcelableExtra(String)}. * {@link android.content.Intent#getParcelableExtra(String)}.
*/ */
public static final String EXTRA_NETWORK_REQUEST_NETWORK_REQUEST = public static final String EXTRA_NETWORK_REQUEST = "android.net.extra.NETWORK_REQUEST";
"networkRequestNetworkRequest";
/** /**
@@ -2405,8 +2404,8 @@ public class ConnectivityManager {
* <receiver> tag in an AndroidManifest.xml file * <receiver> tag in an AndroidManifest.xml file
* <p> * <p>
* The operation Intent is delivered with two extras, a {@link Network} typed * The operation Intent is delivered with two extras, a {@link Network} typed
* extra called {@link #EXTRA_NETWORK_REQUEST_NETWORK} and a {@link NetworkRequest} * extra called {@link #EXTRA_NETWORK} and a {@link NetworkRequest}
* typed extra called {@link #EXTRA_NETWORK_REQUEST_NETWORK_REQUEST} containing * typed extra called {@link #EXTRA_NETWORK_REQUEST} containing
* the original requests parameters. It is important to create a new, * the original requests parameters. It is important to create a new,
* {@link NetworkCallback} based request before completing the processing of the * {@link NetworkCallback} based request before completing the processing of the
* Intent to reserve the network or it will be released shortly after the Intent * Intent to reserve the network or it will be released shortly after the Intent

5
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -3839,9 +3839,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
int notificationType) { int notificationType) {
if (notificationType == ConnectivityManager.CALLBACK_AVAILABLE) { if (notificationType == ConnectivityManager.CALLBACK_AVAILABLE) {
Intent intent = new Intent(); Intent intent = new Intent();
intent.putExtra(ConnectivityManager.EXTRA_NETWORK_REQUEST_NETWORK, nri.request); intent.putExtra(ConnectivityManager.EXTRA_NETWORK, nri.request);
intent.putExtra(ConnectivityManager.EXTRA_NETWORK_REQUEST_NETWORK_REQUEST, intent.putExtra(ConnectivityManager.EXTRA_NETWORK_REQUEST, networkAgent.network);
networkAgent.network);
sendIntent(nri.mPendingIntent, intent); sendIntent(nri.mPendingIntent, intent);
} }
// else not handled // else not handled