From d7f77cfab7138d2d5f6c43c191997e813cc2c82e Mon Sep 17 00:00:00 2001 From: Nick James Date: Tue, 3 Jul 2018 16:37:25 +0000 Subject: [PATCH] Revert "Disable DND status change notification on watches." This reverts commit 506417450ba4e3f4ca1366a6d9bdc27186ac44de. Reason for revert: Looking for +2 from main Android team. Change-Id: Ieae138d8a2acce814d6ddbef2545e319edd216fe --- .../java/com/android/server/notification/ZenModeHelper.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/services/core/java/com/android/server/notification/ZenModeHelper.java b/services/core/java/com/android/server/notification/ZenModeHelper.java index 24fd3312f8443..669d5565534de 100644 --- a/services/core/java/com/android/server/notification/ZenModeHelper.java +++ b/services/core/java/com/android/server/notification/ZenModeHelper.java @@ -1182,11 +1182,8 @@ public class ZenModeHelper { } 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;