From 5e783732b672e7dc27d89cb9fe945bdf8364c39e Mon Sep 17 00:00:00 2001 From: John Spurlock Date: Thu, 19 Feb 2015 10:28:59 -0500 Subject: [PATCH] AudioService: easier forced camera sound debugging. - Add mCameraSoundForced to the service state dumpsys output. - Add a sysprop to opt-in to this behavior for testing. Does not replace the configuration check. - Centralize the configuration read in one place. Change-Id: I83f84394b616f0788029412233ae1412b3cdedf2 --- .../java/com/android/server/audio/AudioService.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index 4ea62ecd0ae69..63e3c06b23b01 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -581,8 +581,7 @@ public class AudioService extends IAudioService.Stub { AudioSystem.setErrorCallback(mAudioSystemCallback); - boolean cameraSoundForced = mContext.getResources().getBoolean( - com.android.internal.R.bool.config_camera_sound_forced); + boolean cameraSoundForced = readCameraSoundForced(); mCameraSoundForced = new Boolean(cameraSoundForced); sendMsg(mAudioHandler, MSG_SET_FORCE_USE, @@ -5071,6 +5070,12 @@ public class AudioService extends IAudioService.Stub { return mMediaFocusControl.getCurrentAudioFocus(); } + private boolean readCameraSoundForced() { + return SystemProperties.getBoolean("audio.camerasound.force", false) || + mContext.getResources().getBoolean( + com.android.internal.R.bool.config_camera_sound_forced); + } + //========================================================================================== // Device orientation //========================================================================================== @@ -5101,8 +5106,7 @@ public class AudioService extends IAudioService.Stub { null, 0); - boolean cameraSoundForced = mContext.getResources().getBoolean( - com.android.internal.R.bool.config_camera_sound_forced); + boolean cameraSoundForced = readCameraSoundForced(); synchronized (mSettingsLock) { boolean cameraSoundForcedChanged = false; synchronized (mCameraSoundForced) { @@ -5517,6 +5521,7 @@ public class AudioService extends IAudioService.Stub { pw.print(" mPendingVolumeCommand="); pw.println(mPendingVolumeCommand); pw.print(" mMusicActiveMs="); pw.println(mMusicActiveMs); pw.print(" mMcc="); pw.println(mMcc); + pw.print(" mCameraSoundForced="); pw.println(mCameraSoundForced); pw.print(" mHasVibrator="); pw.println(mHasVibrator); pw.print(" mControllerService="); pw.println(mControllerService);