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

Merge "Remove useless thread checks" am: 269d32a0fa am: bb87d5aeb5

Browse Source 
Change-Id: I7a1fe60971b733cb6bc3c848eeed8624210d97ff
This commit is contained in:
Automerger Merge Worker
2020-02-21 10:00:45 +00:00
parent a06f220d24 bb87d5aeb5
commit 374e1adce8
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3295,7 +3295,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
for (int i = 0; i < nai.numNetworkRequests(); i++) { for (int i = 0; i < nai.numNetworkRequests(); i++) {
NetworkRequest request = nai.requestAt(i); NetworkRequest request = nai.requestAt(i);
final NetworkRequestInfo nri = mNetworkRequests.get(request); final NetworkRequestInfo nri = mNetworkRequests.get(request);
ensureRunningOnConnectivityServiceThread();
final NetworkAgentInfo currentNetwork = nri.mSatisfier; final NetworkAgentInfo currentNetwork = nri.mSatisfier;
if (currentNetwork != null && currentNetwork.network.netId == nai.network.netId) { if (currentNetwork != null && currentNetwork.network.netId == nai.network.netId) {
nri.mSatisfier = null; nri.mSatisfier = null;
@@ -3447,7 +3446,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
// If this Network is already the highest scoring Network for a request, or if // If this Network is already the highest scoring Network for a request, or if
// there is hope for it to become one if it validated, then it is needed. // there is hope for it to become one if it validated, then it is needed.
ensureRunningOnConnectivityServiceThread();
if (nri.request.isRequest() && nai.satisfies(nri.request) && if (nri.request.isRequest() && nai.satisfies(nri.request) &&
(nai.isSatisfyingRequest(nri.request.requestId) || (nai.isSatisfyingRequest(nri.request.requestId) ||
// Note that this catches two important cases: // Note that this catches two important cases:
@@ -3486,7 +3484,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
if (mNetworkRequests.get(nri.request) == null) { if (mNetworkRequests.get(nri.request) == null) {
return; return;
} }
ensureRunningOnConnectivityServiceThread();
if (nri.mSatisfier != null) { if (nri.mSatisfier != null) {
return; return;
} }
@@ -3524,7 +3521,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
mNetworkRequestInfoLogs.log("RELEASE " + nri); mNetworkRequestInfoLogs.log("RELEASE " + nri);
if (nri.request.isRequest()) { if (nri.request.isRequest()) {
boolean wasKept = false; boolean wasKept = false;
ensureRunningOnConnectivityServiceThread();
final NetworkAgentInfo nai = nri.mSatisfier; final NetworkAgentInfo nai = nri.mSatisfier;
if (nai != null) { if (nai != null) {
boolean wasBackgroundNetwork = nai.isBackgroundNetwork(); boolean wasBackgroundNetwork = nai.isBackgroundNetwork();