From 170ac41d329349edb67163fbd5f49f4788a55fcc Mon Sep 17 00:00:00 2001 From: alk3pInjection Date: Thu, 20 Apr 2023 00:08:54 +0800 Subject: Revert "Disable notification channel warnings by default" Fixed upstream This reverts commit 60090ce184bc7a55409d91ed6b8ecf306dea14a4. Change-Id: I93840f103e035e826c928e31beed8e8bc9ff0539 --- .../com/android/server/notification/NotificationManagerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index 5ae87689ef48..a8647c624bdc 100755 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -6766,7 +6766,7 @@ public class NotificationManagerService extends SystemService { protected void doChannelWarningToast(int forUid, CharSequence toastText) { Binder.withCleanCallingIdentity(() -> { - final int defaultWarningEnabled = Build.IS_ENG ? 1 : 0; + final int defaultWarningEnabled = Build.IS_DEBUGGABLE ? 1 : 0; final boolean warningEnabled = Settings.Global.getInt(getContext().getContentResolver(), Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS, defaultWarningEnabled) != 0; if (warningEnabled) { -- cgit v1.2.3