Merge changes from topic "apr16" into sc-dev (7a079059) · Commits · e / os / android_packages_modules_Bluetooth

framework/java/android/bluetooth/BluetoothA2dp.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -20,8 +20,10 @@ import android.Manifest;
		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.RequiresNoPermission;
		import android.annotation.RequiresPermission;
		import android.annotation.SdkConstant;
		import android.annotation.SuppressLint;
		import android.annotation.SdkConstant.SdkConstantType;
		import android.bluetooth.annotations.RequiresBluetoothConnectPermission;
		import android.bluetooth.annotations.RequiresLegacyBluetoothAdminPermission;
		@@ -512,6 +514,7 @@ public final class BluetoothA2dp implements BluetoothProfile {
		* @return true if priority is set, false on error
		* @hide
		*/
		@RequiresBluetoothConnectPermission
		@RequiresPermission(allOf = {
		android.Manifest.permission.BLUETOOTH_CONNECT,
		android.Manifest.permission.BLUETOOTH_PRIVILEGED,
		@@ -534,6 +537,7 @@ public final class BluetoothA2dp implements BluetoothProfile {
		* @hide
		*/
		@SystemApi
		@RequiresBluetoothConnectPermission
		@RequiresPermission(allOf = {
		android.Manifest.permission.BLUETOOTH_CONNECT,
		android.Manifest.permission.BLUETOOTH_PRIVILEGED,
		@@ -624,6 +628,7 @@ public final class BluetoothA2dp implements BluetoothProfile {
		* @return true if device supports absolute volume
		* @hide
		*/
		@RequiresNoPermission
		public boolean isAvrcpAbsoluteVolumeSupported() {
		if (DBG) Log.d(TAG, "isAvrcpAbsoluteVolumeSupported");
		try {
		@@ -690,6 +695,7 @@ public final class BluetoothA2dp implements BluetoothProfile {
		*
		* @hide
		*/
		@RequiresBluetoothConnectPermission
		@RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)
		public boolean shouldSendVolumeKeys(BluetoothDevice device) {
		if (isEnabled() && isValidDevice(device)) {

framework/java/android/bluetooth/BluetoothA2dpSink.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -282,6 +282,7 @@ public final class BluetoothA2dpSink implements BluetoothProfile {
		* @return true if priority is set, false on error
		* @hide
		*/
		@RequiresBluetoothConnectPermission
		@RequiresPermission(allOf = {
		android.Manifest.permission.BLUETOOTH_CONNECT,
		android.Manifest.permission.BLUETOOTH_PRIVILEGED,
		@@ -304,6 +305,7 @@ public final class BluetoothA2dpSink implements BluetoothProfile {
		* @hide
		*/
		@SystemApi
		@RequiresBluetoothConnectPermission
		@RequiresPermission(allOf = {
		android.Manifest.permission.BLUETOOTH_CONNECT,
		android.Manifest.permission.BLUETOOTH_PRIVILEGED

framework/java/android/bluetooth/BluetoothAdapter.java

+66 −2

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import android.annotation.CallbackExecutor;
		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.RequiresNoPermission;
		import android.annotation.RequiresPermission;
		import android.annotation.SdkConstant;
		import android.annotation.SdkConstant.SdkConstantType;
		@@ -716,6 +717,7 @@ public final class BluetoothAdapter {
		* Bluetooth metadata listener. Overrides the default BluetoothMetadataListener
		* implementation.
		*/
		@SuppressLint("AndroidFrameworkBluetoothPermission")
		private static final IBluetoothMetadataListener sBluetoothMetadataListener =
		new IBluetoothMetadataListener.Stub() {
		@Override
		@@ -747,6 +749,7 @@ public final class BluetoothAdapter {
		* @return the default local adapter, or null if Bluetooth is not supported on this hardware
		* platform
		*/
		@RequiresNoPermission
		public static synchronized BluetoothAdapter getDefaultAdapter() {
		if (sAdapter == null) {
		IBinder b = ServiceManager.getService(BLUETOOTH_MANAGER_SERVICE);
		@@ -792,6 +795,7 @@ public final class BluetoothAdapter {
		* @param address valid Bluetooth MAC address
		* @throws IllegalArgumentException if address is invalid
		*/
		@RequiresNoPermission
		public BluetoothDevice getRemoteDevice(String address) {
		return new BluetoothDevice(address);
		}
		@@ -807,6 +811,7 @@ public final class BluetoothAdapter {
		* @param address Bluetooth MAC address (6 bytes)
		* @throws IllegalArgumentException if address is invalid
		*/
		@RequiresNoPermission
		public BluetoothDevice getRemoteDevice(byte[] address) {
		if (address == null \|\| address.length != 6) {
		throw new IllegalArgumentException("Bluetooth address must have 6 bytes");
		@@ -824,6 +829,7 @@ public final class BluetoothAdapter {
		* Use {@link #isMultipleAdvertisementSupported()} to check whether LE Advertising is supported
		* on this device before calling this method.
		*/
		@RequiresNoPermission
		public BluetoothLeAdvertiser getBluetoothLeAdvertiser() {
		if (!getLeAccess()) {
		return null;
		@@ -846,6 +852,7 @@ public final class BluetoothAdapter {
		*
		* @hide
		*/
		@RequiresNoPermission
		public PeriodicAdvertisingManager getPeriodicAdvertisingManager() {
		if (!getLeAccess()) {
		return null;
		@@ -866,6 +873,7 @@ public final class BluetoothAdapter {
		/**
		* Returns a {@link BluetoothLeScanner} object for Bluetooth LE scan operations.
		*/
		@RequiresNoPermission
		public BluetoothLeScanner getBluetoothLeScanner() {
		if (!getLeAccess()) {
		return null;
		@@ -887,6 +895,7 @@ public final class BluetoothAdapter {
		* @return true if the local adapter is turned on
		*/
		@RequiresLegacyBluetoothPermission
		@RequiresNoPermission
		public boolean isEnabled() {
		return getState() == BluetoothAdapter.STATE_ON;
		}
		@@ -900,6 +909,7 @@ public final class BluetoothAdapter {
		* @hide
		*/
		@SystemApi
		@RequiresNoPermission
		public boolean isLeEnabled() {
		final int state = getLeState();
		if (DBG) {
		@@ -937,6 +947,7 @@ public final class BluetoothAdapter {
		* @hide
		*/
		@SystemApi
		@RequiresBluetoothConnectPermission
		@RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)
		public boolean disableBLE() {
		if (!isBleScanAlwaysAvailable()) {
		@@ -983,6 +994,7 @@ public final class BluetoothAdapter {
		* @hide
		*/
		@SystemApi
		@RequiresBluetoothConnectPermission
		@RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)
		public boolean enableBLE() {
		if (!isBleScanAlwaysAvailable()) {
		@@ -1015,6 +1027,7 @@ public final class BluetoothAdapter {
		};

		/** @hide */
		@RequiresNoPermission
		public void disableBluetoothGetStateCache() {
		mBluetoothGetStateCache.disableLocal();
		}
		@@ -1059,6 +1072,7 @@ public final class BluetoothAdapter {
		* @return current state of Bluetooth adapter
		*/
		@RequiresLegacyBluetoothPermission
		@RequiresNoPermission
		@AdapterState
		public int getState() {
		int state = getStateInternal();
		@@ -1095,6 +1109,7 @@ public final class BluetoothAdapter {
		* @hide
		*/
		@RequiresLegacyBluetoothPermission
		@RequiresNoPermission
		@AdapterState
		@UnsupportedAppUsage(publicAlternatives = "Use {@link #getState()} instead to determine "
		+ "whether you can use BLE & BT classic.")
		@@ -1251,6 +1266,18 @@ public final class BluetoothAdapter {
		return null;
		}

		/** {@hide} */
		@RequiresBluetoothAdvertisePermission
		@RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE)
		public int getNameLengthForAdvertise() {
		try {
		return mService.getNameLengthForAdvertise();
		} catch (RemoteException e) {
		Log.e(TAG, "", e);
		}
		return -1;
		}

		/**
		* Factory reset bluetooth settings.
		*
		@@ -1637,6 +1664,7 @@ public final class BluetoothAdapter {

		/** @hide */
		@UnsupportedAppUsage
		@RequiresBluetoothScanPermission
		@RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN)
		public int getDiscoverableTimeout() {
		if (getState() != STATE_ON) {
		@@ -1657,6 +1685,7 @@ public final class BluetoothAdapter {

		/** @hide */
		@UnsupportedAppUsage
		@RequiresBluetoothScanPermission
		@RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN)
		public void setDiscoverableTimeout(int timeout) {
		if (getState() != STATE_ON) {
		@@ -1702,6 +1731,7 @@ public final class BluetoothAdapter {
		* Set the context for this BluetoothAdapter (only called from BluetoothManager)
		* @hide
		*/
		@RequiresNoPermission
		public void setContext(Context context) {
		mContext = context;
		}
		@@ -1860,6 +1890,7 @@ public final class BluetoothAdapter {
		* @hide
		*/
		@SystemApi
		@RequiresBluetoothConnectPermission
		@RequiresPermission(allOf = {
		android.Manifest.permission.BLUETOOTH_CONNECT,
		android.Manifest.permission.BLUETOOTH_PRIVILEGED,
		@@ -1904,6 +1935,7 @@ public final class BluetoothAdapter {
		* @hide
		*/
		@SystemApi
		@RequiresBluetoothConnectPermission
		@RequiresPermission(allOf = {
		android.Manifest.permission.BLUETOOTH_CONNECT,
		android.Manifest.permission.BLUETOOTH_PRIVILEGED,
		@@ -1952,6 +1984,7 @@ public final class BluetoothAdapter {
		*
		* @hide
		*/
		@RequiresBluetoothConnectPermission
		@RequiresPermission(allOf = {
		android.Manifest.permission.BLUETOOTH_CONNECT,
		android.Manifest.permission.BLUETOOTH_PRIVILEGED,
		@@ -1984,6 +2017,7 @@ public final class BluetoothAdapter {
		*
		* @hide
		*/
		@RequiresBluetoothConnectPermission
		@RequiresPermission(allOf = {
		android.Manifest.permission.BLUETOOTH_CONNECT,
		android.Manifest.permission.BLUETOOTH_PRIVILEGED,
		@@ -2009,6 +2043,7 @@ public final class BluetoothAdapter {
		* @return true if Multiple Advertisement feature is supported
		*/
		@RequiresLegacyBluetoothPermission
		@RequiresNoPermission
		public boolean isMultipleAdvertisementSupported() {
		if (getState() != STATE_ON) {
		return false;
		@@ -2037,6 +2072,7 @@ public final class BluetoothAdapter {
		* @hide
		*/
		@SystemApi
		@RequiresNoPermission
		public boolean isBleScanAlwaysAvailable() {
		try {
		return mManagerService.isBleScanAlwaysAvailable();
		@@ -2070,6 +2106,7 @@ public final class BluetoothAdapter {
		};

		/** @hide */
		@RequiresNoPermission
		public void disableIsOffloadedFilteringSupportedCache() {
		mBluetoothFilteringCache.disableLocal();
		}
		@@ -2085,6 +2122,7 @@ public final class BluetoothAdapter {
		* @return true if chipset supports on-chip filtering
		*/
		@RequiresLegacyBluetoothPermission
		@RequiresNoPermission
		public boolean isOffloadedFilteringSupported() {
		if (!getLeAccess()) {
		return false;
		@@ -2098,6 +2136,7 @@ public final class BluetoothAdapter {
		* @return true if chipset supports on-chip scan batching
		*/
		@RequiresLegacyBluetoothPermission
		@RequiresNoPermission
		public boolean isOffloadedScanBatchingSupported() {
		if (!getLeAccess()) {
		return false;
		@@ -2121,6 +2160,7 @@ public final class BluetoothAdapter {
		* @return true if chipset supports LE 2M PHY feature
		*/
		@RequiresLegacyBluetoothPermission
		@RequiresNoPermission
		public boolean isLe2MPhySupported() {
		if (!getLeAccess()) {
		return false;
		@@ -2144,6 +2184,7 @@ public final class BluetoothAdapter {
		* @return true if chipset supports LE Coded PHY feature
		*/
		@RequiresLegacyBluetoothPermission
		@RequiresNoPermission
		public boolean isLeCodedPhySupported() {
		if (!getLeAccess()) {
		return false;
		@@ -2167,6 +2208,7 @@ public final class BluetoothAdapter {
		* @return true if chipset supports LE Extended Advertising feature
		*/
		@RequiresLegacyBluetoothPermission
		@RequiresNoPermission
		public boolean isLeExtendedAdvertisingSupported() {
		if (!getLeAccess()) {
		return false;
		@@ -2190,6 +2232,7 @@ public final class BluetoothAdapter {
		* @return true if chipset supports LE Periodic Advertising feature
		*/
		@RequiresLegacyBluetoothPermission
		@RequiresNoPermission
		public boolean isLePeriodicAdvertisingSupported() {
		if (!getLeAccess()) {
		return false;
		@@ -2214,6 +2257,7 @@ public final class BluetoothAdapter {
		* @return the maximum LE advertising data length.
		*/
		@RequiresLegacyBluetoothPermission
		@RequiresNoPermission
		public int getLeMaximumAdvertisingDataLength() {
		if (!getLeAccess()) {
		return 0;
		@@ -2236,6 +2280,7 @@ public final class BluetoothAdapter {
		*
		* @return true if phone supports Hearing Aid Profile
		*/
		@RequiresNoPermission
		private boolean isHearingAidProfileSupported() {
		try {
		return mManagerService.isHearingAidProfileSupported();
		@@ -2274,6 +2319,7 @@ public final class BluetoothAdapter {
		* @return true if there are hw entries available for matching beacons
		* @hide
		*/
		@RequiresBluetoothConnectPermission
		@RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)
		public boolean isHardwareTrackingFiltersAvailable() {
		if (!getLeAccess()) {
		@@ -2420,6 +2466,7 @@ public final class BluetoothAdapter {
		* BluetoothProfile}.
		* @hide
		*/
		@RequiresNoPermission
		public @NonNull List<Integer> getSupportedProfiles() {
		final ArrayList<Integer> supportedProfiles = new ArrayList<Integer>();

		@@ -2467,6 +2514,7 @@ public final class BluetoothAdapter {
		};

		/** @hide */
		@RequiresNoPermission
		public void disableGetAdapterConnectionStateCache() {
		mBluetoothGetAdapterConnectionStateCache.disableLocal();
		}
		@@ -2491,6 +2539,7 @@ public final class BluetoothAdapter {
		*/
		@UnsupportedAppUsage
		@RequiresLegacyBluetoothPermission
		@RequiresNoPermission
		public int getConnectionState() {
		if (getState() != STATE_ON) {
		return BluetoothAdapter.STATE_DISCONNECTED;
		@@ -2541,6 +2590,7 @@ public final class BluetoothAdapter {
		};

		/** @hide */
		@RequiresNoPermission
		public void disableGetProfileConnectionStateCache() {
		mGetProfileConnectionStateCache.disableLocal();
		}
		@@ -2741,6 +2791,7 @@ public final class BluetoothAdapter {
		return createNewRfcommSocketAndRecord(name, uuid, false, true);
		}

		@RequiresBluetoothConnectPermission
		@RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)
		private BluetoothServerSocket createNewRfcommSocketAndRecord(String name, UUID uuid,
		boolean auth, boolean encrypt) throws IOException {
		@@ -2767,6 +2818,7 @@ public final class BluetoothAdapter {
		* permissions.
		* @hide
		*/
		@RequiresBluetoothConnectPermission
		@RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)
		public BluetoothServerSocket listenUsingInsecureRfcommOn(int port) throws IOException {
		BluetoothServerSocket socket =
		@@ -2799,6 +2851,7 @@ public final class BluetoothAdapter {
		* permissions.
		* @hide
		*/
		@RequiresBluetoothConnectPermission
		@RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)
		public BluetoothServerSocket listenUsingL2capOn(int port, boolean mitm, boolean min16DigitPin)
		throws IOException {
		@@ -2832,6 +2885,7 @@ public final class BluetoothAdapter {
		* permissions.
		* @hide
		*/
		@RequiresBluetoothConnectPermission
		@RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)
		public BluetoothServerSocket listenUsingL2capOn(int port) throws IOException {
		return listenUsingL2capOn(port, false, false);
		@@ -2849,6 +2903,7 @@ public final class BluetoothAdapter {
		* permissions.
		* @hide
		*/
		@RequiresBluetoothConnectPermission
		@RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)
		public BluetoothServerSocket listenUsingInsecureL2capOn(int port) throws IOException {
		Log.d(TAG, "listenUsingInsecureL2capOn: port=" + port);
		@@ -2904,6 +2959,10 @@ public final class BluetoothAdapter {
		* BluetoothProfile#HEARING_AID} or {@link BluetoothProfile#GATT_SERVER}.
		* @return true on success, false on error
		*/
		@SuppressLint({
		"AndroidFrameworkRequiresPermission",
		"AndroidFrameworkBluetoothPermission"
		})
		public boolean getProfileProxy(Context context, BluetoothProfile.ServiceListener listener,
		int profile) {
		if (context == null \|\| listener == null) {
		@@ -2973,7 +3032,10 @@ public final class BluetoothAdapter {
		* @param profile
		* @param proxy Profile proxy object
		*/
		@SuppressLint("AndroidFrameworkRequiresPermission")
		@SuppressLint({
		"AndroidFrameworkRequiresPermission",
		"AndroidFrameworkBluetoothPermission"
		})
		public void closeProfileProxy(int profile, BluetoothProfile proxy) {
		if (proxy == null) {
		return;
		@@ -3046,6 +3108,7 @@ public final class BluetoothAdapter {
		}
		}

		@SuppressLint("AndroidFrameworkBluetoothPermission")
		private final IBluetoothManagerCallback mManagerCallback =
		new IBluetoothManagerCallback.Stub() {
		@SuppressLint("AndroidFrameworkRequiresPermission")
		@@ -3368,7 +3431,6 @@ public final class BluetoothAdapter {
		/**
		* @hide
		*/
		@SuppressLint("AndroidFrameworkRequiresPermission")
		public class StateChangeCallbackWrapper extends IBluetoothStateChangeCallback.Stub {
		private BluetoothStateChangeCallback mCallback;

		@@ -3619,6 +3681,7 @@ public final class BluetoothAdapter {
		return false;
		}

		@SuppressLint("AndroidFrameworkBluetoothPermission")
		ScanCallback scanCallback = new ScanCallback() {
		@Override
		public void onScanResult(int callbackType, ScanResult result) {
		@@ -3949,6 +4012,7 @@ public final class BluetoothAdapter {
		@Nullable byte[] value);
		}

		@SuppressLint("AndroidFrameworkBluetoothPermission")
		private final IBluetoothConnectionCallback mConnectionCallback =
		new IBluetoothConnectionCallback.Stub() {
		@Override

framework/java/android/bluetooth/BluetoothGatt.java

+18 −5

Original line number	Diff line number	Diff line
		@@ -16,15 +16,12 @@

		package android.bluetooth;

		import android.compat.annotation.UnsupportedAppUsage;
		import android.annotation.RequiresNoPermission;
		import android.annotation.RequiresPermission;
		import android.annotation.SuppressLint;
		import android.annotation.RequiresPermission;
		import android.bluetooth.annotations.RequiresLegacyBluetoothAdminPermission;
		import android.bluetooth.annotations.RequiresBluetoothConnectPermission;
		import android.bluetooth.annotations.RequiresBluetoothLocationPermission;
		import android.bluetooth.annotations.RequiresLegacyBluetoothPermission;
		import android.bluetooth.annotations.RequiresBluetoothScanPermission;
		import android.compat.annotation.UnsupportedAppUsage;
		import android.os.Build;
		import android.os.Handler;
		import android.os.ParcelUuid;
		@@ -158,6 +155,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		/**
		* Bluetooth GATT callbacks. Overrides the default BluetoothGattCallback implementation.
		*/
		@SuppressLint("AndroidFrameworkBluetoothPermission")
		private final IBluetoothGattCallback mBluetoothGattCallback =
		new IBluetoothGattCallback.Stub() {
		/**
		@@ -747,6 +745,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		* Application should call this method as early as possible after it is done with
		* this GATT client.
		*/
		@RequiresBluetoothConnectPermission
		@RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)
		public void close() {
		if (DBG) Log.d(TAG, "close()");
		@@ -881,6 +880,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		* Unregister the current application and callbacks.
		*/
		@UnsupportedAppUsage
		@RequiresBluetoothConnectPermission
		@RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)
		private void unregisterApp() {
		if (DBG) Log.d(TAG, "unregisterApp() - mClientIf=" + mClientIf);
		@@ -973,6 +973,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		*
		* @return true, if the connection attempt was initiated successfully
		*/
		@RequiresBluetoothConnectPermission
		@RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)
		public boolean connect() {
		try {
		@@ -1003,6 +1004,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		* of {@link BluetoothDevice#PHY_OPTION_NO_PREFERRED}, {@link BluetoothDevice#PHY_OPTION_S2} or
		* {@link BluetoothDevice#PHY_OPTION_S8}
		*/
		@RequiresBluetoothConnectPermission
		@RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)
		public void setPreferredPhy(int txPhy, int rxPhy, int phyOptions) {
		try {
		@@ -1017,6 +1019,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		* Read the current transmitter PHY and receiver PHY of the connection. The values are returned
		* in {@link BluetoothGattCallback#onPhyRead}
		*/
		@RequiresBluetoothConnectPermission
		@RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)
		public void readPhy() {
		try {
		@@ -1031,6 +1034,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		*
		* @return remote bluetooth device
		*/
		@RequiresNoPermission
		public BluetoothDevice getDevice() {
		return mDevice;
		}
		@@ -1101,6 +1105,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		* not yet been performed.
		*/
		@RequiresLegacyBluetoothPermission
		@RequiresNoPermission
		public List<BluetoothGattService> getServices() {
		List<BluetoothGattService> result =
		new ArrayList<BluetoothGattService>();
		@@ -1129,6 +1134,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		* the remote device.
		*/
		@RequiresLegacyBluetoothPermission
		@RequiresNoPermission
		public BluetoothGattService getService(UUID uuid) {
		for (BluetoothGattService service : mServices) {
		if (service.getDevice().equals(mDevice) && service.getUuid().equals(uuid)) {
		@@ -1444,6 +1450,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		* @deprecated Use {@link #abortReliableWrite()}
		*/
		@Deprecated
		@RequiresBluetoothConnectPermission
		@RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)
		public void abortReliableWrite(BluetoothDevice mDevice) {
		abortReliableWrite();
		@@ -1496,6 +1503,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		* @hide
		*/
		@UnsupportedAppUsage
		@RequiresBluetoothConnectPermission
		@RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)
		public boolean refresh() {
		if (DBG) Log.d(TAG, "refresh() - device: " + mDevice.getAddress());
		@@ -1579,6 +1587,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		* or {@link BluetoothGatt#CONNECTION_PRIORITY_LOW_POWER}.
		* @throws IllegalArgumentException If the parameters are outside of their specified range.
		*/
		@RequiresBluetoothConnectPermission
		@RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)
		public boolean requestConnectionPriority(int connectionPriority) {
		if (connectionPriority < CONNECTION_PRIORITY_BALANCED
		@@ -1607,6 +1616,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		* @return true, if the request is send to the Bluetooth stack.
		* @hide
		*/
		@RequiresBluetoothConnectPermission
		@RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)
		public boolean requestLeConnectionUpdate(int minConnectionInterval, int maxConnectionInterval,
		int slaveLatency, int supervisionTimeout,
		@@ -1641,6 +1651,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		* @throws UnsupportedOperationException
		*/
		@Override
		@RequiresNoPermission
		public int getConnectionState(BluetoothDevice device) {
		throw new UnsupportedOperationException("Use BluetoothManager#getConnectionState instead.");
		}
		@@ -1652,6 +1663,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		* @throws UnsupportedOperationException
		*/
		@Override
		@RequiresNoPermission
		public List<BluetoothDevice> getConnectedDevices() {
		throw new UnsupportedOperationException(
		"Use BluetoothManager#getConnectedDevices instead.");
		@@ -1665,6 +1677,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		* @throws UnsupportedOperationException
		*/
		@Override
		@RequiresNoPermission
		public List<BluetoothDevice> getDevicesMatchingConnectionStates(int[] states) {
		throw new UnsupportedOperationException(
		"Use BluetoothManager#getDevicesMatchingConnectionStates instead.");

framework/java/android/bluetooth/BluetoothGattServer.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -16,7 +16,9 @@

		package android.bluetooth;

		import android.annotation.RequiresNoPermission;
		import android.annotation.RequiresPermission;
		import android.annotation.SuppressLint;
		import android.bluetooth.annotations.RequiresBluetoothConnectPermission;
		import android.bluetooth.annotations.RequiresLegacyBluetoothPermission;
		import android.os.ParcelUuid;
		@@ -58,6 +60,7 @@ public final class BluetoothGattServer implements BluetoothProfile {
		/**
		* Bluetooth GATT interface callbacks
		*/
		@SuppressLint("AndroidFrameworkBluetoothPermission")
		private final IBluetoothGattServerCallback mBluetoothGattServerCallback =
		new IBluetoothGattServerCallback.Stub() {
		/**
		@@ -428,6 +431,7 @@ public final class BluetoothGattServer implements BluetoothProfile {
		* Application should call this method as early as possible after it is done with
		* this GATT server.
		*/
		@RequiresBluetoothConnectPermission
		@RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)
		public void close() {
		if (DBG) Log.d(TAG, "close()");
		@@ -510,6 +514,7 @@ public final class BluetoothGattServer implements BluetoothProfile {
		/**
		* Unregister the current application and callbacks.
		*/
		@RequiresBluetoothConnectPermission
		@RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)
		private void unregisterCallback() {
		if (DBG) Log.d(TAG, "unregisterCallback() - mServerIf=" + mServerIf);
		@@ -618,6 +623,7 @@ public final class BluetoothGattServer implements BluetoothProfile {
		* of {@link BluetoothDevice#PHY_OPTION_NO_PREFERRED}, {@link BluetoothDevice#PHY_OPTION_S2} or
		* {@link BluetoothDevice#PHY_OPTION_S8}
		*/
		@RequiresBluetoothConnectPermission
		@RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)
		public void setPreferredPhy(BluetoothDevice device, int txPhy, int rxPhy, int phyOptions) {
		try {
		@@ -634,6 +640,7 @@ public final class BluetoothGattServer implements BluetoothProfile {
		*
		* @param device The remote device to send this response to
		*/
		@RequiresBluetoothConnectPermission
		@RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)
		public void readPhy(BluetoothDevice device) {
		try {
		@@ -814,6 +821,7 @@ public final class BluetoothGattServer implements BluetoothProfile {
		* @return List of services. Returns an empty list if no services have been added yet.
		*/
		@RequiresLegacyBluetoothPermission
		@RequiresNoPermission
		public List<BluetoothGattService> getServices() {
		return mServices;
		}
		@@ -830,6 +838,7 @@ public final class BluetoothGattServer implements BluetoothProfile {
		* this device.
		*/
		@RequiresLegacyBluetoothPermission
		@RequiresNoPermission
		public BluetoothGattService getService(UUID uuid) {
		for (BluetoothGattService service : mServices) {
		if (service.getUuid().equals(uuid)) {
		@@ -848,6 +857,7 @@ public final class BluetoothGattServer implements BluetoothProfile {
		* @throws UnsupportedOperationException
		*/
		@Override
		@RequiresNoPermission
		public int getConnectionState(BluetoothDevice device) {
		throw new UnsupportedOperationException("Use BluetoothManager#getConnectionState instead.");
		}
		@@ -859,6 +869,7 @@ public final class BluetoothGattServer implements BluetoothProfile {
		* @throws UnsupportedOperationException
		*/
		@Override
		@RequiresNoPermission
		public List<BluetoothDevice> getConnectedDevices() {
		throw new UnsupportedOperationException(
		"Use BluetoothManager#getConnectedDevices instead.");
		@@ -872,6 +883,7 @@ public final class BluetoothGattServer implements BluetoothProfile {
		* @throws UnsupportedOperationException
		*/
		@Override
		@RequiresNoPermission
		public List<BluetoothDevice> getDevicesMatchingConnectionStates(int[] states) {
		throw new UnsupportedOperationException(
		"Use BluetoothManager#getDevicesMatchingConnectionStates instead.");