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

Commit 7f20792a authored by Eric Laurent's avatar Eric Laurent Committed by Android Git Automerger
Browse files

am 6ee2d3c7: am 5dfd668e: am 6f2cdcdb: Merge "fix concurrent headset and HDMI... 

am 6ee2d3c7: am 5dfd668e: am 6f2cdcdb: Merge "fix concurrent headset and HDMI connection" into jb-mr1-dev

* commit '6ee2d3c7':
  fix concurrent headset and HDMI connection
parents 5171c9cf 6ee2d3c7

services/java/com/android/server/WiredAccessoryManager.java

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ final class WiredAccessoryManager implements WiredAccessoryCallbacks { 
                    break;

            }



            updateLocked(NAME_H2W, headset);

            updateLocked(NAME_H2W, (mHeadsetState & ~(BIT_HEADSET | BIT_HEADSET_NO_MIC)) | headset);

        }

    }