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

Commit 19975240 authored by Steven Moreland's avatar Steven Moreland
Browse files

ApplicationLoaders: improve classloader cache errs 

When zygote preloads a classloader, but at runtime, a different one is
used, we get an error and fallback. This error is improved in the
following ways:
- print the zip name with the shared libraries, so we know which library
  the error is for
- distinguish cached from runtime dependencies in the error message
  itself

Bug: 163886868
Test: N/A
Change-Id: I3f4c4078e9eb05b83058982afc7b7ea0822d1257
parent d64ab185

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;

        }