commit b21761e73f077bafb1091e39097666eb45b129b6
author Eric Laurent <elaurent@google.com> Tue Feb 23 22:57:36 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 23 22:57:36 2021 +0000
tree 1f6b418c7ec34d896b05e70cf3b56dbca6d43478
parent 3a7541cad14602619c51bc8cfa62dbef3d6a9c0f
parent 2357cb8501a353387478dbc1309b165c6406554c

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If62ddb7dca1d8d6c29b6ec6b2534a95dfd77b2a3

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 5f34053..f5b9417 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -8570,6 +8570,7 @@
         public void postDisplaySafeVolumeWarning(int flags) {
             if (mController == null)
                 return;
+            flags = flags | AudioManager.FLAG_SHOW_UI;
             try {
                 mController.displaySafeVolumeWarning(flags);
             } catch (RemoteException e) {