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

ConnectivityManager: no double NetworkCallback registration

Browse source 
Test: new test in ConnectivityManagerTest
Bug: 20701525
Change-Id: I205333d31d43e6e6c7fe704ce63b458065f345ce
This commit is contained in:
Hugo Benichi 2017-02-03 15:55:42 +09:00
commit ca4bf6edc3
1 changed files with 58 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2884,11 +2884,14 @@ 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");
}
// TODO: throw an exception if callback.networkRequest is not null.
// http://b/20701525
final int targetSdk = mContext.getApplicationInfo().targetSdkVersion;
if ((targetSdk > VERSION_CODES.N_MR1) && (callback.networkRequest != null)) {
// http://b/20701525
throw new IllegalArgumentException("NetworkCallback already registered");
}
final NetworkRequest request;
try {
synchronized(sCallbacks) {