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

Commit d5d4217e authored by David Brazdil's avatar David Brazdil
Browse files

Add flag to AMS.startInstrumentation() to disable hidden API checks 

Some tests need to use hidden APIs to check the internal state of
the framework. For those special use cases, we add a new flag to
ActivityManagerService.startInstrumentation that enables to start
instrumented processes without hidden API enforcement. Individual
test harnesses can change their Am command to request the exemption.

Bug: 64382372
Test: adb shell am instrument --no-hidden-api-checks <component>
      adb logcat | grep 'Accessing hidden'
Change-Id: I1d734a95423fae90dae63ff09d5f606495830905
parent 427ef56c

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

+2 −0
Original line number Diff line number Diff line
@@ -172,6 +172,8 @@ public class Am extends BaseCommand { 
            } else if (opt.equals("--no_window_animation")

                    || opt.equals("--no-window-animation")) {

                instrument.noWindowAnimation = true;

            } else if (opt.equals("--no-hidden-api-checks")) {

                instrument.disableHiddenApiChecks = true;

            } else if (opt.equals("--user")) {

                instrument.userId = parseUserArg(nextArgRequired());

            } else if (opt.equals("--abi")) {

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

+7 −1
Original line number Diff line number Diff line
@@ -73,12 +73,17 @@ public class Instrument { 
    boolean protoFile = false;  // write proto to a file

    String logPath = null;

    public boolean noWindowAnimation = false;

    public boolean disableHiddenApiChecks = false;

    public String abi = null;

    public int userId = UserHandle.USER_CURRENT;

    public Bundle args = new Bundle();

    // Required

    public String componentNameArg;



    // Disable hidden API checks for the newly started instrumentation.

    // Must be kept in sync with ActivityManagerService.

    private static final int INSTRUMENTATION_FLAG_DISABLE_HIDDEN_API_CHECKS = 1 << 0;



    /**

     * Construct the instrument command runner.

     */
@@ -475,7 +480,8 @@ public class Instrument { 
            }



            // Start the instrumentation

            if (!mAm.startInstrumentation(cn, profileFile, 0, args, watcher, connection, userId,

            int flags = disableHiddenApiChecks ? INSTRUMENTATION_FLAG_DISABLE_HIDDEN_API_CHECKS : 0;

            if (!mAm.startInstrumentation(cn, profileFile, flags, args, watcher, connection, userId,

                        abi)) {

                throw new AndroidException("INSTRUMENTATION_FAILED: " + cn.flattenToString());

            }

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

+27 −4
Original line number Diff line number Diff line
@@ -579,6 +579,10 @@ public class ActivityManagerService extends IActivityManager.Stub 
    // How long we wait until we timeout on key dispatching during instrumentation.

    static final int INSTRUMENTATION_KEY_DISPATCHING_TIMEOUT = 60*1000;













    // Disable hidden API checks for the newly started instrumentation.













    // Must be kept in sync with Am.













    private static final int INSTRUMENTATION_FLAG_DISABLE_HIDDEN_API_CHECKS = 1 << 0;



























    // How long to wait in getAssistContextExtras for the activity and foreground services















    // to respond with the result.















    static final int PENDING_ASSIST_EXTRAS_TIMEOUT = 500;










@@ -4002,12 +4006,19 @@ public class ActivityManagerService extends IActivityManager.Stub













        startProcessLocked(app, hostingType, hostingNameStr, null /* abiOverride */);















    }



























    @GuardedBy("this")













    private final boolean startProcessLocked(ProcessRecord app,













            String hostingType, String hostingNameStr, String abiOverride) {













        return startProcessLocked(app, hostingType, hostingNameStr,













                false /* disableHiddenApiChecks */, abiOverride);













    }



























    /**















     * @return {@code true} if process start is successful, false otherwise.















     */















    @GuardedBy("this")















    private final boolean startProcessLocked(ProcessRecord app, String hostingType,













            String hostingNameStr, String abiOverride) {













            String hostingNameStr, boolean disableHiddenApiChecks, String abiOverride) {















        if (app.pendingStart) {















            return true;















        }










@@ -4130,7 +4141,9 @@ public class ActivityManagerService extends IActivityManager.Stub













                runtimeFlags |= Zygote.ONLY_USE_SYSTEM_OAT_FILES;















            }



























            if (!app.info.isAllowedToUseHiddenApi() && !mHiddenApiBlacklist.isDisabled()) {













            if (!app.info.isAllowedToUseHiddenApi() &&













                    !disableHiddenApiChecks &&













                    !mHiddenApiBlacklist.isDisabled()) {















                // This app is not allowed to use undocumented and private APIs, or blacklisting is















                // enabled. Set up its runtime with the appropriate flag.















                runtimeFlags |= Zygote.ENABLE_HIDDEN_API_CHECKS;










@@ -12782,6 +12795,12 @@ public class ActivityManagerService extends IActivityManager.Stub













    @GuardedBy("this")















    final ProcessRecord addAppLocked(ApplicationInfo info, String customProcess, boolean isolated,















            String abiOverride) {













        return addAppLocked(info, customProcess, isolated, false /* disableHiddenApiChecks */,













                abiOverride);













    }

























    final ProcessRecord addAppLocked(ApplicationInfo info, String customProcess, boolean isolated,













            boolean disableHiddenApiChecks, String abiOverride) {















        ProcessRecord app;















        if (!isolated) {















            app = getProcessRecordLocked(customProcess != null ? customProcess : info.processName,










@@ -12813,7 +12832,8 @@ public class ActivityManagerService extends IActivityManager.Stub













        if (app.thread == null && mPersistentStartingProcesses.indexOf(app) < 0) {















            mPersistentStartingProcesses.add(app);















            startProcessLocked(app, "added application",













                    customProcess != null ? customProcess : app.processName, abiOverride);













                    customProcess != null ? customProcess : app.processName, disableHiddenApiChecks,













                    abiOverride);















        }





























        return app;










@@ -21624,7 +21644,10 @@ public class ActivityManagerService extends IActivityManager.Stub













                mUsageStatsService.reportEvent(ii.targetPackage, userId,















                        UsageEvents.Event.SYSTEM_INTERACTION);















            }













            ProcessRecord app = addAppLocked(ai, defProcess, false, abiOverride);













            boolean disableHiddenApiChecks =













                    (flags & INSTRUMENTATION_FLAG_DISABLE_HIDDEN_API_CHECKS) != 0;













            ProcessRecord app = addAppLocked(ai, defProcess, false, disableHiddenApiChecks,













                    abiOverride);















            app.instr = activeInstr;















            activeInstr.mFinished = false;















            activeInstr.mRunningProcesses.add(app);

























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



+2
−1




























Original line number
Diff line number
Diff line








@@ -2608,7 +2608,7 @@ final class ActivityManagerShellCommand extends ShellCommand {













            pw.println("          specified then send to all users.");















            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("          [--user <USER_ID> | current] [--no-hidden-api-checks]");















            pw.println("          [--no-window-animation] [--abi <ABI>] <COMPONENT>");















            pw.println("      Start an Instrumentation.  Typically this target <COMPONENT> is in the");















            pw.println("      form <TEST_PACKAGE>/<RUNNER_CLASS> or only <TEST_PACKAGE> if there");









@@ -2626,6 +2626,7 @@ final class ActivityManagerShellCommand extends ShellCommand {













            pw.println("          test runners.");















            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-window-animation: turn off window animations while running.");















            pw.println("      --abi <ABI>: Launch the instrumented process with the selected ABI.");















            pw.println("          This assumes that the process supports the selected ABI.");