Merge "Revert "OP_GET_USAGE_STATS should be noted, not checked."" into pi-dev

am: 04efa57798

Change-Id: I2cc76316bca81c12e56337d6e36d82b0de6d9ded
This commit is contained in:
Jeff Sharkey
2018-04-16 10:07:52 -07:00
committed by android-build-merger

View File

@@ -176,7 +176,7 @@ public class NetworkStatsAccessTest {
}
private void setHasAppOpsPermission(int appOpsMode, boolean hasPermission) {
when(mAppOps.noteOp(AppOpsManager.OP_GET_USAGE_STATS, TEST_UID, TEST_PKG))
when(mAppOps.checkOp(AppOpsManager.OP_GET_USAGE_STATS, TEST_UID, TEST_PKG))
.thenReturn(appOpsMode);
when(mContext.checkCallingPermission(Manifest.permission.PACKAGE_USAGE_STATS)).thenReturn(
hasPermission ? PackageManager.PERMISSION_GRANTED