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

Commit 063f0d4c 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 am: 4e7a5bf7... 

Merge "Make sure the right DND config is used" am: 749cd526 am: 4e7a5bf7 am: 0e975c25 am: cfceac99

Change-Id: Ib43586836c5ab73538d40091dbb9cc2ef840a40e
parents 3c6bcfc2 cfceac99

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

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

            final boolean policyChanged = !Objects.equals(getNotificationPolicy(mConfig),

                    getNotificationPolicy(config));

                    getNotificationPolicy(config));

            if (!config.equals(mConfig)) {

            if (!config.equals(mConfig)) {

                mConfig = config;

                dispatchOnConfigChanged();

                dispatchOnConfigChanged();

                updateConsolidatedPolicy(reason);

                updateConsolidatedPolicy(reason);

            }

            }

            if (policyChanged) {

            if (policyChanged) {

                dispatchOnPolicyChanged();

                dispatchOnPolicyChanged();

            }

            }

            mConfig = config;

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

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

            return true;

            return true;

        } catch (SecurityException e) {

        } catch (SecurityException e) {