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

Commit 38f1ac1a authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Fix NullPointerException in ZenModeHelper"

parents 48f2fad4 24bdf229

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

+1 −1
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ public class ZenModeHelper { 
        for (ZenRule defaultRule : mDefaultConfig.automaticRules.values()) {

            ZenRule currRule = mConfig.automaticRules.get(defaultRule.id);

            // if default rule wasn't modified, use localized name instead of previous

            if (!currRule.modified && !defaultRule.name.equals(currRule.name)) {

            if (currRule != null && !currRule.modified && !defaultRule.name.equals(currRule.name)) {

                if (canManageAutomaticZenRule(defaultRule)) {

                    if (DEBUG) Slog.d(TAG, "Locale change - updating default zen rule name "

                            + "from " + currRule.name + " to " + defaultRule.name);