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

Commit 61378127 authored by Artur Satayev's avatar Artur Satayev
Browse files

Revert "Enable @TestApi access for instrumentation." 

Partial revert of 244fa92f.

Reason for revert: cts tests on -user builds is broken

Bug: 147113465
Change-Id: If8dea0b8998e6273221983e7feb1b5f580088b83
parent 5b4c45b2

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

+0 −23
Original line number Diff line number Diff line
@@ -181,7 +181,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;
@@ -306,7 +305,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;
@@ -13566,8 +13564,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();










@@ -13741,25 +13737,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,