diff --git a/src/com/android/settings/DockSettings.java b/src/com/android/settings/DockSettings.java
index 3b3402f..1d3e2dd 100644
--- a/src/com/android/settings/DockSettings.java
+++ b/src/com/android/settings/DockSettings.java
@@ -107,6 +107,8 @@
                     resId = R.string.dock_audio_summary_car;
                     break;
                 case Intent.EXTRA_DOCK_STATE_DESK:
+                case Intent.EXTRA_DOCK_STATE_LE_DESK:
+                case Intent.EXTRA_DOCK_STATE_HE_DESK:
                     resId = R.string.dock_audio_summary_desk;
                     break;
                 case Intent.EXTRA_DOCK_STATE_UNDOCKED:
diff --git a/src/com/android/settings/bluetooth/DockEventReceiver.java b/src/com/android/settings/bluetooth/DockEventReceiver.java
index d18348f..a3b6b3c 100644
--- a/src/com/android/settings/bluetooth/DockEventReceiver.java
+++ b/src/com/android/settings/bluetooth/DockEventReceiver.java
@@ -68,6 +68,8 @@
                 case Intent.EXTRA_DOCK_STATE_UNDOCKED:
                 case Intent.EXTRA_DOCK_STATE_CAR:
                 case Intent.EXTRA_DOCK_STATE_DESK:
+                case Intent.EXTRA_DOCK_STATE_LE_DESK:
+                case Intent.EXTRA_DOCK_STATE_HE_DESK:
                     Intent i = new Intent(intent);
                     i.setClass(context, DockService.class);
                     beginStartingService(context, i);
diff --git a/src/com/android/settings/bluetooth/DockService.java b/src/com/android/settings/bluetooth/DockService.java
index f0644c3..943c3f9 100644
--- a/src/com/android/settings/bluetooth/DockService.java
+++ b/src/com/android/settings/bluetooth/DockService.java
@@ -438,6 +438,8 @@
                 msgType = MSG_TYPE_UNDOCKED_TEMPORARY;
                 break;
             case Intent.EXTRA_DOCK_STATE_DESK:
+            case Intent.EXTRA_DOCK_STATE_LE_DESK:
+            case Intent.EXTRA_DOCK_STATE_HE_DESK:
             case Intent.EXTRA_DOCK_STATE_CAR:
                 if (DockEventReceiver.ACTION_DOCK_SHOW_UI.equals(intent.getAction())) {
                     msgType = MSG_TYPE_SHOW_UI;
@@ -463,6 +465,8 @@
         switch (state) {
             case Intent.EXTRA_DOCK_STATE_CAR:
             case Intent.EXTRA_DOCK_STATE_DESK:
+            case Intent.EXTRA_DOCK_STATE_LE_DESK:
+            case Intent.EXTRA_DOCK_STATE_HE_DESK:
                 break;
             default:
                 return;
@@ -578,6 +582,8 @@
         int numOfProfiles;
         switch (state) {
             case Intent.EXTRA_DOCK_STATE_DESK:
+            case Intent.EXTRA_DOCK_STATE_LE_DESK:
+            case Intent.EXTRA_DOCK_STATE_HE_DESK:
                 numOfProfiles = 1;
                 break;
             case Intent.EXTRA_DOCK_STATE_CAR:
@@ -609,6 +615,8 @@
                 break;
 
             case Intent.EXTRA_DOCK_STATE_DESK:
+            case Intent.EXTRA_DOCK_STATE_LE_DESK:
+            case Intent.EXTRA_DOCK_STATE_HE_DESK:
                 items[0] = getString(R.string.bluetooth_dock_settings_a2dp);
                 mProfiles[0] = mProfileManager.getA2dpProfile();
                 if (firstTime) {
