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

Commit dda7f16e 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: 191cd839 

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



Change-Id: Ia2853e505901323da50700a9ba7da49b72dd7435
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8b867e88 191cd839

core/java/android/app/LoadedApk.java

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




    @UnsupportedAppUsage

    @UnsupportedAppUsage

    public ClassLoader getClassLoader() {

    public ClassLoader getClassLoader() {

        ClassLoader ret = mClassLoader;

        if (ret != null) {

            return ret;

        }

        synchronized (mLock) {

        synchronized (mLock) {

            if (mClassLoader == null) {

            if (mClassLoader == null) {

                createOrUpdateClassLoaderLocked(null /*addedPaths*/);

                createOrUpdateClassLoaderLocked(null /*addedPaths*/);