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

Merge "Swap default for disableTestApiChecks."

Browse Source 
am: 972f7adfbf

Change-Id: Ic6ab43ecd38ab8e7f0437b0e9e3db1bc400d26c3
This commit is contained in:
satayev
2019-12-04 09:16:09 -08:00
committed by android-build-merger
parent 920d3e0fbf 972f7adfbf
commit f814dc9c05
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmds/am/src/com/android/commands/am/Am.java
View File

@@ -175,7 +175,11 @@ public class Am extends BaseCommand {
} else if (opt.equals("--no-hidden-api-checks")) {
instrument.disableHiddenApiChecks = true;
} else if (opt.equals("--no-test-api-checks")) {
instrument.disableTestApiChecks = true;
// 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")) {
instrument.disableIsolatedStorage = true;
} else if (opt.equals("--user")) {

2
cmds/am/src/com/android/commands/am/Instrument.java
View File

@@ -86,7 +86,7 @@ public class Instrument {
String logPath = null;
public boolean noWindowAnimation = false;
public boolean disableHiddenApiChecks = false;
public boolean disableTestApiChecks = false;
public boolean disableTestApiChecks = true;
public boolean disableIsolatedStorage = false;
public String abi = null;
public int userId = UserHandle.USER_CURRENT;

4
services/core/java/com/android/server/am/ActivityManagerShellCommand.java
View File

@@ -3029,7 +3029,7 @@ final class ActivityManagerShellCommand extends ShellCommand {
pw.println(" --receiver-permission <PERMISSION>: Require receiver to hold permission.");
pw.println(" instrument [-r] [-e <NAME> <VALUE>] [-p <FILE>] [-w]");
pw.println(" [--user <USER_ID> | current]");
pw.println(" [--no-hidden-api-checks [--no-test-api-checks]]");
pw.println(" [--no-hidden-api-checks [--no-test-api-access]]");
pw.println(" [--no-isolated-storage]");
pw.println(" [--no-window-animation] [--abi <ABI>] <COMPONENT>");
pw.println(" Start an Instrumentation. Typically this target <COMPONENT> is in the");
@@ -3049,7 +3049,7 @@ final class ActivityManagerShellCommand extends ShellCommand {
pw.println(" --user <USER_ID> | current: Specify user instrumentation runs in;");
pw.println(" current user if not specified.");
pw.println(" --no-hidden-api-checks: disable restrictions on use of hidden API.");
pw.println(" --no-test-api-checks: disable restrictions to test APIs, if hidden");
pw.println(" --no-test-api-access: do not allow access to test APIs, if hidden");
pw.println(" API checks are enabled.");
pw.println(" --no-isolated-storage: don't use isolated storage sandbox and ");
pw.println(" mount full external storage");