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

Commit c6e73437 authored by Jing Ji's avatar Jing Ji
Browse files

Context#startInstrumentation could be started from SHELL only now. 

...or it'll throw a SecurityException.

Bug: 237766679
Test: atest CtsAppTestCases:InstrumentationTest
Change-Id: Ia08f225c21a3933067d066a578ea4af9c23e7d4c
parent c49a7c12

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

+11 −0
Original line number Diff line number Diff line
@@ -14692,6 +14692,17 @@ public class ActivityManagerService extends IActivityManager.Stub 
                }

            }













            if (!Build.IS_DEBUGGABLE && callingUid != ROOT_UID && callingUid != SHELL_UID













                    && callingUid != SYSTEM_UID) {













                // If it's not debug build and not called from root/shell/system uid, reject it.













                String msg = "Permission Denial: instrumentation test "













                        + className + " from pid=" + callingPid + ", uid=" + callingUid













                        + " not allowed because target package " + ii.targetPackage













                        + " is not debuggable.";













                reportStartInstrumentationFailureLocked(watcher, className, msg);













                throw new SecurityException(msg);













            }



























            boolean disableHiddenApiChecks = ai.usesNonSdkApi()















                    || (flags & INSTR_FLAG_DISABLE_HIDDEN_API_CHECKS) != 0;















            boolean disableTestApiChecks = disableHiddenApiChecks