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

Commit 1be4e74d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Handle variable class loader context for system server" into rvc-dev am: 03ec7f2e 

Change-Id: I59377799bbc8b57e2f862a3b121fcf448135054c
parents 1ac59ab7 03ec7f2e

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

+3 −0
Original line number Diff line number Diff line
@@ -725,6 +725,9 @@ public class PackageDexOptimizer { 
        } catch (IOException ioe) {

            Slog.w(TAG, "IOException reading apk: " + path, ioe);

            return DEX_OPT_FAILED;

        } catch (Exception e) {

            Slog.wtf(TAG, "Unexpected exception when calling dexoptNeeded on " + path, e);

            return DEX_OPT_FAILED;

        }

        return adjustDexoptNeeded(dexoptNeeded);

    }

services/core/java/com/android/server/pm/dex/DexManager.java

+10 −0
Original line number Diff line number Diff line
@@ -548,6 +548,16 @@ public class DexManager { 
                continue;

            }



            if (dexUseInfo.isUnsupportedClassLoaderContext()

                    || dexUseInfo.isVariableClassLoaderContext()) {

                String debugMsg = dexUseInfo.isUnsupportedClassLoaderContext()

                        ? "unsupported"

                        : "variable";

                Slog.w(TAG, "Skipping dexopt for system server path loaded with " + debugMsg

                        + " class loader context: " + dexPath);

                continue;

            }



            int newResult = pdo.dexoptSystemServerPath(dexPath, dexUseInfo, overriddenOptions);



            // The end result is: