Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Adding multilayered requests to NetworkRequestInfo" am: f2c37de2ba

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486199

Change-Id: I57d85884e4bf6039cf645ed58e2c7b0c8fd404a2
This commit is contained in:
James Mattis
2020-11-06 05:19:47 +00:00
committed by Automerger Merge Worker
parent f2abffe107 f2c37de2ba
commit 2feb4fb0a0
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -235,6 +235,7 @@ import java.net.UnknownHostException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.ConcurrentModificationException; import java.util.ConcurrentModificationException;
import java.util.HashMap; import java.util.HashMap;
@@ -5358,7 +5359,9 @@ public class ConnectivityService extends IConnectivityManager.Stub
* Also used to notice when the calling process dies so we can self-expire * Also used to notice when the calling process dies so we can self-expire
*/ */
private class NetworkRequestInfo implements IBinder.DeathRecipient { private class NetworkRequestInfo implements IBinder.DeathRecipient {
final List<NetworkRequest> mRequests;
final NetworkRequest request; final NetworkRequest request;
// The network currently satisfying this request, or null if none. Must only be touched // The network currently satisfying this request, or null if none. Must only be touched
// on the handler thread. This only makes sense for network requests and not for listens, // on the handler thread. This only makes sense for network requests and not for listens,
// as defined by NetworkRequest#isRequest(). For listens, this is always null. // as defined by NetworkRequest#isRequest(). For listens, this is always null.
@@ -5373,6 +5376,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
NetworkRequestInfo(NetworkRequest r, PendingIntent pi) { NetworkRequestInfo(NetworkRequest r, PendingIntent pi) {
request = r; request = r;
mRequests = initializeRequests(r);
ensureNetworkRequestHasType(request); ensureNetworkRequestHasType(request);
mPendingIntent = pi; mPendingIntent = pi;
messenger = null; messenger = null;
@@ -5386,6 +5390,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
super(); super();
messenger = m; messenger = m;
request = r; request = r;
mRequests = initializeRequests(r);
ensureNetworkRequestHasType(request); ensureNetworkRequestHasType(request);
mBinder = binder; mBinder = binder;
mPid = getCallingPid(); mPid = getCallingPid();
@@ -5404,6 +5409,13 @@ public class ConnectivityService extends IConnectivityManager.Stub
this(r, null); this(r, null);
} }
private List<NetworkRequest> initializeRequests(NetworkRequest r) {
final ArrayList<NetworkRequest> tempRequests = new ArrayList<>();
tempRequests.add(new NetworkRequest(r));
return Collections.unmodifiableList(tempRequests);
}
private void enforceRequestCountLimit() { private void enforceRequestCountLimit() {
synchronized (mUidToNetworkRequestCount) { synchronized (mUidToNetworkRequestCount) {
int networkRequests = mUidToNetworkRequestCount.get(mUid, 0) + 1; int networkRequests = mUidToNetworkRequestCount.get(mUid, 0) + 1;