summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorMike J. Chen <mjchen@google.com>2014-03-07 18:50:54 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-07 18:50:54 +0000
commit5adbea2e2da3a0af1357de05a04534c65a7c9f76 (patch)
tree0171db57efc604df274a8e670d80d6d11049f5dc /core/java/android
parentdbc7a4653f2a50863788bef0c3ac67acc35fc5ab (diff)
parent784224d2f99f4cc8bb5bb1ea8aa85d7b18aaed78 (diff)
downloadframeworks_base-5adbea2e2da3a0af1357de05a04534c65a7c9f76.zip
frameworks_base-5adbea2e2da3a0af1357de05a04534c65a7c9f76.tar.gz
frameworks_base-5adbea2e2da3a0af1357de05a04534c65a7c9f76.tar.bz2
am 784224d2: am b8a7dd63: Merge "Add handshake broadcast support" into klp-modular-dev
* commit '784224d2f99f4cc8bb5bb1ea8aa85d7b18aaed78': Add handshake broadcast support
Diffstat (limited to 'core/java/android')
-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);