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

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

Merge "Merge "Special handling of priv-apps in Zygote." am: 46af70ca am:... 

Merge "Merge "Special handling of priv-apps in Zygote." am: 46af70ca am: 79d4ef6c am: 836f2fe7 am: 0bd07225"
parents c1741631 46a0cf5a

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

+5 −0
Original line number Diff line number Diff line
@@ -49,6 +49,11 @@ public final class Zygote { 
    /** Make the code Java debuggable by turning off some optimizations. */

    public static final int DEBUG_JAVA_DEBUGGABLE = 1 << 8;



    /** Turn off the verifier. */

    public static final int DISABLE_VERIFIER = 1 << 9;

    /** Only use oat files located in /system. Otherwise use dex/jar/apk . */

    public static final int ONLY_USE_SYSTEM_OAT_FILES = 1 << 10;



    /** No external storage should be mounted. */

    public static final int MOUNT_EXTERNAL_NONE = IVold.REMOUNT_MODE_NONE;

    /** Default external storage should be mounted. */

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

+6 −0
Original line number Diff line number Diff line
@@ -3786,6 +3786,12 @@ public class ActivityManagerService extends IActivityManager.Stub 
                mNativeDebuggingApp = null;

            }













            if (app.info.isPrivilegedApp() &&













                    !SystemProperties.getBoolean("pm.dexopt.priv-apps", true)) {













                runtimeFlags |= Zygote.DISABLE_VERIFIER;













                runtimeFlags |= Zygote.ONLY_USE_SYSTEM_OAT_FILES;













            }



























            String invokeWith = null;















            if ((app.info.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0) {















                // Debuggable apps may include a wrapper script with their library directory.