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.

Browse Source 
ConnectivityService is updated to simplify the logic for unregistering
ConnectivityDiagnosticsCallback instances. This change removes the given
callback from ConnectivityService's data structure. If the callback was
not registered with ConnectivityService, it is logged and the function
exits; else, the unregister() operation continues.

Bug: 150867635
Test: atest FrameworksNetTests
Change-Id: I9096969a1bf33da72b117f5bbc88257df805e688
Merged-In: I9096969a1bf33da72b117f5bbc88257df805e688
(cherry picked from commit f047313940b5af49a3b0e72a5f2d94fc1dda9c9d)
This commit is contained in:
Cody Kesting
2020-03-30 12:43:49 -07:00
parent 7d4ef21010
commit 5d51a917f5
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);
} }