commit a78e718b26c2915bf74fa7587a0d0a1ca7e858cd
author Marie Janssen <jamuraa@google.com> Wed Jan 25 16:10:29 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 25 16:10:29 2017 +0000
tree 7a4fbd2ade305be99044c2db1b8a82b9034ec1aa
parent 698862f60d97fd5feace705cb742d09548a4bb34
parent 60eb5503e8aa94fc23e5193cb1d17b4086b5abcc

Merge "Make headset icons consistent before / after pairing" am: 690bdb22c9 am: a2e068a2b4
am: 60eb5503e8

Change-Id: Ida107059b3a5ec815f198659ff8174c8ff375efe

src/com/android/settings/bluetooth/BluetoothDevicePreference.java

diff --git a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
index a45e7b4..69e66ae 100644
--- a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
+++ b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
@@ -286,12 +286,12 @@
             }
         }
         if (btClass != null) {
-            if (btClass.doesClassMatch(BluetoothClass.PROFILE_A2DP)) {
-                return new Pair<Integer, String>(R.drawable.ic_bt_headphones_a2dp, HEADPHONE);
-            }
-            if (btClass.doesClassMatch(BluetoothClass.PROFILE_HEADSET)) {
+          if (btClass.doesClassMatch(BluetoothClass.PROFILE_HEADSET)) {
                 return new Pair<Integer, String>(R.drawable.ic_bt_headset_hfp, HEADSET);
             }
+          if (btClass.doesClassMatch(BluetoothClass.PROFILE_A2DP)) {
+                return new Pair<Integer, String>(R.drawable.ic_bt_headphones_a2dp, HEADPHONE);
+            }
         }
         return new Pair<Integer, String>(R.drawable.ic_settings_bluetooth, BLUETOOTH);
     }