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

Commit ff8c375e authored by satayev's avatar satayev
Browse files

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

This reverts commit bff33b8c.

Reason for revert: cts tests on -user builds is broken

Change-Id: I2edf200561f839e49e067403714ea6fa65bdc978
Merged-In: I2edf200561f839e49e067403714ea6fa65bdc978
parent bff33b8c

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

+8 −1
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,6 +116,13 @@ 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

+15 −5
Original line number Diff line number Diff line
@@ -8211,11 +8211,20 @@ public class ActivityManagerService extends IActivityManager.Stub 
                false /* mountExtStorageFull */, abiOverride, zygotePolicyFlags);

    }













    // TODO: Move to ProcessList?















    @GuardedBy("this")















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















            boolean disableHiddenApiChecks, boolean mountExtStorageFull, String abiOverride,















            int zygotePolicyFlags) {













        return addAppLocked(info, customProcess, isolated, disableHiddenApiChecks,













                false /* disableTestApiChecks */, mountExtStorageFull, abiOverride,













                zygotePolicyFlags);













    }

























    // TODO: Move to ProcessList?













    @GuardedBy("this")













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













            boolean disableHiddenApiChecks, boolean disableTestApiChecks,













            boolean mountExtStorageFull, String abiOverride, int zygotePolicyFlags) {















        ProcessRecord app;















        if (!isolated) {















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










@@ -8250,7 +8259,8 @@ public class ActivityManagerService extends IActivityManager.Stub













            mPersistentStartingProcesses.add(app);















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















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













                    zygotePolicyFlags, disableHiddenApiChecks, mountExtStorageFull, abiOverride);













                    zygotePolicyFlags, disableHiddenApiChecks, disableTestApiChecks,













                    mountExtStorageFull, abiOverride);















        }





























        return app;










@@ -16933,12 +16943,11 @@ 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(ai.packageName);













                enableTestApiAccess(ii.packageName);















            }





























            // TODO(b/158750470): remove









@@ -16956,7 +16965,8 @@ public class ActivityManagerService extends IActivityManager.Stub













            }





























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













                    mountExtStorageFull, abiOverride, ZYGOTE_POLICY_FLAG_EMPTY);













                    disableTestApiChecks, mountExtStorageFull, abiOverride,













                    ZYGOTE_POLICY_FLAG_EMPTY);















            app.setActiveInstrumentation(activeInstr);















            activeInstr.mFinished = false;















            activeInstr.mSourceUid = callingUid;

























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



+8
−3




























Original line number
Diff line number
Diff line








@@ -1769,8 +1769,8 @@ public final class ProcessList {













     */















    @GuardedBy("mService")















    boolean startProcessLocked(ProcessRecord app, HostingRecord hostingRecord,













            int zygotePolicyFlags, boolean disableHiddenApiChecks, boolean mountExtStorageFull,













            String abiOverride) {













            int zygotePolicyFlags, boolean disableHiddenApiChecks, boolean disableTestApiChecks,













            boolean mountExtStorageFull, String abiOverride) {















        if (app.pendingStart) {















            return true;















        }










@@ -1914,6 +1914,10 @@ 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(










@@ -2356,7 +2360,8 @@ public final class ProcessList {













    final boolean startProcessLocked(ProcessRecord app, HostingRecord hostingRecord,















            int zygotePolicyFlags, String abiOverride) {















        return startProcessLocked(app, hostingRecord, zygotePolicyFlags,













                false /* disableHiddenApiChecks */, false /* mountExtStorageFull */, abiOverride);













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













                false /* mountExtStorageFull */, abiOverride);















    }































    @GuardedBy("mService")