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

Commit 27a6beb6 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by android-build-merger
Browse files

Merge "Restore Parameters after audio server restart" am: 09fae58f am: b80ab0d8

am: 4ee6ec06

Change-Id: Ia4afa520d976191c6834944984b8613fa75b68aa
parents 2ac79e28 4ee6ec06
Loading
Loading
Loading
Loading
+26 −0
Original line number Diff line number Diff line
@@ -1198,6 +1198,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 {
        @Override
        int getAudioStateInt() {
@@ -1216,9 +1231,20 @@ public class HeadsetStateMachine extends StateMachine {
                mHeadsetService.setActiveDevice(mDevice);
            }
            setAudioParameters();

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

            broadcastStateTransitions();
        }

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

            mSystemInterface.getAudioManager().clearAudioServerStateCallback();
        }

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