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

Fix NPE when deleting old zen rules am: 7bb9cd92bf am: 8a021141ff

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19202448

Change-Id: I30d2f72da503892d245bbedf27f2395f8640923d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Julia Reynolds
2022-08-10 22:21:02 +00:00
committed by Automerger Merge Worker
parent 8e552b10c7 8a021141ff
commit b953b5eff6
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/notification/ZenModeHelper.java
View File

@@ -404,7 +404,14 @@ public class ZenModeHelper {
newConfig = mConfig.copy(); newConfig = mConfig.copy();
for (int i = newConfig.automaticRules.size() - 1; i >= 0; i--) { for (int i = newConfig.automaticRules.size() - 1; i >= 0; i--) {
ZenRule rule = newConfig.automaticRules.get(newConfig.automaticRules.keyAt(i)); ZenRule rule = newConfig.automaticRules.get(newConfig.automaticRules.keyAt(i));
if (rule.pkg.equals(packageName) && canManageAutomaticZenRule(rule)) { String pkg = rule.pkg != null
? rule.pkg
: (rule.component != null)
? rule.component.getPackageName()
: (rule.configurationActivity != null)
? rule.configurationActivity.getPackageName()
: null;
if (Objects.equals(pkg, packageName) && canManageAutomaticZenRule(rule)) {
newConfig.automaticRules.removeAt(i); newConfig.automaticRules.removeAt(i);
} }
} }