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: b2582a32e8 am: e6a16e1466

Browse Source 
Change-Id: Iaed3a58dbac1ad9af72a98d520fe80decf5d6ff6
This commit is contained in:
Cody Kesting
2020-03-31 20:45:16 +00:00
committed by Automerger Merge Worker
parent 31ed1884f8 e6a16e1466
commit 66c6787fb9
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

@@ -7883,12 +7883,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");
@@ -7900,8 +7902,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
// enforceRequestCountLimit().
decrementNetworkRequestPerUidCount(nri);
final ConnectivityDiagnosticsCallbackInfo cbInfo =
mConnectivityDiagnosticsCallbacks.remove(iCb);
iCb.unlinkToDeath(cbInfo, 0);
}