Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NPE when loading recently opened apps on the Apps page" into udc-dev am: 9ea6429756 am: cc8d5f0de3

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

Change-Id: I8bed0ffe9a939551a3f9460b2436a4cd7b47325d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yanting Yang
2023-06-01 13:29:25 +00:00
committed by Automerger Merge Worker
parent 771907f97a cc8d5f0de3
commit 87918f0773
2 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java
View File

@@ -484,8 +484,9 @@ public class ApplicationsState {
if (DEBUG_LOCKING) Log.v(TAG, "getEntry about to acquire lock...");
synchronized (mEntriesMap) {
AppEntry entry = null;
if (mEntriesMap.contains(userId)) {
entry = mEntriesMap.get(userId).get(packageName);
HashMap<String, AppEntry> userEntriesMap = mEntriesMap.get(userId);
if (userEntriesMap != null) {
entry = userEntriesMap.get(packageName);
}
if (entry == null) {
ApplicationInfo info = getAppInfoLocked(packageName, userId);
@@ -735,8 +736,9 @@ public class ApplicationsState {
private AppEntry getEntryLocked(ApplicationInfo info) {
int userId = UserHandle.getUserId(info.uid);
AppEntry entry = null;
if (mEntriesMap.contains(userId)) {
entry = mEntriesMap.get(userId).get(info.packageName);
HashMap<String, AppEntry> userEntriesMap = mEntriesMap.get(userId);
if (userEntriesMap != null) {
entry = userEntriesMap.get(info.packageName);
}
if (DEBUG) {
Log.i(TAG, "Looking up entry of pkg " + info.packageName + ": " + entry);
@@ -752,8 +754,11 @@ public class ApplicationsState {
Log.i(TAG, "Creating AppEntry for " + info.packageName);
}
entry = new AppEntry(mContext, info, mCurId++);
mEntriesMap.get(userId).put(info.packageName, entry);
mAppEntries.add(entry);
userEntriesMap = mEntriesMap.get(userId);
if (userEntriesMap != null) {
userEntriesMap.put(info.packageName, entry);
mAppEntries.add(entry);
}
} else if (entry.info != info) {
entry.info = info;
}

13
packages/SettingsLib/tests/robotests/src/com/android/settingslib/applications/ApplicationsStateRoboTest.java
View File

@@ -804,7 +804,7 @@ public class ApplicationsStateRoboTest {
}
@Test
public void getEntry_validUserId_shouldReturnEntry() {
public void getEntry_hasCache_shouldReturnCacheEntry() {
mApplicationsState.mEntriesMap.put(/* userId= */ 0, new HashMap<>());
addApp(PKG_1, /* id= */ 1);
@@ -813,10 +813,13 @@ public class ApplicationsStateRoboTest {
}
@Test
public void getEntry_invalidUserId_shouldReturnNull() {
mApplicationsState.mEntriesMap.put(/* userId= */ 0, new HashMap<>());
addApp(PKG_1, /* id= */ 1);
public void getEntry_hasNoCache_shouldReturnEntry() {
mApplicationsState.mEntriesMap.clear();
ApplicationInfo appInfo = createApplicationInfo(PKG_1, /* uid= */ 0);
mApplicationsState.mApplications.add(appInfo);
mApplicationsState.mSystemModules.put(PKG_1, /* value= */ false);
assertThat(mApplicationsState.getEntry(PKG_1, /* userId= */ -1)).isNull();
assertThat(mApplicationsState.getEntry(PKG_1, /* userId= */ 0).info.packageName)
.isEqualTo(PKG_1);
}
}