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

am: 0eda9fd9dd Change-Id: Ia51be3f19a1e35ff9cbb27601a527014b2f0b1f8
2019-03-29 07:27:29 -07:00
parent fcf00a95b0 0eda9fd9dd
commit 3baf52c72c
1 changed files with 8 additions and 5 deletions
--- a/services/core/java/com/android/server/notification/RankingHelper.java
+++ b/services/core/java/com/android/server/notification/RankingHelper.java
@@ -1401,11 +1401,14 @@ public class RankingHelper implements RankingConfig {
                }
                // Package upgrade
                try {
-                    Record fullRecord = getRecord(pkg,
-                            mPm.getPackageUidAsUser(pkg, changeUserId));
-                    if (fullRecord != null) {
-                        createDefaultChannelIfNeeded(fullRecord);
-                        deleteDefaultChannelIfNeeded(fullRecord);
+                    synchronized (mRecords) {
+                        final String key = recordKey(pkg,
+                                mPm.getPackageUidAsUser(pkg, changeUserId));
+                        Record fullRecord = mRecords.get(key);
+                        if (fullRecord != null) {
+                            createDefaultChannelIfNeeded(fullRecord);
+                            deleteDefaultChannelIfNeeded(fullRecord);
+                        }
                    }
                } catch (NameNotFoundException e) {}
            }