OSDN Git Service

Merge changes from topic "add-hearing-aid-device-in-audio-switch" into pi-dev am...
authorryanywlin <ryanywlin@google.com>
Thu, 10 May 2018 03:46:27 +0000 (20:46 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 10 May 2018 03:46:27 +0000 (20:46 -0700)
commitf95ed0925ba3492bcc55874981effa40186ccdd7
treee5f4ebb27807c03570b1cb2b830b8eda543720d2
parentc1884b7c7059ed77834b179b614bb2626afeaf55
parent82db752ef0e673477df273b6499c23947df50455
Merge changes from topic "add-hearing-aid-device-in-audio-switch" into pi-dev am: 7e31e22f57
am: 82db752ef0

Change-Id: I7e9a40b08afebedb7b44a6345cda8b2564db315d
src/com/android/settings/sound/AudioSwitchPreferenceController.java
src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java
src/com/android/settings/sound/MediaOutputPreferenceController.java
tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java
tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java
tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java