joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Revert "ConnectivityManager: no double NetworkCallback registration" because oit caused regressions http://b/35955593, http://b/35921499." am: 704520c392 am: e8a3a43193

Browse source 
am: 22d4258a75

Change-Id: I8e66e223003a38735b707d21d7bedb19170b1937
This commit is contained in:
Hugo Benichi 2017-03-06 12:45:10 +00:00 • committed by android-build-merger
commit ca809f4260
1 changed files with 10 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2913,14 +2913,11 @@ public class ConnectivityManager {
if (callback == null) {
throw new IllegalArgumentException("null NetworkCallback");
}
if ((need == null) && (action != REQUEST)) {
if (need == null && action != REQUEST) {
throw new IllegalArgumentException("null NetworkCapabilities");
}
final int targetSdk = mContext.getApplicationInfo().targetSdkVersion;
if ((targetSdk > VERSION_CODES.N_MR1) && (callback.networkRequest != null)) {
// http://b/20701525
throw new IllegalArgumentException("NetworkCallback already registered");
}
// TODO: throw an exception if callback.networkRequest is not null.
// http://b/20701525
final NetworkRequest request;
try {
synchronized(sCallbacks) {