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

Commit 70a60418 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/24027039'] into udc-release. 

Change-Id: Iec7aeabc1f7b9e20f6dfbb19974c6298b5e904b9
parents b8b8ad94 5bfc458c

src/com/android/server/telecom/CallAudioRouteStateMachine.java

+22 −20
Original line number Diff line number Diff line
@@ -1741,7 +1741,7 @@ public class CallAudioRouteStateMachine extends StateMachine { 
        final boolean hasAnyCalls = mCallsManager.hasAnyCalls();

        // These APIs are all via two-way binder calls so can potentially block Telecom.  Since none

        // of this has to happen in the Telecom lock we'll offload it to the async executor.

        mAsyncTaskExecutor.execute(() -> {



        AudioDeviceInfo speakerDevice = null;

        for (AudioDeviceInfo info : mAudioManager.getAvailableCommunicationDevices()) {

            if (info.getType() == AudioDeviceInfo.TYPE_BUILTIN_SPEAKER) {
@@ -1762,7 +1762,9 @@ public class CallAudioRouteStateMachine extends StateMachine { 
                mAudioManager.clearCommunicationDevice();

            }

        }

            mStatusBarNotifier.notifySpeakerphone(hasAnyCalls && speakerOn);

        final boolean isSpeakerOn = speakerOn;

        mAsyncTaskExecutor.execute(() -> {

            mStatusBarNotifier.notifySpeakerphone(hasAnyCalls && isSpeakerOn);

        });

    }