Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Enable @TestApi access for instrumentation."" into sc-dev

Browse Source
This commit is contained in:
Artur Satayev
2021-02-24 17:10:54 +00:00
committed by Android (Google) Code Review
parent e4c9e20df0 6137812704
commit 6577a29794
1 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -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,