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
This commit is contained in:
Treehugger Robot
2019-03-29 14:04:27 +00:00
committed by Gerrit Code Review
parent f5166d5527 8677f1b6ea
commit 51e5edcb9b
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) {}
} }