Merge "Make Bluetooth constants used by gmscore a system api" (ff9bc3a8) · Commits · e / os / android_frameworks_base

api/system-current.txt

+8 −0

Original line number	Diff line number	Diff line
		@@ -628,6 +628,9 @@ package android.bluetooth {
		method public boolean isEncrypted();
		method public boolean removeBond();
		method public boolean setPhonebookAccessPermission(int);
		field public static final int ACCESS_ALLOWED = 1; // 0x1
		field public static final int ACCESS_REJECTED = 2; // 0x2
		field public static final int ACCESS_UNKNOWN = 0; // 0x0
		}

		public final class BluetoothHeadset implements android.bluetooth.BluetoothProfile {
		@@ -636,6 +639,11 @@ package android.bluetooth {
		method public boolean setPriority(android.bluetooth.BluetoothDevice, int);
		}

		public abstract interface BluetoothProfile {
		field public static final int PRIORITY_OFF = 0; // 0x0
		field public static final int PRIORITY_ON = 100; // 0x64
		}

		}

		package android.bluetooth.le {

+3 −0

Original line number	Diff line number	Diff line
		@@ -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;

		/**

+2 −2

Original line number	Diff line number	Diff line
		@@ -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.

+3 −0

Original line number	Diff line number	Diff line
		@@ -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;

		/**