am 65bfe1ca: Merge "AudioService: cleanup sco audio mode upon disconnection." into mnc-dr-dev (f99986ee) · Commits · e / os / android_frameworks_base

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

+6 −1

Original line number	Diff line number	Diff line
		@@ -2531,7 +2531,10 @@ public class AudioService extends IAudioService.Stub {
		if (!checkAudioSettingsPermission("setBluetoothScoOn()")) {
		return;
		}
		setBluetoothScoOnInt(on);
		}

		public void setBluetoothScoOnInt(boolean on) {
		if (on) {
		mForcedUseForComm = AudioSystem.FORCE_BT_SCO;
		} else if (mForcedUseForComm == AudioSystem.FORCE_BT_SCO) {
		@@ -2892,6 +2895,8 @@ public class AudioService extends IAudioService.Stub {
		mScoAudioState = SCO_STATE_INACTIVE;
		broadcastScoConnectionState(AudioManager.SCO_AUDIO_STATE_DISCONNECTED);
		}
		AudioSystem.setParameters("A2dpSuspended=false");
		setBluetoothScoOnInt(false);
		}

		private void broadcastScoConnectionState(int state) {