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

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

Browse Source 
am: 704520c392

Change-Id: Ia0ae78f8406b81377491407cf5ef8ca339952def
This commit is contained in:
Hugo Benichi
2017-03-06 12:30:05 +00:00
committed by android-build-merger
parent e71290cc46 1d6742c945
commit e8a3a43193
2 changed files with 9 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2891,14 +2891,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) {