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

Revert "OP_GET_USAGE_STATS should be noted, not checked."

Browse Source 
This reverts commit 5a8bcd9031.

Reason for revert: ijpedowitz@

Bug: 77662908
Change-Id: I5dd0ad5038df90ea8a80ba6f583ee46fb24600c2
Exempt-From-Owner-Approval: keep tests passing
This commit is contained in:
Jeff Sharkey
2018-04-16 16:39:55 +00:00
parent 5a8bcd9031
commit bd2a9a2915
8 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/com/android/internal/util/DumpUtils.java
View File

@@ -122,7 +122,7 @@ public final class DumpUtils {
final String[] pkgs = context.getPackageManager().getPackagesForUid(uid);
if (pkgs != null) {
for (String pkg : pkgs) {
switch (appOps.noteOpNoThrow(AppOpsManager.OP_GET_USAGE_STATS, uid, pkg)) {
switch (appOps.checkOpNoThrow(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");

2
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -4718,7 +4718,7 @@ public class ActivityManagerService extends IActivityManager.Stub
}
private boolean hasUsageStatsPermission(String callingPackage) {
final int mode = mAppOpsService.noteOperation(AppOpsManager.OP_GET_USAGE_STATS,
final int mode = mAppOpsService.checkOperation(AppOpsManager.OP_GET_USAGE_STATS,
Binder.getCallingUid(), callingPackage);
if (mode == AppOpsManager.MODE_DEFAULT) {
return checkCallingPermission(Manifest.permission.PACKAGE_USAGE_STATS)

2
services/core/java/com/android/server/display/DisplayManagerService.java
View File

@@ -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.noteOp(AppOpsManager.OP_GET_USAGE_STATS,
final int mode = appOpsManager.checkOp(AppOpsManager.OP_GET_USAGE_STATS,
callingUid, callingPackage);
final boolean hasUsageStats;
if (mode == AppOpsManager.MODE_DEFAULT) {

2
services/core/java/com/android/server/net/NetworkStatsAccess.java
View File

@@ -174,7 +174,7 @@ public final class NetworkStatsAccess {
AppOpsManager appOps = (AppOpsManager) context.getSystemService(
Context.APP_OPS_SERVICE);
final int mode = appOps.noteOp(AppOpsManager.OP_GET_USAGE_STATS,
final int mode = appOps.checkOp(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

2
services/tests/servicestests/src/com/android/server/am/ActivityManagerServiceTest.java
View File

@@ -360,7 +360,7 @@ public class ActivityManagerServiceTest {
*/
@Test
public void testDispatchUids_dispatchNeededChanges() throws RemoteException {
when(mAppOpsService.noteOperation(AppOpsManager.OP_GET_USAGE_STATS, Process.myUid(), null))
when(mAppOpsService.checkOperation(AppOpsManager.OP_GET_USAGE_STATS, Process.myUid(), null))
.thenReturn(AppOpsManager.MODE_ALLOWED);
final int[] changesToObserve = {

2
services/usage/java/com/android/server/usage/StorageStatsService.java
View File

@@ -138,7 +138,7 @@ public class StorageStatsService extends IStorageStatsManager.Stub {
}
private void enforcePermission(int callingUid, String callingPackage) {
final int mode = mAppOps.noteOp(AppOpsManager.OP_GET_USAGE_STATS,
final int mode = mAppOps.checkOp(AppOpsManager.OP_GET_USAGE_STATS,
callingUid, callingPackage);
switch (mode) {
case AppOpsManager.MODE_ALLOWED:

2
services/usage/java/com/android/server/usage/UsageStatsService.java
View File

@@ -660,7 +660,7 @@ public class UsageStatsService extends SystemService implements
if (callingUid == Process.SYSTEM_UID) {
return true;
}
final int mode = mAppOps.noteOp(AppOpsManager.OP_GET_USAGE_STATS,
final int mode = mAppOps.checkOp(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

2
tests/net/java/com/android/server/net/NetworkStatsAccessTest.java
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