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

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

Merge "Restore Parameters after audio server restart"

am: 09fae58f

Change-Id: If90547356c5cde9aa2281998360b3b2609dbe3fd
parents df2ec75e 09fae58f
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) {