Merge "[MS25.2] Remove AppOpsManager.OP_GET_USAGE_STATS dependency" am: 90cf8dbd92

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1934184

Change-Id: I45c8eb61ae26e4a0fd22980c259406f2c09a0331
This commit is contained in:
Treehugger Robot
2022-01-03 23:00:36 +00:00
committed by Automerger Merge Worker

View File

@@ -165,8 +165,8 @@ public class NetworkStatsAccessTest {
}
private void setHasAppOpsPermission(int appOpsMode, boolean hasPermission) {
when(mAppOps.noteOp(AppOpsManager.OP_GET_USAGE_STATS, TEST_UID, TEST_PKG))
.thenReturn(appOpsMode);
when(mAppOps.noteOp(AppOpsManager.OPSTR_GET_USAGE_STATS, TEST_UID, TEST_PKG,
null /* attributionTag */, null /* message */)).thenReturn(appOpsMode);
when(mContext.checkCallingPermission(Manifest.permission.PACKAGE_USAGE_STATS)).thenReturn(
hasPermission ? PackageManager.PERMISSION_GRANTED
: PackageManager.PERMISSION_DENIED);