Merge "Bluetooth 5 Advertising API" (99ec98e2) · Commits · e / os / android_packages_modules_Bluetooth

framework/java/android/bluetooth/IBluetoothGatt.aidl

+17 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,8 @@ import android.bluetooth.BluetoothDevice;
		import android.bluetooth.BluetoothGattService;
		import android.bluetooth.le.AdvertiseSettings;
		import android.bluetooth.le.AdvertiseData;
		import android.bluetooth.le.AdvertisingSetParameters;
		import android.bluetooth.le.PeriodicAdvertisingParameters;
		import android.bluetooth.le.ScanFilter;
		import android.bluetooth.le.ScanResult;
		import android.bluetooth.le.ScanSettings;
		@@ -30,6 +32,7 @@ import android.os.WorkSource;
		import android.bluetooth.IBluetoothGattCallbackExt;
		import android.bluetooth.IBluetoothGattServerCallbackExt;
		import android.bluetooth.le.IAdvertiserCallback;
		import android.bluetooth.le.IAdvertisingSetCallback;
		import android.bluetooth.le.IPeriodicAdvertisingCallback;
		import android.bluetooth.le.IScannerCallback;

		@@ -55,10 +58,24 @@ interface IBluetoothGatt {
		in AdvertiseSettings settings);
		void stopMultiAdvertising(in int advertiserId);

		void startAdvertisingSet(in AdvertisingSetParameters parameters, in AdvertiseData advertiseData,
		in AdvertiseData scanResponse, in PeriodicAdvertisingParameters periodicParameters,
		in AdvertiseData periodicData, in IAdvertisingSetCallback callback);
		void stopAdvertisingSet(in IAdvertisingSetCallback callback);

		void enableAdverisingSet(in int advertiserId, in boolean enable);
		void setAdvertisingData(in int advertiserId, in AdvertiseData data);
		void setScanResponseData(in int advertiserId, in AdvertiseData data);
		void setAdvertisingParameters(in int advertiserId, in AdvertisingSetParameters parameters);
		void setPeriodicAdvertisingParameters(in int advertiserId, in PeriodicAdvertisingParameters parameters);
		void setPeriodicAdvertisingData(in int advertiserId, in AdvertiseData data);
		void periodicAdvertisingEnable(in int advertiserId, in boolean enable);

		void registerSync(in ScanResult scanResult, in int skip, in int timeout, in IPeriodicAdvertisingCallback callback);
		void unregisterSync(in IPeriodicAdvertisingCallback callback);

		void registerClient(in ParcelUuid appId, in IBluetoothGattCallbackExt callback);

		void unregisterClient(in int clientIf);
		void clientConnect(in int clientIf, in String address, in boolean isDirect, in int transport, in int phy);
		void clientDisconnect(in int clientIf, in String address);

framework/java/android/bluetooth/le/AdvertisingSet.java

0 → 100644

+162 −0

Original line number	Diff line number	Diff line
		/*
		* 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.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.bluetooth.le;

		import android.bluetooth.IBluetoothGatt;
		import android.bluetooth.IBluetoothManager;
		import android.bluetooth.le.IAdvertisingSetCallback;
		import android.os.RemoteException;
		import android.util.Log;

		/**
		* This class provides a way to control single Bluetooth LE advertising instance.
		* <p>
		* To get an instance of {@link AdvertisingSet}, call the
		* {@link BluetoothLeAdvertiser#startAdvertisingSet} method.
		* <p>
		* <b>Note:</b> Most of the methods here require {@link android.Manifest.permission#BLUETOOTH_ADMIN}
		* permission.
		*
		* @see AdvertiseData
		*/
		public final class AdvertisingSet {
		private static final String TAG = "AdvertisingSet";

		private final IBluetoothGatt gatt;
		private int advertiserId;

		/* package */ AdvertisingSet(int advertiserId,
		IBluetoothManager bluetoothManager) {
		this.advertiserId = advertiserId;

		try {
		this.gatt = bluetoothManager.getBluetoothGatt();
		} catch (RemoteException e) {
		Log.e(TAG, "Failed to get Bluetooth gatt - ", e);
		throw new IllegalStateException("Failed to get Bluetooth");
		}
		}

		/* package */ void setAdvertiserId(int advertiserId) {
		this.advertiserId = advertiserId;
		}

		/**
		* Enables Advertising. This method returns immediately, the operation status is
		* delivered
		* through {@code callback.onAdvertisingEnabled()}.
		* <p>
		* Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN}
		*
		*/
		public void enableAdvertising(boolean enable) {
		try {
		gatt.enableAdverisingSet(this.advertiserId, enable);
		} catch (RemoteException e) {
		Log.e(TAG, "remote exception - ", e);
		}
		}

		/**
		* Set/update data being Advertised. Make sure that data doesn't exceed the size limit for
		* specified AdvertisingSetParameters. This method returns immediately, the operation status is
		* delivered through {@code callback.onAdvertisingDataSet()}.
		* <p>
		* Advertising data must be empty if non-legacy scannable advertising is used.
		*/
		public void setAdvertisingData(AdvertiseData data) {
		try {
		gatt.setAdvertisingData(this.advertiserId, data);
		} catch (RemoteException e) {
		Log.e(TAG, "remote exception - ", e);
		}
		}

		/**
		* Set/update scan response data. Make sure that data doesn't exceed the size limit for
		* specified AdvertisingSetParameters. This method returns immediately, the operation status
		* is delivered through {@code callback.onScanResponseDataSet()}.
		*/
		public void setScanResponseData(AdvertiseData data) {
		try {
		gatt.setScanResponseData(this.advertiserId, data);
		} catch (RemoteException e) {
		Log.e(TAG, "remote exception - ", e);
		}
		}

		/**
		* Update advertising parameters associated with this AdvertisingSet. Must be called when
		* advertising is not active. This method returns immediately, the operation status is delivered
		* through {@code callback.onAdvertisingParametersUpdated}.
		*/
		public void setAdvertisingParameters(AdvertisingSetParameters parameters) {
		try {
		gatt.setAdvertisingParameters(this.advertiserId, parameters);
		} catch (RemoteException e) {
		Log.e(TAG, "remote exception - ", e);
		}
		}

		/**
		* Update periodic advertising parameters associated with this set. Must be called when
		* periodic advertising is not enabled. This method returns immediately, the operation
		* status is delivered through {@code callback.onPeriodicAdvertisingParametersUpdated()}.
		*/
		public void setPeriodicAdvertisingParameters(PeriodicAdvertisingParameters parameters) {
		try {
		gatt.setPeriodicAdvertisingParameters(this.advertiserId, parameters);
		} catch (RemoteException e) {
		Log.e(TAG, "remote exception - ", e);
		}
		}

		/**
		* Used to set periodic advertising data, must be called after setPeriodicAdvertisingParameters,
		* or after advertising was started with periodic advertising data set. This method returns
		* immediately, the operation status is delivered through
		* {@code callback.onPeriodicAdvertisingDataSet()}.
		*/
		public void setPeriodicAdvertisingData(AdvertiseData data) {
		try {
		gatt.setPeriodicAdvertisingData(this.advertiserId, data);
		} catch (RemoteException e) {
		Log.e(TAG, "remote exception - ", e);
		}
		}

		/**
		* Used to enable/disable periodic advertising. This method returns immediately, the operation
		* status is delivered through {@code callback.onPeriodicAdvertisingEnable()}.
		*/
		public void periodicAdvertisingEnable(boolean enable) {
		try {
		gatt.periodicAdvertisingEnable(this.advertiserId, enable);
		} catch (RemoteException e) {
		Log.e(TAG, "remote exception - ", e);
		}
		}

		/**
		* Returns advertiserId associated with thsi advertising set.
		*
		* @hide
		*/
		public int getAdvertiserId(){
		return advertiserId;
		}
		}
		No newline at end of file

framework/java/android/bluetooth/le/AdvertisingSetCallback.java

0 → 100644

+144 −0

Original line number	Diff line number	Diff line
		/*
		* 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.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.bluetooth.le;

		import android.bluetooth.BluetoothDevice;

		/**
		* Bluetooth LE advertising set callbacks, used to deliver advertising operation
		* status.
		*/
		public abstract class AdvertisingSetCallback {

		/**
		* The requested operation was successful.
		*/
		public static final int ADVERTISE_SUCCESS = 0;

		/**
		* Failed to start advertising as the advertise data to be broadcasted is too
		* large.
		*/
		public static final int ADVERTISE_FAILED_DATA_TOO_LARGE = 1;

		/**
		* Failed to start advertising because no advertising instance is available.
		*/
		public static final int ADVERTISE_FAILED_TOO_MANY_ADVERTISERS = 2;

		/**
		* Failed to start advertising as the advertising is already started.
		*/
		public static final int ADVERTISE_FAILED_ALREADY_STARTED = 3;

		/**
		* Operation failed due to an internal error.
		*/
		public static final int ADVERTISE_FAILED_INTERNAL_ERROR = 4;

		/**
		* This feature is not supported on this platform.
		*/
		public static final int ADVERTISE_FAILED_FEATURE_UNSUPPORTED = 5;

		/**
		* Callback triggered in response to {@link BluetoothLeAdvertiser#startAdvertisingSet}
		* indicating result of the operation. If status is ADVERTISE_SUCCESS, then advertisingSet
		* contains the started set and it is advertising. If error occured, advertisingSet is
		* null, and status will be set to proper error code.
		*
		* @param advertisingSet The advertising set that was started or null if error.
		* @param status Status of the operation.
		*/
		public void onAdvertisingSetStarted(AdvertisingSet advertisingSet, int status) {}

		/**
		* Callback triggered in response to {@link BluetoothLeAdvertiser#stopAdvertisingSet}
		* indicating advertising set is stopped.
		*
		* @param advertisingSet The advertising set.
		*/
		public void onAdvertisingSetStopped(AdvertisingSet advertisingSet) {}

		/**
		* Callback triggered in response to {@link BluetoothLeAdvertiser#startAdvertisingSet} indicating
		* result of the operation. If status is ADVERTISE_SUCCESS, then advertising set is advertising.
		*
		* @param advertisingSet The advertising set.
		* @param status Status of the operation.
		*/
		public void onAdvertisingEnabled(AdvertisingSet advertisingSet, boolean enable, int status) {}

		/**
		* Callback triggered in response to {@link AdvertisingSet#setAdvertisingData} indicating
		* result of the operation. If status is ADVERTISE_SUCCESS, then data was changed.
		*
		* @param advertisingSet The advertising set.
		* @param status Status of the operation.
		*/
		public void onAdvertisingDataSet(AdvertisingSet advertisingSet, int status) {}

		/**
		* Callback triggered in response to {@link AdvertisingSet#setAdvertisingData} indicating
		* result of the operation.
		*
		* @param advertisingSet The advertising set.
		* @param status Status of the operation.
		*/
		public void onScanResponseDataSet(AdvertisingSet advertisingSet, int status) {}

		/**
		* Callback triggered in response to {@link AdvertisingSet#setAdvertisingParameters}
		* indicating result of the operation.
		*
		* @param advertisingSet The advertising set.
		* @param status Status of the operation.
		*/
		public void onAdvertisingParametersUpdated(AdvertisingSet advertisingSet,
		int status) {}

		/**
		* Callback triggered in response to {@link AdvertisingSet#setPeriodicAdvertisingParameters}
		* indicating result of the operation.
		*
		* @param advertisingSet The advertising set.
		* @param status Status of the operation.
		*/
		public void
		onPeriodicAdvertisingParametersUpdated(AdvertisingSet advertisingSet,
		int status) {}

		/**
		* Callback triggered in response to {@link AdvertisingSet#setPeriodicAdvertisingData}
		* indicating result of the operation.
		*
		* @param advertisingSet The advertising set.
		* @param status Status of the operation.
		*/
		public void onPeriodicAdvertisingDataSet(AdvertisingSet advertisingSet,
		int status) {}

		/**
		* Callback triggered in response to {@link AdvertisingSet#periodicAdvertisingEnable}
		* indicating result of the operation.
		*
		* @param advertisingSet The advertising set.
		* @param status Status of the operation.
		*/
		public void onPeriodicAdvertisingEnable(AdvertisingSet advertisingSet, boolean enable,
		int status) {}
		}
		No newline at end of file

framework/java/android/bluetooth/le/AdvertisingSetParameters.aidl

0 → 100644

+19 −0

Original line number	Diff line number	Diff line
		/*
		* 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.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.bluetooth.le;

		parcelable AdvertisingSetParameters;

framework/java/android/bluetooth/le/AdvertisingSetParameters.java

0 → 100644

+409 −0

File added.

Preview size limit exceeded, changes collapsed.