Merge "Disable user-facing historical app ops methods" (32af0ecb) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityManagerInternal.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -367,4 +367,14 @@ public abstract class ActivityManagerInternal {
		* Unregisters the specified {@code processObserver}.
		*/
		public abstract void unregisterProcessObserver(IProcessObserver processObserver);

		/**
		* Checks if there is an unfinished instrumentation that targets the given uid.
		*
		* @param uid The uid to be checked for
		*
		* @return True, if there is an instrumentation whose target application uid matches the given
		* uid, false otherwise
		*/
		public abstract boolean isUidCurrentlyInstrumented(int uid);
		}

core/java/android/os/Process.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -178,6 +178,12 @@ public class Process {
		*/
		public static final int OTA_UPDATE_UID = 1061;

		/**
		* Defines the UID used for statsd
		* @hide
		*/
		public static final int STATSD_UID = 1066;

		/**
		* Defines the UID used for incidentd.
		* @hide

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

+14 −0

Original line number	Diff line number	Diff line
		@@ -19089,6 +19089,20 @@ public class ActivityManagerService extends IActivityManager.Stub
		public void unregisterProcessObserver(IProcessObserver processObserver) {
		ActivityManagerService.this.unregisterProcessObserver(processObserver);
		}

		@Override
		public boolean isUidCurrentlyInstrumented(int uid) {
		synchronized (ActivityManagerService.this) {
		for (int i = mActiveInstrumentation.size() - 1; i >= 0; i--) {
		ActiveInstrumentation activeInst = mActiveInstrumentation.get(i);
		if (!activeInst.mFinished && activeInst.mTargetInfo != null
		&& activeInst.mTargetInfo.uid == uid) {
		return true;
		}
		}
		}
		return false;
		}
		}

		long inputDispatchingTimedOut(int pid, final boolean aboveSystem, String reason) {

services/core/java/com/android/server/appop/AppOpsService.java

+12 −4

Original line number	Diff line number	Diff line
		@@ -50,12 +50,14 @@ import static android.app.AppOpsManager.resolveFirstUnrestrictedUidState;
		import static android.content.Intent.ACTION_PACKAGE_REMOVED;
		import static android.content.Intent.EXTRA_REPLACING;
		import static android.content.pm.PermissionInfo.PROTECTION_DANGEROUS;
		import static android.os.Process.STATSD_UID;

		import android.Manifest;
		import android.annotation.IntRange;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.app.ActivityManager;
		import android.app.ActivityManagerInternal;
		import android.app.ActivityThread;
		import android.app.AppGlobals;
		import android.app.AppOpsManager;
		@@ -1760,6 +1762,15 @@ public class AppOpsService extends IAppOpsService.Stub {
		beginTimeMillis, endTimeMillis, flags);
		Objects.requireNonNull(callback, "callback cannot be null");

		ActivityManagerInternal ami = LocalServices.getService(ActivityManagerInternal.class);
		boolean isCallerInstrumented = ami.isUidCurrentlyInstrumented(Binder.getCallingUid());
		boolean isCallerStatsCollector = Binder.getCallingUid() == STATSD_UID;

		if (!isCallerStatsCollector && !isCallerInstrumented) {
		mHandler.post(() -> callback.sendResult(new Bundle()));
		return;
		}

		mContext.enforcePermission(android.Manifest.permission.GET_APP_OPS_STATS,
		Binder.getCallingPid(), Binder.getCallingUid(), "getHistoricalOps");

		@@ -4475,8 +4486,6 @@ public class AppOpsService extends IAppOpsService.Stub {
		pw.println(" Limit output to data associated with the given feature id.");
		pw.println(" --watchers");
		pw.println(" Only output the watcher sections.");
		pw.println(" --history");
		pw.println(" Output the historical data.");
		}

		private void dumpStatesLocked(@NonNull PrintWriter pw, @Nullable String filterFeatureId,
		@@ -4609,6 +4618,7 @@ public class AppOpsService extends IAppOpsService.Stub {
		int dumpUid = Process.INVALID_UID;
		int dumpMode = -1;
		boolean dumpWatchers = false;
		// TODO ntmyren: Remove the dumpHistory and dumpFilter
		boolean dumpHistory = false;
		@HistoricalOpsRequestFilter int dumpFilter = 0;

		@@ -4671,8 +4681,6 @@ public class AppOpsService extends IAppOpsService.Stub {
		}
		} else if ("--watchers".equals(arg)) {
		dumpWatchers = true;
		} else if ("--history".equals(arg)) {
		dumpHistory = true;
		} else if (arg.length() > 0 && arg.charAt(0) == '-'){
		pw.println("Unknown option: " + arg);
		return;

services/tests/mockingservicestests/src/com/android/server/appop/AppOpsServiceTest.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -283,6 +283,8 @@ public class AppOpsServiceTest {
		}


		/*
		TODO ntmyren: re enable when we have time to rewrite test.
		@Test
		public void testPackageRemovedHistoricalOps() throws InterruptedException {
		mAppOpsService.setMode(OP_READ_SMS, mMyUid, sMyPackageName, MODE_ALLOWED);
		@@ -321,6 +323,7 @@ public class AppOpsServiceTest {
		assertThat(latchRef.get().getCount()).isEqualTo(0);
		assertThat(resultOpsRef.get().isEmpty()).isTrue();
		}
		*/

		@Test
		public void testUidRemoved() {