From 262f7fba9a314b6e8db962b84e617e0a71ca1c6a Mon Sep 17 00:00:00 2001
From: Xiaodong Xu <xiaodong.xu@sonyericsson.com>
Date: Mon, 25 May 2015 09:37:05 +0200
Subject: [PATCH] Make headset icons consistent before / after pairing

Previously A2DP would be shown before pairing with a HFP device.

bug: 30677445
Change-Id: I0e9ab17197e6ee099d890d5368def36a14ca8344
---
 .../settings/bluetooth/BluetoothDevicePreference.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
index a45e7b40a5c..69e66ae3638 100644
--- a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
+++ b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
@@ -286,12 +286,12 @@ public final class BluetoothDevicePreference extends Preference implements
             }
         }
         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);
     }