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

Commit 2553bf50 authored by Julia Reynolds's avatar Julia Reynolds Committed by Automerger Merge Worker
Browse files

Merge "Scale back channel toast" into tm-qpr-dev am: 99a5adfa am: f030ca68 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19414383



Change-Id: I8cccbc33ed1eb0b701c76c25c7f70bd28bc5ea9a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2f7781a3 f030ca68

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -6763,9 +6763,8 @@ public class NotificationManagerService extends SystemService { 
















    protected void doChannelWarningToast(int forUid, CharSequence toastText) {







    protected void doChannelWarningToast(int forUid, CharSequence toastText) {











        Binder.withCleanCallingIdentity(() -> {







        Binder.withCleanCallingIdentity(() -> {











            final int defaultWarningEnabled = Build.IS_DEBUGGABLE ? 1 : 0;














            final boolean warningEnabled = Settings.Global.getInt(getContext().getContentResolver(),







            final boolean warningEnabled = Settings.Global.getInt(getContext().getContentResolver(),











                    Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS, defaultWarningEnabled) != 0;







                    Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS, 0) != 0;











            if (warningEnabled) {







            if (warningEnabled) {











                Toast toast = Toast.makeText(getContext(), mHandler.getLooper(), toastText,







                Toast toast = Toast.makeText(getContext(), mHandler.getLooper(), toastText,











                        Toast.LENGTH_SHORT);







                        Toast.LENGTH_SHORT);