diff options
| author | Selim Gurun <sgurun@google.com> | 2018-01-11 23:16:04 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-01-11 23:16:04 +0000 |
| commit | d40d57562c4980bbc32ac3674194fb209104d660 (patch) | |
| tree | 41c11e847b33436d90506c79c8f4f9a9f6194aef /core/java/android | |
| parent | e8df5cd9d88cc3f4e34828ee12ddabd10f533245 (diff) | |
| parent | 54087cb8cb34480413dd14f23a1c458e6a34d284 (diff) | |
Merge "Make Bluetooth constants used by gmscore a system api" am: ff9bc3a88c am: 6dc20d40fd
am: 54087cb8cb
Change-Id: I1a733b7f2567ff7821436d2c331a0a0cd8276e91
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/bluetooth/BluetoothDevice.java | 3 | ||||
| -rw-r--r-- | core/java/android/bluetooth/BluetoothHeadset.java | 4 | ||||
| -rw-r--r-- | core/java/android/bluetooth/BluetoothProfile.java | 3 |
3 files changed, 8 insertions, 2 deletions
diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java index ad7a93cd6bbd..9b736b7e5f9e 100644 --- a/core/java/android/bluetooth/BluetoothDevice.java +++ b/core/java/android/bluetooth/BluetoothDevice.java @@ -618,6 +618,7 @@ public final class BluetoothDevice implements Parcelable { * * @hide */ + @SystemApi public static final int ACCESS_UNKNOWN = 0; /** @@ -626,6 +627,7 @@ public final class BluetoothDevice implements Parcelable { * * @hide */ + @SystemApi public static final int ACCESS_ALLOWED = 1; /** @@ -634,6 +636,7 @@ public final class BluetoothDevice implements Parcelable { * * @hide */ + @SystemApi public static final int ACCESS_REJECTED = 2; /** diff --git a/core/java/android/bluetooth/BluetoothHeadset.java b/core/java/android/bluetooth/BluetoothHeadset.java index c94540a48ec1..a68f485f4374 100644 --- a/core/java/android/bluetooth/BluetoothHeadset.java +++ b/core/java/android/bluetooth/BluetoothHeadset.java @@ -556,8 +556,8 @@ public final class BluetoothHeadset implements BluetoothProfile { * Set priority of the profile * * <p> The device should already be paired. - * Priority can be one of {@link #PRIORITY_ON} or - * {@link #PRIORITY_OFF}, + * Priority can be one of {@link BluetoothProfile#PRIORITY_ON} or + * {@link BluetoothProfile#PRIORITY_OFF}, * * <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN} * permission. diff --git a/core/java/android/bluetooth/BluetoothProfile.java b/core/java/android/bluetooth/BluetoothProfile.java index 41cf809afd7f..0e2263f773b8 100644 --- a/core/java/android/bluetooth/BluetoothProfile.java +++ b/core/java/android/bluetooth/BluetoothProfile.java @@ -19,6 +19,7 @@ package android.bluetooth; import android.Manifest; import android.annotation.RequiresPermission; +import android.annotation.SystemApi; import java.util.List; @@ -185,6 +186,7 @@ public interface BluetoothProfile { * * @hide **/ + @SystemApi public static final int PRIORITY_ON = 100; /** @@ -193,6 +195,7 @@ public interface BluetoothProfile { * * @hide **/ + @SystemApi public static final int PRIORITY_OFF = 0; /** |