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

Commit 4e7a5bf7 authored by Julia Reynolds's avatar Julia Reynolds Committed by Automerger Merge Worker
Browse files

Merge "Make sure the right DND config is used" am: 749cd526 

Change-Id: Iaa07c8884f21e4fc50a8a54d4b28e60e8dde66ba
parents 3eea7b19 749cd526

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

+1 −1
Original line number Diff line number Diff line
@@ -844,13 +844,13 @@ public class ZenModeHelper { 
            final boolean policyChanged = !Objects.equals(getNotificationPolicy(mConfig),

                    getNotificationPolicy(config));

            if (!config.equals(mConfig)) {

                mConfig = config;

                dispatchOnConfigChanged();

                updateConsolidatedPolicy(reason);

            }

            if (policyChanged) {

                dispatchOnPolicyChanged();

            }

            mConfig = config;

            mHandler.postApplyConfig(config, reason, triggeringComponent, setRingerMode);

            return true;

        } catch (SecurityException e) {