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

Merge "Move NetworkAgent#register to a new method." am: 5d61bc285d

Browse Source 
Change-Id: I4ca48f4232ad4733da5ce7f265fc911f5ff1a713
This commit is contained in:
Automerger Merge Worker
2020-03-03 03:52:17 +00:00
parent 7f812a02cf 5d61bc285d
commit 7c9677256c
4 changed files with 62 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/TestNetworkService.java
View File

@@ -219,7 +219,7 @@ class TestNetworkService extends ITestNetworkManager.Stub {
// Has to be in TestNetworkAgent to ensure all teardown codepaths properly clean up
// resources, even for binder death or unwanted calls.
synchronized (mTestNetworkTracker) {
mTestNetworkTracker.remove(network.netId);
mTestNetworkTracker.remove(getNetwork().netId);
}
}
}
@@ -338,7 +338,7 @@ class TestNetworkService extends ITestNetworkManager.Stub {
callingUid,
binder);
mTestNetworkTracker.put(agent.network.netId, agent);
mTestNetworkTracker.put(agent.getNetwork().netId, agent);
}
} catch (SocketException e) {
throw new UncheckedIOException(e);