Merge "BluetoothGattCallbackExt removal" am: 2834af792a am: cf5d10fa7a (33c3a4f7) · Commits · e / os / android_packages_modules_Bluetooth

framework/java/android/bluetooth/BluetoothDevice.java

+1 −38

Original line number	Diff line number	Diff line
		@@ -1654,43 +1654,6 @@ public final class BluetoothDevice implements Parcelable {
		return (connectGatt(context, autoConnect,callback, TRANSPORT_AUTO, PHY_LE_1M));
		}

		/**
		* Connect to GATT Server hosted by this device. Caller acts as GATT client.
		* The callback is used to deliver results to Caller, such as connection status as well
		* as any further GATT client operations.
		* The method returns a BluetoothGatt instance. You can use BluetoothGatt to conduct
		* GATT client operations.
		* @param callback GATT callback handler that will receive asynchronous callbacks.
		* @param autoConnect Whether to directly connect to the remote device (false)
		* or to automatically connect as soon as the remote
		* device becomes available (true).
		* @throws IllegalArgumentException if callback is null
		*/
		public BluetoothGatt connectGatt(Context context, boolean autoConnect,
		BluetoothGattCallbackExt callback) {
		return (connectGatt(context, autoConnect,callback, TRANSPORT_AUTO));
		}

		/**
		* Connect to GATT Server hosted by this device. Caller acts as GATT client.
		* The callback is used to deliver results to Caller, such as connection status as well
		* as any further GATT client operations.
		* The method returns a BluetoothGatt instance. You can use BluetoothGatt to conduct
		* GATT client operations.
		* @param callback GATT callback handler that will receive asynchronous callbacks.
		* @param autoConnect Whether to directly connect to the remote device (false)
		* or to automatically connect as soon as the remote
		* device becomes available (true).
		* @param transport preferred transport for GATT connections to remote dual-mode devices
		* {@link BluetoothDevice#TRANSPORT_AUTO} or
		* {@link BluetoothDevice#TRANSPORT_BREDR} or {@link BluetoothDevice#TRANSPORT_LE}
		* @throws IllegalArgumentException if callback is null
		*/
		public BluetoothGatt connectGatt(Context context, boolean autoConnect,
		BluetoothGattCallbackExt callback, int transport) {
		return (connectGatt(context, autoConnect,callback, TRANSPORT_AUTO, PHY_LE_1M));
		}

		/**
		* Connect to GATT Server hosted by this device. Caller acts as GATT client.
		* The callback is used to deliver results to Caller, such as connection status as well
		@@ -1711,7 +1674,7 @@ public final class BluetoothDevice implements Parcelable {
		* @throws IllegalArgumentException if callback is null
		*/
		public BluetoothGatt connectGatt(Context context, boolean autoConnect,
		BluetoothGattCallbackExt callback, int transport, int phy) {
		BluetoothGattCallback callback, int transport, int phy) {
		// TODO(Bluetooth) check whether platform support BLE
		// Do the check here or in GattServer?
		BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();

framework/java/android/bluetooth/BluetoothGatt.java

+21 −21

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@ import java.util.UUID;
		* <p>This class provides Bluetooth GATT functionality to enable communication
		* with Bluetooth Smart or Smart Ready devices.
		*
		* <p>To connect to a remote peripheral device, create a {@link BluetoothGattCallbackExt}
		* <p>To connect to a remote peripheral device, create a {@link BluetoothGattCallback}
		* and call {@link BluetoothDevice#connectGatt} to get a instance of this class.
		* GATT capable devices can be discovered using the Bluetooth device discovery or BLE
		* scan process.
		@@ -42,7 +42,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		private static final boolean VDBG = false;

		private IBluetoothGatt mService;
		private BluetoothGattCallbackExt mCallback;
		private BluetoothGattCallback mCallback;
		private int mClientIf;
		private BluetoothDevice mDevice;
		private boolean mAutoConnect;
		@@ -133,9 +133,9 @@ public final class BluetoothGatt implements BluetoothProfile {
		/package/ static final int AUTHENTICATION_MITM = 2;

		/**
		* Bluetooth GATT callbacks. Overrides the default BluetoothGattCallbackExt implementation.
		* Bluetooth GATT callbacks. Overrides the default BluetoothGattCallback implementation.
		*/
		private final IBluetoothGattCallbackExt mBluetoothGattCallbackExt =
		private final IBluetoothGattCallbackExt mBluetoothGattCallback =
		new IBluetoothGattCallbackExt.Stub() {
		/**
		* Application interface registered - app is ready to go
		@@ -618,7 +618,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		/**
		* Register an application callback to start using GATT.
		*
		* <p>This is an asynchronous call. The callback {@link BluetoothGattCallbackExt#onAppRegistered}
		* <p>This is an asynchronous call. The callback {@link BluetoothGattCallback#onAppRegistered}
		* is used to notify success or failure if the function returns true.
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH} permission.
		@@ -627,7 +627,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		* @return If true, the callback will be called to notify success or failure,
		* false on immediate error
		*/
		private boolean registerApp(BluetoothGattCallbackExt callback) {
		private boolean registerApp(BluetoothGattCallback callback) {
		if (DBG) Log.d(TAG, "registerApp()");
		if (mService == null) return false;

		@@ -636,7 +636,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		if (DBG) Log.d(TAG, "registerApp() - UUID=" + uuid);

		try {
		mService.registerClient(new ParcelUuid(uuid), mBluetoothGattCallbackExt);
		mService.registerClient(new ParcelUuid(uuid), mBluetoothGattCallback);
		} catch (RemoteException e) {
		Log.e(TAG,"",e);
		return false;
		@@ -666,7 +666,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		*
		* <p>The connection may not be established right away, but will be
		* completed when the remote device is available. A
		* {@link BluetoothGattCallbackExt#onConnectionStateChange} callback will be
		* {@link BluetoothGattCallback#onConnectionStateChange} callback will be
		* invoked when the connection state changes as a result of this function.
		*
		* <p>The autoConnect parameter determines whether to actively connect to
		@@ -684,7 +684,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		* device becomes available (true).
		* @return true, if the connection attempt was initiated successfully
		*/
		/package/ boolean connect(Boolean autoConnect, BluetoothGattCallbackExt callback) {
		/package/ boolean connect(Boolean autoConnect, BluetoothGattCallback callback) {
		if (DBG) Log.d(TAG, "connect() - device: " + mDevice.getAddress() + ", auto: " + autoConnect);
		synchronized(mStateLock) {
		if (mConnState != CONN_STATE_IDLE) {
		@@ -749,7 +749,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		* recommendation, wether the PHY change will happen depends on other applications peferences,
		* local and remote controller capabilities. Controller can override these settings.
		* <p>
		* {@link BluetoothGattCallbackExt#onPhyUpdate} will be triggered as a result of this call, even
		* {@link BluetoothGattCallback#onPhyUpdate} will be triggered as a result of this call, even
		* if no PHY change happens. It is also triggered when remote device updates the PHY.
		*
		* @param txPhy preferred transmitter PHY. Bitwise OR of any of
		@@ -773,7 +773,7 @@ public final class BluetoothGatt implements BluetoothProfile {

		/**
		* Read the current transmitter PHY and receiver PHY of the connection. The values are returned
		* in {@link BluetoothGattCallbackExt#onPhyRead}
		* in {@link BluetoothGattCallback#onPhyRead}
		*/
		public void readPhy() {
		try {
		@@ -797,7 +797,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		* characteristics and descriptors.
		*
		* <p>This is an asynchronous operation. Once service discovery is completed,
		* the {@link BluetoothGattCallbackExt#onServicesDiscovered} callback is
		* the {@link BluetoothGattCallback#onServicesDiscovered} callback is
		* triggered. If the discovery was successful, the remote services can be
		* retrieved using the {@link #getServices} function.
		*
		@@ -876,7 +876,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		* Reads the requested characteristic from the associated remote device.
		*
		* <p>This is an asynchronous operation. The result of the read operation
		* is reported by the {@link BluetoothGattCallbackExt#onCharacteristicRead}
		* is reported by the {@link BluetoothGattCallback#onCharacteristicRead}
		* callback.
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH} permission.
		@@ -918,7 +918,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		* Writes a given characteristic and its values to the associated remote device.
		*
		* <p>Once the write operation has been completed, the
		* {@link BluetoothGattCallbackExt#onCharacteristicWrite} callback is invoked,
		* {@link BluetoothGattCallback#onCharacteristicWrite} callback is invoked,
		* reporting the result of the operation.
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH} permission.
		@@ -962,7 +962,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		* Reads the value for a given descriptor from the associated remote device.
		*
		* <p>Once the read operation has been completed, the
		* {@link BluetoothGattCallbackExt#onDescriptorRead} callback is
		* {@link BluetoothGattCallback#onDescriptorRead} callback is
		* triggered, signaling the result of the operation.
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH} permission.
		@@ -1003,7 +1003,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		/**
		* Write the value of a given descriptor to the associated remote device.
		*
		* <p>A {@link BluetoothGattCallbackExt#onDescriptorWrite} callback is
		* <p>A {@link BluetoothGattCallback#onDescriptorWrite} callback is
		* triggered to report the result of the write operation.
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH} permission.
		@@ -1047,7 +1047,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		* <p>Once a reliable write transaction has been initiated, all calls
		* to {@link #writeCharacteristic} are sent to the remote device for
		* verification and queued up for atomic execution. The application will
		* receive an {@link BluetoothGattCallbackExt#onCharacteristicWrite} callback
		* receive an {@link BluetoothGattCallback#onCharacteristicWrite} callback
		* in response to every {@link #writeCharacteristic} call and is responsible
		* for verifying if the value has been transmitted accurately.
		*
		@@ -1081,7 +1081,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		* <p>This function will commit all queued up characteristic write
		* operations for a given remote device.
		*
		* <p>A {@link BluetoothGattCallbackExt#onReliableWriteCompleted} callback is
		* <p>A {@link BluetoothGattCallback#onReliableWriteCompleted} callback is
		* invoked to indicate whether the transaction has been executed correctly.
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH} permission.
		@@ -1139,7 +1139,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		* Enable or disable notifications/indications for a given characteristic.
		*
		* <p>Once notifications are enabled for a characteristic, a
		* {@link BluetoothGattCallbackExt#onCharacteristicChanged} callback will be
		* {@link BluetoothGattCallback#onCharacteristicChanged} callback will be
		* triggered if the remote device indicates that the given characteristic
		* has changed.
		*
		@@ -1194,7 +1194,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		/**
		* Read the RSSI for a connected remote device.
		*
		* <p>The {@link BluetoothGattCallbackExt#onReadRemoteRssi} callback will be
		* <p>The {@link BluetoothGattCallback#onReadRemoteRssi} callback will be
		* invoked when the RSSI value has been read.
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH} permission.
		@@ -1222,7 +1222,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		* the data sent is truncated to the MTU size. This function may be used
		* to request a larger MTU size to be able to send more data at once.
		*
		* <p>A {@link BluetoothGattCallbackExt#onMtuChanged} callback will indicate
		* <p>A {@link BluetoothGattCallback#onMtuChanged} callback will indicate
		* whether this operation was successful.
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH} permission.

framework/java/android/bluetooth/BluetoothGattCallback.java

+150 −7

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2013 The Android Open Source Project
		* Copyright (C) 2017 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		@@ -18,22 +18,165 @@ package android.bluetooth;

		/**
		* This abstract class is used to implement {@link BluetoothGatt} callbacks.
		* @deprecated use {@link BluetoothGattCallbackExt}
		*/
		public abstract class BluetoothGattCallback extends BluetoothGattCallbackExt {
		public abstract class BluetoothGattCallback{

		/**
		* @hide
		* Callback triggered as result of {@link BluetoothGatt#setPreferredPhy}, or as a result of
		* remote device changing the PHY.
		*
		* @param gatt GATT client
		* @param txPhy the transmitter PHY in use. One of {@link BluetoothDevice#PHY_LE_1M},
		* {@link BluetoothDevice#PHY_LE_2M}, and {@link BluetoothDevice#PHY_LE_CODED}.
		* @param rxPhy the receiver PHY in use. One of {@link BluetoothDevice#PHY_LE_1M},
		* {@link BluetoothDevice#PHY_LE_2M}, and {@link BluetoothDevice#PHY_LE_CODED}.
		* @param status status of the operation
		*/
		@Override
		public void onPhyUpdate(BluetoothGatt gatt, int txPhy, int rxPhy, int status) {
		}

		/**
		* @hide
		* Callback triggered as result of {@link BluetoothGatt#readPhy}
		*
		* @param gatt GATT client
		* @param txPhy the transmitter PHY in use. One of {@link BluetoothDevice#PHY_LE_1M},
		* {@link BluetoothDevice#PHY_LE_2M}, and {@link BluetoothDevice#PHY_LE_CODED}.
		* @param rxPhy the receiver PHY in use. One of {@link BluetoothDevice#PHY_LE_1M},
		* {@link BluetoothDevice#PHY_LE_2M}, and {@link BluetoothDevice#PHY_LE_CODED}.
		* @param status status of the operation
		*/
		@Override
		public void onPhyRead(BluetoothGatt gatt, int txPhy, int rxPhy, int status) {
		}

		/**
		* Callback indicating when GATT client has connected/disconnected to/from a remote
		* GATT server.
		*
		* @param gatt GATT client
		* @param status Status of the connect or disconnect operation.
		* {@link BluetoothGatt#GATT_SUCCESS} if the operation succeeds.
		* @param newState Returns the new connection state. Can be one of
		* {@link BluetoothProfile#STATE_DISCONNECTED} or
		* {@link BluetoothProfile#STATE_CONNECTED}
		*/
		public void onConnectionStateChange(BluetoothGatt gatt, int status,
		int newState) {
		}

		/**
		* Callback invoked when the list of remote services, characteristics and descriptors
		* for the remote device have been updated, ie new services have been discovered.
		*
		* @param gatt GATT client invoked {@link BluetoothGatt#discoverServices}
		* @param status {@link BluetoothGatt#GATT_SUCCESS} if the remote device
		* has been explored successfully.
		*/
		public void onServicesDiscovered(BluetoothGatt gatt, int status) {
		}

		/**
		* Callback reporting the result of a characteristic read operation.
		*
		* @param gatt GATT client invoked {@link BluetoothGatt#readCharacteristic}
		* @param characteristic Characteristic that was read from the associated
		* remote device.
		* @param status {@link BluetoothGatt#GATT_SUCCESS} if the read operation
		* was completed successfully.
		*/
		public void onCharacteristicRead(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic,
		int status) {
		}

		/**
		* Callback indicating the result of a characteristic write operation.
		*
		* <p>If this callback is invoked while a reliable write transaction is
		* in progress, the value of the characteristic represents the value
		* reported by the remote device. An application should compare this
		* value to the desired value to be written. If the values don't match,
		* the application must abort the reliable write transaction.
		*
		* @param gatt GATT client invoked {@link BluetoothGatt#writeCharacteristic}
		* @param characteristic Characteristic that was written to the associated
		* remote device.
		* @param status The result of the write operation
		* {@link BluetoothGatt#GATT_SUCCESS} if the operation succeeds.
		*/
		public void onCharacteristicWrite(BluetoothGatt gatt,
		BluetoothGattCharacteristic characteristic, int status) {
		}

		/**
		* Callback triggered as a result of a remote characteristic notification.
		*
		* @param gatt GATT client the characteristic is associated with
		* @param characteristic Characteristic that has been updated as a result
		* of a remote notification event.
		*/
		public void onCharacteristicChanged(BluetoothGatt gatt,
		BluetoothGattCharacteristic characteristic) {
		}

		/**
		* Callback reporting the result of a descriptor read operation.
		*
		* @param gatt GATT client invoked {@link BluetoothGatt#readDescriptor}
		* @param descriptor Descriptor that was read from the associated
		* remote device.
		* @param status {@link BluetoothGatt#GATT_SUCCESS} if the read operation
		* was completed successfully
		*/
		public void onDescriptorRead(BluetoothGatt gatt, BluetoothGattDescriptor descriptor,
		int status) {
		}

		/**
		* Callback indicating the result of a descriptor write operation.
		*
		* @param gatt GATT client invoked {@link BluetoothGatt#writeDescriptor}
		* @param descriptor Descriptor that was writte to the associated
		* remote device.
		* @param status The result of the write operation
		* {@link BluetoothGatt#GATT_SUCCESS} if the operation succeeds.
		*/
		public void onDescriptorWrite(BluetoothGatt gatt, BluetoothGattDescriptor descriptor,
		int status) {
		}

		/**
		* Callback invoked when a reliable write transaction has been completed.
		*
		* @param gatt GATT client invoked {@link BluetoothGatt#executeReliableWrite}
		* @param status {@link BluetoothGatt#GATT_SUCCESS} if the reliable write
		* transaction was executed successfully
		*/
		public void onReliableWriteCompleted(BluetoothGatt gatt, int status) {
		}

		/**
		* Callback reporting the RSSI for a remote device connection.
		*
		* This callback is triggered in response to the
		* {@link BluetoothGatt#readRemoteRssi} function.
		*
		* @param gatt GATT client invoked {@link BluetoothGatt#readRemoteRssi}
		* @param rssi The RSSI value for the remote device
		* @param status {@link BluetoothGatt#GATT_SUCCESS} if the RSSI was read successfully
		*/
		public void onReadRemoteRssi(BluetoothGatt gatt, int rssi, int status) {
		}

		/**
		* Callback indicating the MTU for a given device connection has changed.
		*
		* This callback is triggered in response to the
		* {@link BluetoothGatt#requestMtu} function, or in response to a connection
		* event.
		*
		* @param gatt GATT client invoked {@link BluetoothGatt#requestMtu}
		* @param mtu The new MTU size
		* @param status {@link BluetoothGatt#GATT_SUCCESS} if the MTU has been changed successfully
		*/
		public void onMtuChanged(BluetoothGatt gatt, int mtu, int status) {
		}
		}

framework/java/android/bluetooth/BluetoothGattCallbackExt.java

deleted100644 → 0

+0 −182

File deleted.

Preview size limit exceeded, changes collapsed.

framework/java/android/bluetooth/BluetoothGattServer.java

+9 −9

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@ public final class BluetoothGattServer implements BluetoothProfile {

		private BluetoothAdapter mAdapter;
		private IBluetoothGatt mService;
		private BluetoothGattServerCallbackExt mCallback;
		private BluetoothGattServerCallback mCallback;

		private Object mServerIfLock = new Object();
		private int mServerIf;
		@@ -396,7 +396,7 @@ public final class BluetoothGattServer implements BluetoothProfile {
		* @return true, the callback will be called to notify success or failure,
		* false on immediate error
		*/
		/package/ boolean registerCallback(BluetoothGattServerCallbackExt callback) {
		/package/ boolean registerCallback(BluetoothGattServerCallback callback) {
		if (DBG) Log.d(TAG, "registerCallback()");
		if (mService == null) {
		Log.e(TAG, "GATT service not available");
		@@ -472,7 +472,7 @@ public final class BluetoothGattServer implements BluetoothProfile {
		*
		* <p>The connection may not be established right away, but will be
		* completed when the remote device is available. A
		* {@link BluetoothGattServerCallbackExt#onConnectionStateChange} callback will be
		* {@link BluetoothGattServerCallback#onConnectionStateChange} callback will be
		* invoked when the connection state changes as a result of this function.
		*
		* <p>The autoConnect paramter determines whether to actively connect to
		@@ -528,7 +528,7 @@ public final class BluetoothGattServer implements BluetoothProfile {
		* recommendation, wether the PHY change will happen depends on other applications peferences,
		* local and remote controller capabilities. Controller can override these settings.
		* <p>
		* {@link BluetoothGattServerCallbackExt#onPhyUpdate} will be triggered as a result of this call, even
		* {@link BluetoothGattServerCallback#onPhyUpdate} will be triggered as a result of this call, even
		* if no PHY change happens. It is also triggered when remote device updates the PHY.
		*
		* @param device The remote device to send this response to
		@@ -553,7 +553,7 @@ public final class BluetoothGattServer implements BluetoothProfile {

		/**
		* Read the current transmitter PHY and receiver PHY of the connection. The values are returned
		* in {@link BluetoothGattServerCallbackExt#onPhyRead}
		* in {@link BluetoothGattServerCallback#onPhyRead}
		*
		* @param device The remote device to send this response to
		*/
		@@ -572,10 +572,10 @@ public final class BluetoothGattServer implements BluetoothProfile {
		* is received by one of these callback methods:
		*
		* <ul>
		* <li>{@link BluetoothGattServerCallbackExt#onCharacteristicReadRequest}
		* <li>{@link BluetoothGattServerCallbackExt#onCharacteristicWriteRequest}
		* <li>{@link BluetoothGattServerCallbackExt#onDescriptorReadRequest}
		* <li>{@link BluetoothGattServerCallbackExt#onDescriptorWriteRequest}
		* <li>{@link BluetoothGattServerCallback#onCharacteristicReadRequest}
		* <li>{@link BluetoothGattServerCallback#onCharacteristicWriteRequest}
		* <li>{@link BluetoothGattServerCallback#onDescriptorReadRequest}
		* <li>{@link BluetoothGattServerCallback#onDescriptorWriteRequest}
		* </ul>
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH} permission.