commit 20d2b5d4905d05a68ff3dd7a7e4d170188a6143a
author Nick James <nickjames@google.com> Thu Jun 28 20:58:44 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 28 20:58:44 2018 +0000
tree e79d06d7233e833b64367fd754c6d6205a97549c
parent 5328213752e310fc6858c0c447dcbd8e73cb1577
parent 506417450ba4e3f4ca1366a6d9bdc27186ac44de

Merge "Disable DND status change notification on watches."

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 669d556..24fd331 100644
--- a/services/core/java/com/android/server/notification/ZenModeHelper.java
+++ b/services/core/java/com/android/server/notification/ZenModeHelper.java
@@ -1182,8 +1182,11 @@
     }
 
     private void showZenUpgradeNotification(int zen) {
+        final boolean isWatch = mContext.getPackageManager().hasSystemFeature(
+            PackageManager.FEATURE_WATCH);
         final boolean showNotification = mIsBootComplete
                 && zen != Global.ZEN_MODE_OFF
+                && !isWatch
                 && Settings.Global.getInt(mContext.getContentResolver(),
                 Settings.Global.SHOW_ZEN_UPGRADE_NOTIFICATION, 0) != 0;