Merge changes from topic "add-hearing-aid-device-in-audio-switch" into pi-dev am...

am: 82db752ef0

Change-Id: I7e9a40b08afebedb7b44a6345cda8b2564db315d

diff --cc src/com/android/settings/sound/AudioSwitchPreferenceController.java
Simple merge

diff --cc src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java
index 732f0ef,2039913..0115de7
--- 1/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java
--- 2/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java
+++ b/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java
@@@ -23,14 -24,14 +24,14 @@@ import com.android.settingslib.Utils
  
  import android.bluetooth.BluetoothDevice;
  import android.content.Context;
 -import android.support.v7.preference.Preference;
 +import androidx.preference.Preference;
  
- import com.android.internal.util.ArrayUtils;
  import com.android.settings.R;
  import com.android.settingslib.bluetooth.HeadsetProfile;
+ import com.android.settingslib.bluetooth.HearingAidProfile;
  
  /**
-  * This class allows switching between HFP-connected BT devices
+  * This class allows switching between HFP-connected & HAP-connected BT devices
   * while in on-call state.
   */
  public class HandsFreeProfileOutputPreferenceController extends

diff --cc src/com/android/settings/sound/MediaOutputPreferenceController.java
index 89ee412,79f3c9d..9c3bc4c
--- 1/src/com/android/settings/sound/MediaOutputPreferenceController.java
--- 2/src/com/android/settings/sound/MediaOutputPreferenceController.java
+++ b/src/com/android/settings/sound/MediaOutputPreferenceController.java
@@@ -25,15 -26,14 +26,14 @@@ import com.android.settingslib.Utils
  import android.bluetooth.BluetoothDevice;
  import android.content.Context;
  import android.media.AudioManager;
 -import android.support.v7.preference.Preference;
 +import androidx.preference.Preference;
  
- import com.android.internal.util.ArrayUtils;
  import com.android.settings.R;
  import com.android.settingslib.bluetooth.A2dpProfile;
- 
+ import com.android.settingslib.bluetooth.HearingAidProfile;
  
  /**
-  * This class which allows switching between a2dp-connected BT devices.
+  * This class which allows switching between A2dp-connected & HAP-connected BT devices.
   * A few conditions will disable this switcher:
   * - No available BT device(s)
   * - Media stream captured by cast device

diff --cc tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java
Simple merge

diff --cc tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java
Simple merge

diff --cc tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java
Simple merge