summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike J. Chen <mjchen@google.com>2014-03-07 18:44:22 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-07 18:44:22 +0000
commit784224d2f99f4cc8bb5bb1ea8aa85d7b18aaed78 (patch)
treedb1b32c6bb9a1c8e26a21e8185671c4674c01fde
parent757ab3e6df3f884b7ea36ae021c886513a2ce2ca (diff)
parentb8a7dd639eb680e7bcd410f7d3bd16c7ba6872ad (diff)
downloadframeworks_base-784224d2f99f4cc8bb5bb1ea8aa85d7b18aaed78.zip
frameworks_base-784224d2f99f4cc8bb5bb1ea8aa85d7b18aaed78.tar.gz
frameworks_base-784224d2f99f4cc8bb5bb1ea8aa85d7b18aaed78.tar.bz2
am b8a7dd63: Merge "Add handshake broadcast support" into klp-modular-dev
* commit 'b8a7dd639eb680e7bcd410f7d3bd16c7ba6872ad': Add handshake broadcast support
-rw-r--r--core/java/android/bluetooth/BluetoothInputDevice.java14
1 files changed, 13 insertions, 1 deletions
diff --git a/core/java/android/bluetooth/BluetoothInputDevice.java b/core/java/android/bluetooth/BluetoothInputDevice.java
index 33232ed..c48b15d 100644
--- a/core/java/android/bluetooth/BluetoothInputDevice.java
+++ b/core/java/android/bluetooth/BluetoothInputDevice.java
@@ -80,6 +80,13 @@ public final class BluetoothInputDevice implements BluetoothProfile {
* @hide
*/
@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
+ public static final String ACTION_HANDSHAKE =
+ "android.bluetooth.input.profile.action.HANDSHAKE";
+
+ /**
+ * @hide
+ */
+ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String ACTION_REPORT =
"android.bluetooth.input.profile.action.REPORT";
@@ -186,6 +193,11 @@ public final class BluetoothInputDevice implements BluetoothProfile {
/**
* @hide
*/
+ public static final String EXTRA_STATUS = "android.bluetooth.BluetoothInputDevice.extra.STATUS";
+
+ /**
+ * @hide
+ */
public static final String EXTRA_VIRTUAL_UNPLUG_STATUS = "android.bluetooth.BluetoothInputDevice.extra.VIRTUAL_UNPLUG_STATUS";
private Context mContext;
@@ -609,7 +621,7 @@ public final class BluetoothInputDevice implements BluetoothProfile {
* @hide
*/
public boolean setReport(BluetoothDevice device, byte reportType, String report) {
- if (DBG) log("setReport(" + device + "), reportType=" + reportType + " report=" + report);
+ if (VDBG) log("setReport(" + device + "), reportType=" + reportType + " report=" + report);
if (mService != null && isEnabled() && isValidDevice(device)) {
try {
return mService.setReport(device, reportType, report);