Merge tag 'android-13.0.0_r52' into int/13/fp3
Android 13.0.0 Release 52 (TQ3A.230605.012)
* tag 'android-13.0.0_r52':
Update UiAutomator Condition
Import translations. DO NOT MERGE ANYWHERE
Change-Id: I9bfbf73e897da60eb6746973616b0e78f159f954
diff --git a/framework-t/src/android/net/NetworkStatsAccess.java b/framework-t/src/android/net/NetworkStatsAccess.java
index b64fbdb..886bd6e 100644
--- a/framework-t/src/android/net/NetworkStatsAccess.java
+++ b/framework-t/src/android/net/NetworkStatsAccess.java
@@ -127,9 +127,12 @@
final boolean isNetworkStack = context.checkPermission(
android.Manifest.permission.NETWORK_STACK, callingPid, callingUid)
== PERMISSION_GRANTED;
+ final boolean isMainlineNetworkStack = context.checkPermission(
+ NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, callingPid, callingUid)
+ == PERMISSION_GRANTED;
if (hasCarrierPrivileges || isDeviceOwner
- || appId == Process.SYSTEM_UID || isNetworkStack) {
+ || appId == Process.SYSTEM_UID || isNetworkStack || isMainlineNetworkStack) {
// Carrier-privileged apps and device owners, and the system (including the
// network stack) can access data usage for all apps on the device.
return NetworkStatsAccess.Level.DEVICE;