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

Commit 17094702 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "ApplicationLoaders: improve classloader cache errs" am: 6bfe7f9a am:... 

Merge "ApplicationLoaders: improve classloader cache errs" am: 6bfe7f9a am: bf9f6b4f am: 96894457 am: dda9aa4f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399628

Change-Id: Ib3d2e32ba6c0130fa07475c9c25c1a63b76d9ce7
parents 9841667f dda9aa4f

core/java/android/app/ApplicationLoaders.java

+2 −2
Original line number Diff line number Diff line
@@ -232,8 +232,8 @@ public class ApplicationLoaders { 


        // cached must be built and loaded in the same environment

        if (!sharedLibrariesEquals(sharedLibraries, cached.sharedLibraries)) {

            Log.w(TAG, "Unexpected environment for cached library: (" + sharedLibraries + "|"

                    + cached.sharedLibraries + ")");

            Log.w(TAG, "Unexpected environment loading cached library " + zip + " (real|cached): ("

                    + sharedLibraries + "|" + cached.sharedLibraries + ")");

            return null;

        }