Merge "AudioService: easier forced camera sound debugging." (d3cfc504) · Commits · e / os / android_frameworks_base

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

+9 −4

Original line number	Diff line number	Diff line
		@@ -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);