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

Merge changes I2431a6d2,I9096969a,I748bd9de,Ia5387ca2,I803bdec8, ... into rvc-dev am: 5add803be8

Browse Source 
Change-Id: Id83214bd033f56295868f7c54a659a4d4b84fe79
This commit is contained in:
Cody Kesting
2020-04-01 01:33:46 +00:00
committed by Automerger Merge Worker
parent f3cc967bc6 5add803be8
commit 6f8db1afdd
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7918,8 +7918,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
@NonNull ConnectivityReportEvent reportEvent, @NonNull PersistableBundle extras) { @NonNull ConnectivityReportEvent reportEvent, @NonNull PersistableBundle extras) {
final NetworkAgentInfo nai = reportEvent.mNai; final NetworkAgentInfo nai = reportEvent.mNai;
final NetworkCapabilities networkCapabilities = final NetworkCapabilities networkCapabilities =
new NetworkCapabilities(nai.networkCapabilities); getNetworkCapabilitiesWithoutUids(nai.networkCapabilities);
clearNetworkCapabilitiesUids(networkCapabilities);
final ConnectivityReport report = final ConnectivityReport report =
new ConnectivityReport( new ConnectivityReport(
reportEvent.mNai.network, reportEvent.mNai.network,
@@ -7943,8 +7942,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
@NonNull NetworkAgentInfo nai, long timestampMillis, int detectionMethod, @NonNull NetworkAgentInfo nai, long timestampMillis, int detectionMethod,
@NonNull PersistableBundle extras) { @NonNull PersistableBundle extras) {
final NetworkCapabilities networkCapabilities = final NetworkCapabilities networkCapabilities =
new NetworkCapabilities(nai.networkCapabilities); getNetworkCapabilitiesWithoutUids(nai.networkCapabilities);
clearNetworkCapabilitiesUids(networkCapabilities);
final DataStallReport report = final DataStallReport report =
new DataStallReport( new DataStallReport(
nai.network, nai.network,
@@ -7977,10 +7975,12 @@ public class ConnectivityService extends IConnectivityManager.Stub
} }
} }
private void clearNetworkCapabilitiesUids(@NonNull NetworkCapabilities nc) { private NetworkCapabilities getNetworkCapabilitiesWithoutUids(@NonNull NetworkCapabilities nc) {
nc.setUids(null); final NetworkCapabilities sanitized = new NetworkCapabilities(nc);
nc.setAdministratorUids(new int[0]); sanitized.setUids(null);
nc.setOwnerUid(Process.INVALID_UID); sanitized.setAdministratorUids(new int[0]);
sanitized.setOwnerUid(Process.INVALID_UID);
return sanitized;
} }
private List<IConnectivityDiagnosticsCallback> getMatchingPermissionedCallbacks( private List<IConnectivityDiagnosticsCallback> getMatchingPermissionedCallbacks(