Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 563a57bc authored Apr 16, 2018 by Jeff Sharkey Committed by android-build-merger Apr 16, 2018

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

am: f78b8ce2

Change-Id: Ie9bcdc9736c04ab787efc193311a20d03718b593

parents 7d710b90 f78b8ce2

core/java/com/android/internal/util/DumpUtils.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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");

services/core/java/com/android/server/am/ActivityManagerService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)

services/core/java/com/android/server/display/DisplayManagerService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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) {

services/core/java/com/android/server/net/NetworkStatsAccess.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 = {