summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorSteven Moreland <smoreland@google.com>2020-08-13 22:46:35 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-08-13 22:46:35 +0000
commitdda9aa4f65b9028726b8c647cd22baeba6cf5e71 (patch)
tree924d78208441aa7660ba400a01eee32110dccecb /core/java/android
parent6fc6a67ec37771acdc60e71c3ead89c73b4198e5 (diff)
parent96894457f72dc23e32e132049a741f0bb062cfe9 (diff)
Merge "ApplicationLoaders: improve classloader cache errs" am: 6bfe7f9a26 am: bf9f6b4f3b am: 96894457f7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399628 Change-Id: I81e7566993bbc4a0791a734d667acf778abc8421
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/app/ApplicationLoaders.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/app/ApplicationLoaders.java b/core/java/android/app/ApplicationLoaders.java
index bac432e42318..0796dbf08166 100644
--- a/core/java/android/app/ApplicationLoaders.java
+++ b/core/java/android/app/ApplicationLoaders.java
@@ -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;
}