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

Commit 9302c24d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Don't wait on lock in getClassLoader if already cached." into main am:... 

Merge "Don't wait on lock in getClassLoader if already cached." into main am: 191cd839 am: dda7f16e

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



Change-Id: I5358df9ec7f18909c0d7f506b0968bb740deb191
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ef0911d3 dda7f16e

core/java/android/app/LoadedApk.java

+4 −0
Original line number Diff line number Diff line
@@ -1129,6 +1129,10 @@ public final class LoadedApk { 


    @UnsupportedAppUsage

    public ClassLoader getClassLoader() {

        ClassLoader ret = mClassLoader;

        if (ret != null) {

            return ret;

        }

        synchronized (mLock) {

            if (mClassLoader == null) {

                createOrUpdateClassLoaderLocked(null /*addedPaths*/);