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

Commit 7b198b32 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use Settings.Secure SHOW_ZEN_UPGRADE_NOTIFICATION"

parents 4653c3b5 9087cd1c

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

+3 −3
Original line number Diff line number Diff line
@@ -1161,13 +1161,13 @@ public class ZenModeHelper { 
        final boolean showNotification = mIsBootComplete

                && zen != Global.ZEN_MODE_OFF

                && !isWatch

                && Settings.Global.getInt(mContext.getContentResolver(),

                && Settings.Secure.getInt(mContext.getContentResolver(),

                Settings.Secure.SHOW_ZEN_UPGRADE_NOTIFICATION, 0) != 0

                && Settings.Global.getInt(mContext.getContentResolver(),

                && Settings.Secure.getInt(mContext.getContentResolver(),

                Settings.Secure.ZEN_SETTINGS_UPDATED, 0) != 1;



        if (isWatch) {

            Settings.Global.putInt(mContext.getContentResolver(),

            Settings.Secure.putInt(mContext.getContentResolver(),

                    Settings.Secure.SHOW_ZEN_UPGRADE_NOTIFICATION, 0);

        }