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

Commit 0a8a686f authored by Kazuki Takise's avatar Kazuki Takise
Browse files

Add null check for notification preference helper 

Not sure about the exact situation, but depending on timing or
vendor implementation, this NPE could happen and at least we
should avoid this as it's system_server process.

We observed this when running WM CTS for ARC.

Bug: 225309857
Test: Run WM CTS
Change-Id: I095b0f51d8a0d436cca5072073032b26ddd11a90
parent f5ff7aa9

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -601,8 +601,10 @@ public class PreferencesHelper implements RankingConfig { 
                out.attribute(null, ATT_NAME, r.pkg);

                out.attribute(null, ATT_NAME, r.pkg);

                if (!notifPermissions.isEmpty()) {

                if (!notifPermissions.isEmpty()) {

                    Pair<Integer, String> app = new Pair(r.uid, r.pkg);

                    Pair<Integer, String> app = new Pair(r.uid, r.pkg);

                    final Pair<Boolean, Boolean> permission = notifPermissions.get(app);

                    out.attributeInt(null, ATT_IMPORTANCE,

                    out.attributeInt(null, ATT_IMPORTANCE,

                            notifPermissions.get(app).first ? IMPORTANCE_DEFAULT : IMPORTANCE_NONE);

                            permission != null && permission.first ? IMPORTANCE_DEFAULT

                                    : IMPORTANCE_NONE);

                    notifPermissions.remove(app);

                    notifPermissions.remove(app);

                } else {

                } else {

                    if (r.importance != DEFAULT_IMPORTANCE) {

                    if (r.importance != DEFAULT_IMPORTANCE) {