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

Commit 6ef004e0 authored by Brian Beloshapka's avatar Brian Beloshapka Committed by Gerrit Code Review
Browse files

DockAudio: Always route audio back to normal on undock. 

Only ignore dock event when docking, not undocking.

Previously for Samsung devices that utilize the extra setting to enable
the dock audio, if the device setting is disabled while on the dock, audio
is prevented from routing back to the device speaker after undocking.

Change-Id: Ib182751a29bf7ba8feb9ff153cd3708df80f7ee6
parent 6536e023

services/java/com/android/server/WiredAccessoryObserver.java

+2 −2
Original line number Diff line number Diff line
@@ -234,6 +234,7 @@ class WiredAccessoryObserver extends UEventObserver { 
    public void onUEvent(UEventObserver.UEvent event) {

        if (LOG) Slog.v(TAG, "Headset UEVENT: " + event.toString());



        int state = Integer.parseInt(event.get("SWITCH_STATE"));

        try {

            String devPath = event.get("DEVPATH");

            String name = event.get("SWITCH_NAME");
@@ -242,12 +243,11 @@ class WiredAccessoryObserver extends UEventObserver { 
                // The choice is made in the GalaxyS2Settings.apk

                // device/samsung/i9100/DeviceSettings/src/com/cyanogenmod/settings/device/DockFragmentActivity.java

                // This sends an Intent to this class

                if (!dockAudioEnabled) {

                if ((!dockAudioEnabled) && (state == 1)) {

                    Slog.e(TAG, "Ignoring dock event as Audio routing disabled " + event);

                    return;

                }

            }

            int state = Integer.parseInt(event.get("SWITCH_STATE"));

            updateState(devPath, name, state);

        } catch (NumberFormatException e) {

            Slog.e(TAG, "Could not parse switch state from event " + event);