commit 448aedc5e87d3382af6a098d6ac2388384d2965d
author Eric Laurent <elaurent@google.com> Thu Feb 04 11:23:03 2010 -0800
committer android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> Fri Feb 05 11:06:06 2010 -0800
tree 379a32656674cfa0fe849bc33c44ce3ac60dd544
parent f92ef8fe452d3f8742d3aa680d1a443f571f028d

Temporary patch for issue 2419260.

Comment out code that causes kernel crash reported in issue 2419260 until HTC provides a real fix.

libaudio-qsd8k/AudioHardware.cpp

diff --git a/libaudio-qsd8k/AudioHardware.cpp b/libaudio-qsd8k/AudioHardware.cpp
index 7764b4c..bc3a06d 100644
--- a/libaudio-qsd8k/AudioHardware.cpp
+++ b/libaudio-qsd8k/AudioHardware.cpp
@@ -756,25 +756,31 @@
             && (device == (int) SND_DEVICE_BT
             || device == (int) SND_DEVICE_BT_EC_OFF)) {
         if (mBluetoothIdTx != 0) {
-        rx_acdb_id = mBluetoothIdRx;
-        tx_acdb_id = mBluetoothIdTx;
-    } else {
-            /* use default BT entry defined in AudioBTID.csv */
-            rx_acdb_id = mBTEndpoints[0].rx;
-            tx_acdb_id = mBTEndpoints[0].tx;
-            LOGD("Update ACDB ID to default BT setting\n");
+            rx_acdb_id = mBluetoothIdRx;
+            tx_acdb_id = mBluetoothIdTx;
         }
+// FIXME: temporarily comment out code that causes kernel crash reported in
+// issue 2419260 until HTC provides a real fix
+//        else {
+//                /* use default BT entry defined in AudioBTID.csv */
+//                rx_acdb_id = mBTEndpoints[0].rx;
+//                tx_acdb_id = mBTEndpoints[0].tx;
+//                LOGD("Update ACDB ID to default BT setting\n");
+//            }
     } else if (mMode == AudioSystem::MODE_IN_CALL
             && device == (int) SND_DEVICE_CARKIT) {
         if (mBluetoothIdTx != 0) {
             rx_acdb_id = mBluetoothIdRx;
             tx_acdb_id = mBluetoothIdTx;
-        } else {
-            /* use default carkit entry defined in AudioBTID.csv */
-            rx_acdb_id = mBTEndpoints[1].rx;
-            tx_acdb_id = mBTEndpoints[1].tx;
-            LOGD("Update ACDB ID to default carkit setting");
         }
+// FIXME: temporarily comment out code that causes kernel crash reported in
+// issue 2419260 until HTC provides a real fix
+//        else {
+//            /* use default carkit entry defined in AudioBTID.csv */
+//            rx_acdb_id = mBTEndpoints[1].rx;
+//            tx_acdb_id = mBTEndpoints[1].tx;
+//            LOGD("Update ACDB ID to default carkit setting");
+//        }
     } else if (mMode == AudioSystem::MODE_IN_CALL && hac_enable && mHACSetting) {
         LOGE("Update acdb id to hac profile.");
         rx_acdb_id = ACDB_ID_HAC_HANDSET_SPKR;