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

Commit a27cd305 authored by Artur Satayev's avatar Artur Satayev
Browse files

Revert "Revert "Do not propogate test api access flags to Zygote."" 

This reverts commit 9c2ab16c.

Reason for revert: Fixed broken tests. Enable TestApi access for the
target package, and not the test package itself. By default, target
package is a test package, however, it is possible to run a test under
a different instremented package name.

Test: atest CameraEvictionTest#testBasicCamera2ActivityEviction
      atest com.google.android.security.gts.PackageVerifierTest#testNormalInstallInfoCorrect
      atest com.google.android.security.gts.AppIntegrityManagerTest#testRuleEvaluation_update
Bug: 178391911,147113465
Change-Id: I0bf109fa78212d6d71ba85d25f80e27e8e7cd900
parent 61281508

core/java/com/android/internal/os/Zygote.java

+1 −8
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ public final class Zygote { 
     */

    public static final int PROFILE_FROM_SHELL = 1 << 15;



    /*

    /**

     * Enable using the ART app image startup cache

     */

    public static final int USE_APP_IMAGE_STARTUP_CACHE = 1 << 16;
@@ -116,13 +116,6 @@ public final class Zygote { 
     */

    public static final int DEBUG_IGNORE_APP_SIGNAL_HANDLER = 1 << 17;



    /**

     * Disable runtime access to {@link android.annotation.TestApi} annotated members.

     *

     * <p>This only takes effect if Hidden API access restrictions are enabled as well.

     */

    public static final int DISABLE_TEST_API_ENFORCEMENT_POLICY = 1 << 18;



    public static final int MEMORY_TAG_LEVEL_MASK = (1 << 19) | (1 << 20);

    /**

     * Enable pointer tagging in this process.

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

+6 −14
Original line number Diff line number Diff line
@@ -6043,18 +6043,10 @@ public class ActivityManagerService extends IActivityManager.Stub 
                abiOverride, zygotePolicyFlags);

    }













    @GuardedBy("this")













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













            boolean disableHiddenApiChecks, String abiOverride, int zygotePolicyFlags) {













        return addAppLocked(info, customProcess, isolated, disableHiddenApiChecks,













                false /* disableTestApiChecks */, abiOverride, zygotePolicyFlags);













    }



























    // TODO: Move to ProcessList?















    @GuardedBy("this")















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













            boolean disableHiddenApiChecks, boolean disableTestApiChecks,













            String abiOverride, int zygotePolicyFlags) {













            boolean disableHiddenApiChecks, String abiOverride, int zygotePolicyFlags) {















        ProcessRecord app;















        if (!isolated) {















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










@@ -6089,7 +6081,7 @@ public class ActivityManagerService extends IActivityManager.Stub













            mPersistentStartingProcesses.add(app);















            mProcessList.startProcessLocked(app, new HostingRecord("added application",















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













                    zygotePolicyFlags, disableHiddenApiChecks, disableTestApiChecks, abiOverride);













                    zygotePolicyFlags, disableHiddenApiChecks, abiOverride);















        }





























        return app;










@@ -14385,11 +14377,12 @@ public class ActivityManagerService extends IActivityManager.Stub













                    || (flags & INSTR_FLAG_DISABLE_HIDDEN_API_CHECKS) != 0;















            boolean disableTestApiChecks = disableHiddenApiChecks















                    || (flags & INSTR_FLAG_DISABLE_TEST_API_CHECKS) != 0;



























            if (disableHiddenApiChecks || disableTestApiChecks) {















                enforceCallingPermission(android.Manifest.permission.DISABLE_HIDDEN_API_CHECKS,















                        "disable hidden API checks");



























                enableTestApiAccess(ii.packageName);













                enableTestApiAccess(ai.packageName);















            }





























            final long origId = Binder.clearCallingIdentity();









@@ -14406,11 +14399,10 @@ public class ActivityManagerService extends IActivityManager.Stub













                    mUsageStatsService.reportEvent(ii.targetPackage, userId,















                            UsageEvents.Event.SYSTEM_INTERACTION);















                }













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













                        disableTestApiChecks, abiOverride, ZYGOTE_POLICY_FLAG_EMPTY);













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













                        ZYGOTE_POLICY_FLAG_EMPTY);















            }









































            app.setActiveInstrumentation(activeInstr);















            activeInstr.mFinished = false;















            activeInstr.mSourceUid = callingUid;

























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



+2
−8




























Original line number
Diff line number
Diff line








@@ -1748,8 +1748,7 @@ public final class ProcessList {













     */















    @GuardedBy("mService")















    boolean startProcessLocked(ProcessRecord app, HostingRecord hostingRecord,













            int zygotePolicyFlags, boolean disableHiddenApiChecks, boolean disableTestApiChecks,













            String abiOverride) {













            int zygotePolicyFlags, boolean disableHiddenApiChecks, String abiOverride) {















        if (app.pendingStart) {















            return true;















        }










@@ -1889,10 +1888,6 @@ public final class ProcessList {













                    throw new IllegalStateException("Invalid API policy: " + policy);















                }















                runtimeFlags |= policyBits;



























                if (disableTestApiChecks) {













                    runtimeFlags |= Zygote.DISABLE_TEST_API_ENFORCEMENT_POLICY;













                }















            }































            String useAppImageCache = SystemProperties.get(










@@ -2342,8 +2337,7 @@ public final class ProcessList {













    final boolean startProcessLocked(ProcessRecord app, HostingRecord hostingRecord,















            int zygotePolicyFlags, String abiOverride) {















        return startProcessLocked(app, hostingRecord, zygotePolicyFlags,













                false /* disableHiddenApiChecks */, false /* disableTestApiChecks */,













                abiOverride);













                false /* disableHiddenApiChecks */, abiOverride);















    }































    @GuardedBy("mService")