commit 7b198b32178ada8dbf8153e4b88b20e7b7126332
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Sep 24 15:26:19 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 24 15:26:19 2018 +0000
tree 1c5abcbb584136be5461ff790a960089b7d64e68
parent 4653c3b53fe5dc0b55d2e690abb8ea8cbc004d02
parent 9087cd1c46bc4f37474fa818b3877c057d7137be

Merge "Use Settings.Secure SHOW_ZEN_UPGRADE_NOTIFICATION"

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

diff --git a/services/core/java/com/android/server/notification/ZenModeHelper.java b/services/core/java/com/android/server/notification/ZenModeHelper.java
index 25f52e7..9bf21c8 100644
--- a/services/core/java/com/android/server/notification/ZenModeHelper.java
+++ b/services/core/java/com/android/server/notification/ZenModeHelper.java
@@ -1161,13 +1161,13 @@
         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);
         }