Merge "Restore Parameters after audio server restart" into qt-qpr1-dev (c7240d61) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/hfp/HeadsetStateMachine.java

+26 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1196,6 +1196,21 @@ public class HeadsetStateMachine extends StateMachine {
	}		}
	}		}

			class MyAudioServerStateCallback extends AudioManager.AudioServerStateCallback {
			@Override
			public void onAudioServerDown() {
			logi("onAudioServerDown");
			}

			@Override
			public void onAudioServerUp() {
			logi("onAudioServerUp restoring audio parameters");
			setAudioParameters();
			}
			}

			MyAudioServerStateCallback mAudioServerStateCallback = new MyAudioServerStateCallback();

	class AudioOn extends ConnectedBase {		class AudioOn extends ConnectedBase {
	@Override		@Override
	int getAudioStateInt() {		int getAudioStateInt() {
	@@ -1214,9 +1229,20 @@ public class HeadsetStateMachine extends StateMachine {
	mHeadsetService.setActiveDevice(mDevice);		mHeadsetService.setActiveDevice(mDevice);
	}		}
	setAudioParameters();		setAudioParameters();

			mSystemInterface.getAudioManager().setAudioServerStateCallback(
			mHeadsetService.getMainExecutor(), mAudioServerStateCallback);

	broadcastStateTransitions();		broadcastStateTransitions();
	}		}

			@Override
			public void exit() {
			super.exit();

			mSystemInterface.getAudioManager().clearAudioServerStateCallback();
			}

	@Override		@Override
	public boolean processMessage(Message message) {		public boolean processMessage(Message message) {
	switch (message.what) {		switch (message.what) {