summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2021-02-23 22:57:36 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-23 22:57:36 +0000
commitb21761e73f077bafb1091e39097666eb45b129b6 (patch)
tree1f6b418c7ec34d896b05e70cf3b56dbca6d43478
parent3a7541cad14602619c51bc8cfa62dbef3d6a9c0f (diff)
parent2357cb8501a353387478dbc1309b165c6406554c (diff)
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
-rw-r--r--services/core/java/com/android/server/audio/AudioService.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index 5f3405379715..f5b94177a2d9 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 class AudioService extends IAudioService.Stub
public void postDisplaySafeVolumeWarning(int flags) {
if (mController == null)
return;
+ flags = flags | AudioManager.FLAG_SHOW_UI;
try {
mController.displaySafeVolumeWarning(flags);
} catch (RemoteException e) {