commit bff7388f81bb8fd433f50f0011fa2bf0480efa5c
author Eric Laurent <elaurent@google.com> Mon May 13 13:56:58 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon May 13 13:56:58 2024 +0000
tree c9a40cd7da8c7544c2bbb441a22a7d514774e9ee
parent cb2abc55822fb49b0fcb8ae42dac21c618127e13
parent d40478ca7ed384df0a35fd6a900c2f0e92bddef4

Merge "AudioService: Register MASTER_BALANCE/MONO observer for all users" into main am: d40478ca7e

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

Change-Id: I6b5981983480944fc6d90d9cebe5915b02c5e517
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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 5e6cf1a..49fa39d 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -9680,9 +9680,9 @@
             mContentResolver.registerContentObserver(Settings.Global.getUriFor(
                 Settings.Global.DOCK_AUDIO_MEDIA_ENABLED), false, this);
             mContentResolver.registerContentObserver(Settings.System.getUriFor(
-                    Settings.System.MASTER_MONO), false, this);
+                    Settings.System.MASTER_MONO), false, this, UserHandle.USER_ALL);
             mContentResolver.registerContentObserver(Settings.System.getUriFor(
-                    Settings.System.MASTER_BALANCE), false, this);
+                    Settings.System.MASTER_BALANCE), false, this, UserHandle.USER_ALL);
 
             mEncodedSurroundMode = mSettings.getGlobalInt(
                     mContentResolver, Settings.Global.ENCODED_SURROUND_OUTPUT,