Merge "BluetoothProfile: Add Object Push Profile (OPP)"

am: 37275780

Change-Id: Ie3c40bcfd0f0eee0f8fe1ed8cac680f2c139de0f

core/java/android/bluetooth/BluetoothProfile.java

@@ -156,13 +156,20 @@ 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