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

Commit 68fb86fe authored by Artur Satayev's avatar Artur Satayev Committed by Automerger Merge Worker
Browse files

Merge "Revert "Enable @TestApi access for instrumentation."" into sc-dev am: 6577a297 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13676889

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idc7ff2e9b9f0a32157efa79ccd995559f46417dd
parents 38f60f3d 6577a297

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,