Merge "Revert "Temporary Changes for certification of SCO."" into honeycomb
diff --git a/core/java/android/bluetooth/BluetoothHeadset.java b/core/java/android/bluetooth/BluetoothHeadset.java
index f5f6092..768a6ff 100644
--- a/core/java/android/bluetooth/BluetoothHeadset.java
+++ b/core/java/android/bluetooth/BluetoothHeadset.java
@@ -682,26 +682,6 @@
return false;
}
- /**
- * Send a AT command message to the headset.
- * @param device Remote Bluetooth Device
- * @param cmd The String to send.
- * @hide
- */
- public void sendAtCommand(BluetoothDevice device, String command) {
- if (DBG) log("sendAtCommand()");
- if (mService != null && isEnabled() && isValidDevice(device)) {
- try {
- mService.sendAtCommand(device, command);
- } catch (RemoteException e) {
- Log.e(TAG, e.toString());
- }
- } else {
- Log.w(TAG, "Proxy not attached to service");
- if (DBG) Log.d(TAG, Log.getStackTraceString(new Throwable()));
- }
- }
-
private ServiceConnection mConnection = new ServiceConnection() {
public void onServiceConnected(ComponentName className, IBinder service) {
if (DBG) Log.d(TAG, "Proxy object connected");
diff --git a/core/java/android/bluetooth/IBluetoothHeadset.aidl b/core/java/android/bluetooth/IBluetoothHeadset.aidl
index 41f63b2..273cda7 100644
--- a/core/java/android/bluetooth/IBluetoothHeadset.aidl
+++ b/core/java/android/bluetooth/IBluetoothHeadset.aidl
@@ -50,6 +50,4 @@
boolean startScoUsingVirtualVoiceCall(in BluetoothDevice device);
boolean stopScoUsingVirtualVoiceCall(in BluetoothDevice device);
-
- void sendAtCommand(in BluetoothDevice device, String urc);
}