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

Commit 51e5edcb authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
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."
parents f5166d55 8677f1b6

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

            }

        }