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

Simplify unregister logic for Connectivity Diagnostics callbacks. am: 482e80d7a8

Browse Source 
Change-Id: I6b9541fd562c3e65af65e9b5b754909d96f332fd
This commit is contained in:
Cody Kesting
2020-04-01 01:33:42 +00:00
committed by Automerger Merge Worker
parent b073ee6831 482e80d7a8
commit bd60162bbb
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(); ensureRunningOnConnectivityServiceThread();
final IBinder iCb = cb.asBinder(); 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"); if (VDBG) log("Removing diagnostics callback that is not currently registered");
return; return;
} }
final NetworkRequestInfo nri = mConnectivityDiagnosticsCallbacks.get(iCb).mRequestInfo; final NetworkRequestInfo nri = cbInfo.mRequestInfo;
if (uid != nri.mUid) { if (uid != nri.mUid) {
if (VDBG) loge("Different uid than registrant attempting to unregister cb"); if (VDBG) loge("Different uid than registrant attempting to unregister cb");
@@ -7909,8 +7911,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
// enforceRequestCountLimit(). // enforceRequestCountLimit().
decrementNetworkRequestPerUidCount(nri); decrementNetworkRequestPerUidCount(nri);
final ConnectivityDiagnosticsCallbackInfo cbInfo =
mConnectivityDiagnosticsCallbacks.remove(iCb);
iCb.unlinkToDeath(cbInfo, 0); iCb.unlinkToDeath(cbInfo, 0);
} }