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

Commit 8677f1b6 authored by Ethan_Hu's avatar Ethan_Hu Committed by Julia Reynolds
Browse files

Fixed NPE in RankingHelper.writeXml. 


Make sure that mRecords is operated with the object lock.

Bug:127290258
Test: Repeat to upgrade the App targetversion from less than O to a later version
Change-Id: I70e61c0fcd3071f32a430d45441ffe1376147a5d
Signed-off-by: default avatarEthan_Hu <huyuxin3818@gmail.com>
Merged-In: Ic7f676499425fe54453384d7c03de5d95c03a713
parent d14d29ca

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

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

                }

                // Package upgrade

                // Package upgrade

                try {

                try {

                    Record fullRecord = getRecord(pkg,

                    synchronized (mRecords) {

                        final String key = recordKey(pkg,

                                mPm.getPackageUidAsUser(pkg, changeUserId));

                                mPm.getPackageUidAsUser(pkg, changeUserId));

                        Record fullRecord = mRecords.get(key);

                        if (fullRecord != null) {

                        if (fullRecord != null) {

                            createDefaultChannelIfNeeded(fullRecord);

                            createDefaultChannelIfNeeded(fullRecord);

                            deleteDefaultChannelIfNeeded(fullRecord);

                            deleteDefaultChannelIfNeeded(fullRecord);

                        }

                        }

                    }

                } catch (NameNotFoundException e) {}

                } catch (NameNotFoundException e) {}

            }

            }

        }

        }