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

Commit 501ed30e authored by Varun Shah's avatar Varun Shah Committed by Automerger Merge Worker
Browse files

Merge "am:fix the dead lock." into main am: 6d444f1a am: 30b5279e 

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



Change-Id: Ic0d97cafdfa624ba0dc9ee637805646110e75d57
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 350ccc14 30b5279e

services/core/java/com/android/server/am/AppRestrictionController.java

+4 −4
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ public final class AppRestrictionController { 
    /**

     * Cache the package name and information about if it's a system module.

     */

    @GuardedBy("mLock")

    @GuardedBy("mSystemModulesCache")

    private final HashMap<String, Boolean> mSystemModulesCache = new HashMap<>();



    /**
@@ -1603,7 +1603,7 @@ public final class AppRestrictionController { 
        if (moduleInfos == null) {

            return;

        }

        synchronized (mLock) {

        synchronized (mSystemModulesCache) {

            for (ModuleInfo info : moduleInfos) {

                mSystemModulesCache.put(info.getPackageName(), Boolean.TRUE);

            }
@@ -1611,7 +1611,7 @@ public final class AppRestrictionController { 
    }



    private boolean isSystemModule(String packageName) {

        synchronized (mLock) {

        synchronized (mSystemModulesCache) {

            final Boolean val = mSystemModulesCache.get(packageName);

            if (val != null) {

                return val.booleanValue();
@@ -1639,7 +1639,7 @@ public final class AppRestrictionController { 
            }

        }

        // Update the cache.

        synchronized (mLock) {

        synchronized (mSystemModulesCache) {

            mSystemModulesCache.put(packageName, isSystemModule);

        }

        return isSystemModule;