Snap for 8253222 from 034e9276a27dc6889754da1b93542f25588ed7fe to sdk-release
Change-Id: I291b291650c30acd3f0c86cf863a38281959806a
diff --git a/Common/Android.bp b/Common/Android.bp
index 26b495c..18efaf5 100644
--- a/Common/Android.bp
+++ b/Common/Android.bp
@@ -39,7 +39,7 @@
libs: [
"framework-wifi.impl", // allow SL4A to access @hide Wifi APIs
"framework-connectivity.impl",
- "framework-connectivity-tiramisu.impl",
+ "framework-connectivity-t.impl",
"framework",
"telephony-common",
diff --git a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothHspFacade.java b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothHspFacade.java
index ded6c56..1a5dfe7 100644
--- a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothHspFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothHspFacade.java
@@ -21,6 +21,7 @@
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothHeadset;
import android.bluetooth.BluetoothProfile;
+import android.bluetooth.BluetoothStatusCodes;
import android.bluetooth.BluetoothUuid;
import android.os.ParcelUuid;
@@ -234,7 +235,7 @@
Log.d("Cannot find device " + deviceAddress);
return false;
}
- return sHspProfile.connectAudio();
+ return sHspProfile.connectAudio() == BluetoothStatusCodes.SUCCESS;
}
/**
@@ -267,7 +268,7 @@
Log.d("SCO audio is not connected for device " + deviceAddress);
return false;
}
- return sHspProfile.disconnectAudio();
+ return sHspProfile.disconnectAudio() == BluetoothStatusCodes.SUCCESS;
}
/**
