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

Merge "Fixed NPE in RankingHelper.writeXml. Make sure that mRecords is operated with the object lock."

Browse Source 
am: 51e5edcb9b

Change-Id: I4f57eb27caffbf6462dcad23660f05efce21e74e
This commit is contained in:
Ethan_Hu
2019-03-29 07:18:23 -07:00
committed by android-build-merger
parent 3eb37cda43 51e5edcb9b
commit 0eda9fd9dd
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/notification/RankingHelper.java
View File

@@ -1401,11 +1401,14 @@ public class RankingHelper implements RankingConfig {
} }
// Package upgrade // Package upgrade
try { try {
Record fullRecord = getRecord(pkg, synchronized (mRecords) {
mPm.getPackageUidAsUser(pkg, changeUserId)); final String key = recordKey(pkg,
if (fullRecord != null) { mPm.getPackageUidAsUser(pkg, changeUserId));
createDefaultChannelIfNeeded(fullRecord); Record fullRecord = mRecords.get(key);
deleteDefaultChannelIfNeeded(fullRecord); if (fullRecord != null) {
createDefaultChannelIfNeeded(fullRecord);
deleteDefaultChannelIfNeeded(fullRecord);
}
} }
} catch (NameNotFoundException e) {} } catch (NameNotFoundException e) {}
} }