Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add null check for notification preference helper" into tm-dev

Browse Source
This commit is contained in:
Kazuki Takise
2022-03-20 03:28:59 +00:00
committed by Android (Google) Code Review
parent dc59b8781e 0a8a686f1c
commit d7032e596f
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/notification/PreferencesHelper.java
View File

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