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

Commit 60125d3d authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Swap default for disableTestApiChecks." am: 972f7adf am: f814dc9c am: fca52b7e"

parents 8623fcb5 2edb99df

cmds/am/src/com/android/commands/am/Am.java

+5 −1
Original line number Diff line number Diff line
@@ -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")) {

cmds/am/src/com/android/commands/am/Instrument.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

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

+2 −2
Original line number Diff line number Diff line
@@ -3065,7 +3065,7 @@ final class ActivityManagerShellCommand extends ShellCommand { 
            pw.println("          even if in the background.");

            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");
@@ -3085,7 +3085,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");