Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0eda9fd9 authored by Ethan_Hu's avatar Ethan_Hu Committed by android-build-merger
Browse files

Merge "Fixed NPE in RankingHelper.writeXml. Make sure that mRecords is... 

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

Change-Id: I4f57eb27caffbf6462dcad23660f05efce21e74e
parents 3eb37cda 51e5edcb

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

+8 −5
Original line number Diff line number Diff line
@@ -1401,12 +1401,15 @@ public class RankingHelper implements RankingConfig { 
                }

                // Package upgrade

                try {

                    Record fullRecord = getRecord(pkg,

                    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) {}

            }

        }