Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55f19502 authored by Eric Laurent's avatar Eric Laurent Committed by Automerger Merge Worker
Browse files

Merge "AudioService: Register MASTER_BALANCE/MONO observer for all users" into... 

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

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



Change-Id: Ie18dbaba23404381dd5a0b0e22411257b6f852a7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4bbdb7de bff7388f

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

+2 −2
Original line number Diff line number Diff line
@@ -9778,9 +9778,9 @@ public class AudioService extends IAudioService.Stub 
            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,