Merge "Revert "Enable @TestApi access for instrumentation."" into sc-dev (6577a297) · Commits · e / os / android_frameworks_base

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

+0 −23

Original line number	Diff line number	Diff line
		@@ -182,7 +182,6 @@ import android.app.usage.UsageEvents.Event;
		import android.app.usage.UsageStatsManager;
		import android.app.usage.UsageStatsManagerInternal;
		import android.appwidget.AppWidgetManager;
		import android.compat.Compatibility;
		import android.content.AutofillOptions;
		import android.content.BroadcastReceiver;
		import android.content.ComponentCallbacks2;
		@@ -307,7 +306,6 @@ import com.android.internal.app.IAppOpsService;
		import com.android.internal.app.ProcessMap;
		import com.android.internal.app.SystemUserHomeActivity;
		import com.android.internal.app.procstats.ProcessStats;
		import com.android.internal.compat.CompatibilityChangeConfig;
		import com.android.internal.content.PackageHelper;
		import com.android.internal.messages.nano.SystemMessageProto.SystemMessage;
		import com.android.internal.notification.SystemNotificationChannels;
		@@ -13571,8 +13569,6 @@ public class ActivityManagerService extends IActivityManager.Stub
		if (disableHiddenApiChecks \|\| disableTestApiChecks) {
		enforceCallingPermission(android.Manifest.permission.DISABLE_HIDDEN_API_CHECKS,
		"disable hidden API checks");

		enableTestApiAccess(ai.packageName);
		}

		final long origId = Binder.clearCallingIdentity();
		@@ -13746,25 +13742,6 @@ public class ActivityManagerService extends IActivityManager.Stub
		app.userId,
		"finished inst");
		}

		disableTestApiAccess(app.info.packageName);
		}

		private void enableTestApiAccess(String packageName) {
		if (mPlatformCompat != null) {
		Compatibility.ChangeConfig config = new Compatibility.ChangeConfig(
		Collections.singleton(166236554L /* VMRuntime.ALLOW_TEST_API_ACCESS */),
		Collections.emptySet());
		CompatibilityChangeConfig override = new CompatibilityChangeConfig(config);
		mPlatformCompat.setOverridesForTest(override, packageName);
		}
		}

		private void disableTestApiAccess(String packageName) {
		if (mPlatformCompat != null) {
		mPlatformCompat.clearOverrideForTest(166236554L /* VMRuntime.ALLOW_TEST_API_ACCESS */,
		packageName);
		}
		}

		public void finishInstrumentation(IApplicationThread target,