commit 0eda9fd9ddf191f25db44aa61f831ac2d73b38e7
author Ethan_Hu <huyuxin3818@gmail.com> Fri Mar 29 07:18:23 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Mar 29 07:18:23 2019 -0700
tree 987ebccbff829b6f88618477e997477bc5af3982
parent 3eb37cda43f48ed8e5a089a9d10e4954addb1b91
parent 51e5edcb9ba5bd6364b81294107d072706db79a9

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

Change-Id: I4f57eb27caffbf6462dcad23660f05efce21e74e

services/core/java/com/android/server/notification/RankingHelper.java

diff --git a/services/core/java/com/android/server/notification/RankingHelper.java b/services/core/java/com/android/server/notification/RankingHelper.java
index da6e9c0..abd85cd 100644
--- a/services/core/java/com/android/server/notification/RankingHelper.java
+++ b/services/core/java/com/android/server/notification/RankingHelper.java
@@ -1401,11 +1401,14 @@
                 }
                 // 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) {}
             }