commit 31b9ed66bc7fd4b328fa66bae72eddb12fdb84d0
author Eric Laurent <elaurent@google.com> Tue Feb 23 22:35:36 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 23 22:35:36 2021 +0000
tree 6d8b5f2ff188e936d72f8833d535c8509e615994
parent 0a5ceea8704e3fa3d5878526f475e084c55d5ca2
parent 6c0a02ad3078b983a6580ffa52319c1e60af8ad3

Merge "[Bugfix]audio:force show safe volume warning dialog" am: 6c0a02ad30

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I23dbf3707f56a59d3586f806451d79bf7b4fc1a1

services/core/java/com/android/server/audio/AudioService.java

diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index bf2fc7c..163f2a2 100755
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -8129,6 +8129,7 @@
         public void postDisplaySafeVolumeWarning(int flags) {
             if (mController == null)
                 return;
+            flags = flags | AudioManager.FLAG_SHOW_UI;
             try {
                 mController.displaySafeVolumeWarning(flags);
             } catch (RemoteException e) {