Merge "Scale back channel toast" into tm-qpr-dev am: 99a5adfae1 am: f030ca6884

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

Change-Id: I8cccbc33ed1eb0b701c76c25c7f70bd28bc5ea9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Julia Reynolds
2022-07-27 13:33:35 +00:00
committed by Automerger Merge Worker

View File

@@ -6763,9 +6763,8 @@ public class NotificationManagerService extends SystemService {
protected void doChannelWarningToast(int forUid, CharSequence toastText) {
Binder.withCleanCallingIdentity(() -> {
final int defaultWarningEnabled = Build.IS_DEBUGGABLE ? 1 : 0;
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) {
Toast toast = Toast.makeText(getContext(), mHandler.getLooper(), toastText,
Toast.LENGTH_SHORT);