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

Commit e9bac412 authored by Yanting Yang's avatar Yanting Yang Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE of ApplicationsState" into udc-dev am: c96f8fb0 

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



Change-Id: I0e04a5e73aaeb55326214268c2132a9389b48a6e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2b812f43 c96f8fb0

packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java

+4 −1
Original line number Diff line number Diff line
@@ -483,7 +483,10 @@ public class ApplicationsState { 
    public AppEntry getEntry(String packageName, int userId) {

        if (DEBUG_LOCKING) Log.v(TAG, "getEntry about to acquire lock...");

        synchronized (mEntriesMap) {

            AppEntry entry = mEntriesMap.get(userId).get(packageName);

            AppEntry entry = null;

            if (mEntriesMap.contains(userId)) {

                entry = mEntriesMap.get(userId).get(packageName);

            }

            if (entry == null) {

                ApplicationInfo info = getAppInfoLocked(packageName, userId);

                if (info == null) {