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

Commit d1cf2a22 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix USB power regression when connecting USB headset during phone/voip... 

Merge "Fix USB power regression when connecting USB headset during phone/voip call." into udc-dev am: 37ccbe73

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23810764



Change-Id: I13b973c097c2460a85f77d506b2d8bc59227092b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e6663412 37ccbe73

services/usb/java/com/android/server/usb/UsbAlsaDevice.java

+10 −2
Original line number Diff line number Diff line
@@ -59,6 +59,8 @@ public final class UsbAlsaDevice { 
    private String mDeviceName = "";

    private String mDeviceDescription = "";



    private boolean mHasJackDetect = true;



    public UsbAlsaDevice(IAudioService audioService, int card, int device, String deviceAddress,

            boolean hasOutput, boolean hasInput,

            boolean isInputHeadset, boolean isOutputHeadset, boolean isDock) {
@@ -168,8 +170,14 @@ public final class UsbAlsaDevice { 
        if (mJackDetector != null) {

            return;

        }

        if (!mHasJackDetect) {

            return;

        }

        // If no jack detect capabilities exist, mJackDetector will be null.

        mJackDetector = UsbAlsaJackDetector.startJackDetect(this);

        if (mJackDetector == null) {

            mHasJackDetect = false;

        }

    }



    /** Stops a jack-detection thread. */
@@ -182,8 +190,8 @@ public final class UsbAlsaDevice { 


    /** Start using this device as the selected USB Audio Device. */

    public synchronized void start() {

        startInput();

        startOutput();

        startInput();

    }



    /** Start using this device as the selected USB input device. */
@@ -208,8 +216,8 @@ public final class UsbAlsaDevice { 


    /** Stop using this device as the selected USB Audio Device. */

    public synchronized void stop() {

        stopInput();

        stopOutput();

        stopInput();

    }



    /** Stop using this device as the selected USB input device. */