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

Merge "Generalize some PANS methods" am: b639d79547 am: 9b385fa220 am: e05c37b5ec

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iee4826c66d5187608d0afa8f23fa45f1efe34a2b
This commit is contained in:
Chalard Jean
2021-03-05 07:09:15 +00:00
committed by Automerger Merge Worker
parent b81bcd2a1e e05c37b5ec
commit 2e68a8ee6e
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7161,7 +7161,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
toUidRangeStableParcels(nri.getUids()));
}
} catch (RemoteException | ServiceSpecificException e) {
loge("Exception setting OEM network preference default network", e);
loge("Exception setting app default network", e);
}
}
@@ -9046,7 +9046,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
}
final ArraySet<NetworkRequestInfo> nris =
new OemNetworkRequestFactory().createNrisFromOemNetworkPreferences(preference);
updateDefaultNetworksForOemNetworkPreference(nris);
replaceDefaultNetworkRequestsForPreference(nris);
mOemNetworkPreferences = preference;
// TODO http://b/176496396 persist data to shared preferences.
@@ -9059,7 +9059,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
}
}
private void updateDefaultNetworksForOemNetworkPreference(
private void replaceDefaultNetworkRequestsForPreference(
@NonNull final Set<NetworkRequestInfo> nris) {
// Pass in a defensive copy as this collection will be updated on remove.
handleRemoveNetworkRequests(new ArraySet<>(mDefaultNetworkRequests));
@@ -9145,6 +9145,14 @@ public class ConnectivityService extends IConnectivityManager.Stub
return callbackRequestsToRegister;
}
private static void setNetworkRequestUids(@NonNull final List<NetworkRequest> requests,
@NonNull final Set<UidRange> uids) {
final Set<UidRange> ranges = new ArraySet<>(uids);
for (final NetworkRequest req : requests) {
req.networkCapabilities.setUids(ranges);
}
}
/**
* Class used to generate {@link NetworkRequestInfo} based off of {@link OemNetworkPreferences}.
*/
@@ -9221,7 +9229,11 @@ public class ConnectivityService extends IConnectivityManager.Stub
+ " called with invalid preference of " + preference);
}
setOemNetworkRequestUids(requests, uids);
final ArraySet ranges = new ArraySet<Integer>();
for (final int uid : uids) {
ranges.add(new UidRange(uid, uid));
}
setNetworkRequestUids(requests, ranges);
return new NetworkRequestInfo(requests);
}
@@ -9254,16 +9266,5 @@ public class ConnectivityService extends IConnectivityManager.Stub
netCap.setRequestorUidAndPackageName(Process.myUid(), mContext.getPackageName());
return netCap;
}
private void setOemNetworkRequestUids(@NonNull final List<NetworkRequest> requests,
@NonNull final Set<Integer> uids) {
final Set<UidRange> ranges = new ArraySet<>();
for (final int uid : uids) {
ranges.add(new UidRange(uid, uid));
}
for (final NetworkRequest req : requests) {
req.networkCapabilities.setUids(ranges);
}
}
}
}