summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jack He <siyuanh@google.com> 2018-01-10 00:18:15 +0000
committer android-build-merger <android-build-merger@google.com> 2018-01-10 00:18:15 +0000
commit8dbfc24e5f455728f3166251504fa0b33fe17916 (patch)
tree446ea6a6a8903f7bc2dc74616dd1c6b3f88ccd64
parent6b943d5deb7d0d6617f2288df373f1c68a9d10b0 (diff)
parentb1065d69951b099dd62e4f7a7533ade833533add (diff)
Merge "HFP: Add isInbandRingingEnabled() API (1/4)"
am: b1065d6995 Change-Id: Ia3112caa3971406cb0ef44cc25c19865a0b6ddf1
-rw-r--r--core/java/android/bluetooth/BluetoothHeadset.java30
1 files changed, 28 insertions, 2 deletions
diff --git a/core/java/android/bluetooth/BluetoothHeadset.java b/core/java/android/bluetooth/BluetoothHeadset.java
index 55a6b4c6b4d4..c94540a48ec1 100644
--- a/core/java/android/bluetooth/BluetoothHeadset.java
+++ b/core/java/android/bluetooth/BluetoothHeadset.java
@@ -1071,9 +1071,35 @@ public final class BluetoothHeadset implements BluetoothProfile {
}
/**
- * check if in-band ringing is supported for this platform.
+ * Check if in-band ringing is currently enabled. In-band ringing could be disabled during an
+ * active connection.
*
- * @return true if in-band ringing is supported false if in-band ringing is not supported
+ * @return true if in-band ringing is enabled, false if in-band ringing is disabled
+ * @hide
+ */
+ @RequiresPermission(android.Manifest.permission.BLUETOOTH)
+ public boolean isInbandRingingEnabled() {
+ if (DBG) {
+ log("isInbandRingingEnabled()");
+ }
+ final IBluetoothHeadset service = mService;
+ if (service != null && isEnabled()) {
+ try {
+ return service.isInbandRingingEnabled();
+ } catch (RemoteException e) {
+ Log.e(TAG, Log.getStackTraceString(new Throwable()));
+ }
+ }
+ if (service == null) {
+ Log.w(TAG, "Proxy not attached to service");
+ }
+ return false;
+ }
+
+ /**
+ * Check if in-band ringing is supported for this platform.
+ *
+ * @return true if in-band ringing is supported, false if in-band ringing is not supported
* @hide
*/
public static boolean isInbandRingingSupported(Context context) {