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

Merge "Simplify unregister logic for Connectivity Diagnostics callbacks." am: bf4f1d9e98 am: b51ef5b7d7

Browse Source 
Change-Id: I50aa039a875be2fcbcb0d82c384d4cbd585a951d
This commit is contained in:
Cody Kesting
2020-03-31 20:45:06 +00:00
committed by Automerger Merge Worker
parent 84cfd6c6e4 b51ef5b7d7
commit f46558e41e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7892,12 +7892,14 @@ public class ConnectivityService extends IConnectivityManager.Stub
ensureRunningOnConnectivityServiceThread();
final IBinder iCb = cb.asBinder();
if (!mConnectivityDiagnosticsCallbacks.containsKey(iCb)) {
final ConnectivityDiagnosticsCallbackInfo cbInfo =
mConnectivityDiagnosticsCallbacks.remove(iCb);
if (cbInfo == null) {
if (VDBG) log("Removing diagnostics callback that is not currently registered");
return;
}
final NetworkRequestInfo nri = mConnectivityDiagnosticsCallbacks.get(iCb).mRequestInfo;
final NetworkRequestInfo nri = cbInfo.mRequestInfo;
if (uid != nri.mUid) {
if (VDBG) loge("Different uid than registrant attempting to unregister cb");
@@ -7909,8 +7911,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
// enforceRequestCountLimit().
decrementNetworkRequestPerUidCount(nri);
final ConnectivityDiagnosticsCallbackInfo cbInfo =
mConnectivityDiagnosticsCallbacks.remove(iCb);
iCb.unlinkToDeath(cbInfo, 0);
}