summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorMyles Watson <mylesgw@google.com>2018-01-09 22:26:57 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-01-09 22:26:57 +0000
commit96f4e493396ba8a7b5a2011d95fc5f686bcbc0ef (patch)
tree55d54cb3d881856dc1c6992a78b49ff941e0a2c7 /core/java/android
parentdacb02bf5ad22870b802ea69f8f0e3b2c14df518 (diff)
parent152b4f28b0d87f4e257c056432ddf13fdbee547b (diff)
Merge "BluetoothProfile: Add Object Push Profile (OPP)" am: 37275780c0
am: 152b4f28b0 Change-Id: I765260e8358d6c7f34a72b5f3ef4601579aebf03
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/bluetooth/BluetoothProfile.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/core/java/android/bluetooth/BluetoothProfile.java b/core/java/android/bluetooth/BluetoothProfile.java
index df2028a55351..41cf809afd7f 100644
--- a/core/java/android/bluetooth/BluetoothProfile.java
+++ b/core/java/android/bluetooth/BluetoothProfile.java
@@ -157,12 +157,19 @@ public interface BluetoothProfile {
public static final int HID_DEVICE = 19;
/**
+ * Object Push Profile (OPP)
+ *
+ * @hide
+ */
+ public static final int OPP = 20;
+
+ /**
* Max profile ID. This value should be updated whenever a new profile is added to match
* the largest value assigned to a profile.
*
* @hide
*/
- public static final int MAX_PROFILE_ID = 19;
+ public static final int MAX_PROFILE_ID = 20;
/**
* Default priority for devices that we try to auto-connect to and