diff options
8 files changed, 8 insertions, 8 deletions
diff --git a/core/java/com/android/internal/util/DumpUtils.java b/core/java/com/android/internal/util/DumpUtils.java index 2b5103377ecb..e85b782facb2 100644 --- a/core/java/com/android/internal/util/DumpUtils.java +++ b/core/java/com/android/internal/util/DumpUtils.java @@ -122,7 +122,7 @@ public final class DumpUtils { final String[] pkgs = context.getPackageManager().getPackagesForUid(uid); if (pkgs != null) { for (String pkg : pkgs) { - switch (appOps.checkOpNoThrow(AppOpsManager.OP_GET_USAGE_STATS, uid, pkg)) { + switch (appOps.noteOpNoThrow(AppOpsManager.OP_GET_USAGE_STATS, uid, pkg)) { case AppOpsManager.MODE_ALLOWED: if (DEBUG) Slog.v(TAG, "Found package " + pkg + " with " + "android:get_usage_stats allowed"); diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index f620c77d779a..baf938b9b93e 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -4718,7 +4718,7 @@ public class ActivityManagerService extends IActivityManager.Stub } private boolean hasUsageStatsPermission(String callingPackage) { - final int mode = mAppOpsService.checkOperation(AppOpsManager.OP_GET_USAGE_STATS, + final int mode = mAppOpsService.noteOperation(AppOpsManager.OP_GET_USAGE_STATS, Binder.getCallingUid(), callingPackage); if (mode == AppOpsManager.MODE_DEFAULT) { return checkCallingPermission(Manifest.permission.PACKAGE_USAGE_STATS) diff --git a/services/core/java/com/android/server/display/DisplayManagerService.java b/services/core/java/com/android/server/display/DisplayManagerService.java index 0f531a8063ce..ddd8855f3199 100644 --- a/services/core/java/com/android/server/display/DisplayManagerService.java +++ b/services/core/java/com/android/server/display/DisplayManagerService.java @@ -1904,7 +1904,7 @@ public final class DisplayManagerService extends SystemService { final int callingUid = Binder.getCallingUid(); AppOpsManager appOpsManager = mContext.getSystemService(AppOpsManager.class); - final int mode = appOpsManager.checkOp(AppOpsManager.OP_GET_USAGE_STATS, + final int mode = appOpsManager.noteOp(AppOpsManager.OP_GET_USAGE_STATS, callingUid, callingPackage); final boolean hasUsageStats; if (mode == AppOpsManager.MODE_DEFAULT) { diff --git a/services/core/java/com/android/server/net/NetworkStatsAccess.java b/services/core/java/com/android/server/net/NetworkStatsAccess.java index 98fe7707747c..cebc47217831 100644 --- a/services/core/java/com/android/server/net/NetworkStatsAccess.java +++ b/services/core/java/com/android/server/net/NetworkStatsAccess.java @@ -174,7 +174,7 @@ public final class NetworkStatsAccess { AppOpsManager appOps = (AppOpsManager) context.getSystemService( Context.APP_OPS_SERVICE); - final int mode = appOps.checkOp(AppOpsManager.OP_GET_USAGE_STATS, + final int mode = appOps.noteOp(AppOpsManager.OP_GET_USAGE_STATS, callingUid, callingPackage); if (mode == AppOpsManager.MODE_DEFAULT) { // The default behavior here is to check if PackageManager has given the app diff --git a/services/tests/servicestests/src/com/android/server/am/ActivityManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/am/ActivityManagerServiceTest.java index 25d2875d986f..c70d1e18c871 100644 --- a/services/tests/servicestests/src/com/android/server/am/ActivityManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/am/ActivityManagerServiceTest.java @@ -360,7 +360,7 @@ public class ActivityManagerServiceTest { */ @Test public void testDispatchUids_dispatchNeededChanges() throws RemoteException { - when(mAppOpsService.checkOperation(AppOpsManager.OP_GET_USAGE_STATS, Process.myUid(), null)) + when(mAppOpsService.noteOperation(AppOpsManager.OP_GET_USAGE_STATS, Process.myUid(), null)) .thenReturn(AppOpsManager.MODE_ALLOWED); final int[] changesToObserve = { diff --git a/services/usage/java/com/android/server/usage/StorageStatsService.java b/services/usage/java/com/android/server/usage/StorageStatsService.java index 2fec20ab861e..993451467bd4 100644 --- a/services/usage/java/com/android/server/usage/StorageStatsService.java +++ b/services/usage/java/com/android/server/usage/StorageStatsService.java @@ -138,7 +138,7 @@ public class StorageStatsService extends IStorageStatsManager.Stub { } private void enforcePermission(int callingUid, String callingPackage) { - final int mode = mAppOps.checkOp(AppOpsManager.OP_GET_USAGE_STATS, + final int mode = mAppOps.noteOp(AppOpsManager.OP_GET_USAGE_STATS, callingUid, callingPackage); switch (mode) { case AppOpsManager.MODE_ALLOWED: diff --git a/services/usage/java/com/android/server/usage/UsageStatsService.java b/services/usage/java/com/android/server/usage/UsageStatsService.java index 1fbc27b58854..f9fa3364c051 100644 --- a/services/usage/java/com/android/server/usage/UsageStatsService.java +++ b/services/usage/java/com/android/server/usage/UsageStatsService.java @@ -660,7 +660,7 @@ public class UsageStatsService extends SystemService implements if (callingUid == Process.SYSTEM_UID) { return true; } - final int mode = mAppOps.checkOp(AppOpsManager.OP_GET_USAGE_STATS, + final int mode = mAppOps.noteOp(AppOpsManager.OP_GET_USAGE_STATS, callingUid, callingPackage); if (mode == AppOpsManager.MODE_DEFAULT) { // The default behavior here is to check if PackageManager has given the app diff --git a/tests/net/java/com/android/server/net/NetworkStatsAccessTest.java b/tests/net/java/com/android/server/net/NetworkStatsAccessTest.java index 23318c29dff6..b870bbdb73ed 100644 --- a/tests/net/java/com/android/server/net/NetworkStatsAccessTest.java +++ b/tests/net/java/com/android/server/net/NetworkStatsAccessTest.java @@ -176,7 +176,7 @@ public class NetworkStatsAccessTest { } private void setHasAppOpsPermission(int appOpsMode, boolean hasPermission) { - when(mAppOps.checkOp(AppOpsManager.OP_GET_USAGE_STATS, TEST_UID, TEST_PKG)) + when(mAppOps.noteOp(AppOpsManager.OP_GET_USAGE_STATS, TEST_UID, TEST_PKG)) .thenReturn(appOpsMode); when(mContext.checkCallingPermission(Manifest.permission.PACKAGE_USAGE_STATS)).thenReturn( hasPermission ? PackageManager.PERMISSION_GRANTED |