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

Commit af657ae9 authored by Calin Juravle's avatar Calin Juravle Committed by android-build-merger
Browse files

Merge "Workaround to get passed the broken install flow" 

am: b0e6508a

Change-Id: Icbad0d985b4d8d3e206ee5e426cdd1f58955aec1
parents a3185b2f b0e6508a

core/java/android/os/Process.java

+3 −0
Original line number Diff line number Diff line
@@ -151,6 +151,9 @@ public class Process { 
     */

    public static final int OTA_UPDATE_UID = 1061;



    /** {@hide} */

    public static final int NOBODY_UID = 9999;



    /**

     * Defines the start of a range of UIDs (and GIDs), going from this

     * number to {@link #LAST_APPLICATION_UID} that are reserved for assigning

services/core/java/com/android/server/pm/PackageDexOptimizer.java

+7 −1
Original line number Diff line number Diff line
@@ -154,7 +154,13 @@ public class PackageDexOptimizer { 
                targetInstructionSets : getAppDexInstructionSets(pkg.applicationInfo);

        final String[] dexCodeInstructionSets = getDexCodeInstructionSets(instructionSets);

        final List<String> paths = pkg.getAllCodePaths();

        final int sharedGid = UserHandle.getSharedAppGid(pkg.applicationInfo.uid);



        int sharedGid = UserHandle.getSharedAppGid(pkg.applicationInfo.uid);

        if (sharedGid == -1) {

            Slog.wtf(TAG, "Well this is awkward; package " + pkg.applicationInfo.name + " had UID "

                    + pkg.applicationInfo.uid, new Throwable());

            sharedGid = android.os.Process.NOBODY_UID;

        }



        // Get the class loader context dependencies.

        // For each code path in the package, this array contains the class loader context that