From 244fa92fc1c6a35a8cb7a75ac4f87223522eb76e Mon Sep 17 00:00:00 2001 From: Artur Satayev Date: Tue, 19 Jan 2021 18:00:15 +0000 Subject: Enable @TestApi access for instrumentation. Since introduction of ALLOW_TEST_API_ACCESS, it is now possible to grant access to test apis for the whole UID, instead of just a starting process. This resolves the issue, where a forked test process cannot access @TestApi's. Bug: 147113465 Test: atest CameraEvictionTest#testBasicCamera2ActivityEviction Merged-In: I8dd3bbacdb263a3e30539f43d8081f6d78e80155 Change-Id: I8dd3bbacdb263a3e30539f43d8081f6d78e80155 --- cmds/am/src/com/android/commands/am/Am.java | 5 ----- 1 file changed, 5 deletions(-) (limited to 'cmds') diff --git a/cmds/am/src/com/android/commands/am/Am.java b/cmds/am/src/com/android/commands/am/Am.java index bdb83804d903..846a34eb41c9 100644 --- a/cmds/am/src/com/android/commands/am/Am.java +++ b/cmds/am/src/com/android/commands/am/Am.java @@ -174,10 +174,6 @@ public class Am extends BaseCommand { instrument.noWindowAnimation = true; } else if (opt.equals("--no-hidden-api-checks")) { instrument.disableHiddenApiChecks = true; - } else if (opt.equals("--no-test-api-checks")) { - // TODO(satayev): remove this option, only kept for backwards compatibility with - // cached tradefed instance - instrument.disableTestApiChecks = false; } else if (opt.equals("--no-test-api-access")) { instrument.disableTestApiChecks = false; } else if (opt.equals("--no-isolated-storage")) { @@ -198,7 +194,6 @@ public class Am extends BaseCommand { } instrument.componentNameArg = nextArgRequired(); - instrument.run(); } } -- cgit v1.2.3