Merge "Bluetooth 5 AdvertisingSet implementation (1/4)" (f0c963a5) · Commits · e / os / android_frameworks_base

api/current.txt

+3 −3

Original line number	Diff line number	Diff line
		@@ -7507,10 +7507,10 @@ package android.bluetooth.le {

		public final class AdvertisingSet {
		method public void enableAdvertising(boolean, int);
		method public void periodicAdvertisingEnable(boolean);
		method public void setAdvertisingData(android.bluetooth.le.AdvertiseData);
		method public void setAdvertisingParameters(android.bluetooth.le.AdvertisingSetParameters);
		method public void setPeriodicAdvertisingData(android.bluetooth.le.AdvertiseData);
		method public void setPeriodicAdvertisingEnable(boolean);
		method public void setPeriodicAdvertisingParameters(android.bluetooth.le.PeriodicAdvertisingParameters);
		method public void setScanResponseData(android.bluetooth.le.AdvertiseData);
		}
		@@ -7519,8 +7519,8 @@ package android.bluetooth.le {
		ctor public AdvertisingSetCallback();
		method public void onAdvertisingDataSet(android.bluetooth.le.AdvertisingSet, int);
		method public void onAdvertisingEnabled(android.bluetooth.le.AdvertisingSet, boolean, int);
		method public void onAdvertisingParametersUpdated(android.bluetooth.le.AdvertisingSet, int);
		method public void onAdvertisingSetStarted(android.bluetooth.le.AdvertisingSet, int);
		method public void onAdvertisingParametersUpdated(android.bluetooth.le.AdvertisingSet, int, int);
		method public void onAdvertisingSetStarted(android.bluetooth.le.AdvertisingSet, int, int);
		method public void onAdvertisingSetStopped(android.bluetooth.le.AdvertisingSet);
		method public void onPeriodicAdvertisingDataSet(android.bluetooth.le.AdvertisingSet, int);
		method public void onPeriodicAdvertisingEnable(android.bluetooth.le.AdvertisingSet, boolean, int);

api/system-current.txt

+3 −3

Original line number	Diff line number	Diff line
		@@ -7811,10 +7811,10 @@ package android.bluetooth.le {

		public final class AdvertisingSet {
		method public void enableAdvertising(boolean, int);
		method public void periodicAdvertisingEnable(boolean);
		method public void setAdvertisingData(android.bluetooth.le.AdvertiseData);
		method public void setAdvertisingParameters(android.bluetooth.le.AdvertisingSetParameters);
		method public void setPeriodicAdvertisingData(android.bluetooth.le.AdvertiseData);
		method public void setPeriodicAdvertisingEnable(boolean);
		method public void setPeriodicAdvertisingParameters(android.bluetooth.le.PeriodicAdvertisingParameters);
		method public void setScanResponseData(android.bluetooth.le.AdvertiseData);
		}
		@@ -7823,8 +7823,8 @@ package android.bluetooth.le {
		ctor public AdvertisingSetCallback();
		method public void onAdvertisingDataSet(android.bluetooth.le.AdvertisingSet, int);
		method public void onAdvertisingEnabled(android.bluetooth.le.AdvertisingSet, boolean, int);
		method public void onAdvertisingParametersUpdated(android.bluetooth.le.AdvertisingSet, int);
		method public void onAdvertisingSetStarted(android.bluetooth.le.AdvertisingSet, int);
		method public void onAdvertisingParametersUpdated(android.bluetooth.le.AdvertisingSet, int, int);
		method public void onAdvertisingSetStarted(android.bluetooth.le.AdvertisingSet, int, int);
		method public void onAdvertisingSetStopped(android.bluetooth.le.AdvertisingSet);
		method public void onPeriodicAdvertisingDataSet(android.bluetooth.le.AdvertisingSet, int);
		method public void onPeriodicAdvertisingEnable(android.bluetooth.le.AdvertisingSet, boolean, int);

api/test-current.txt

+3 −3

Original line number	Diff line number	Diff line
		@@ -7516,10 +7516,10 @@ package android.bluetooth.le {

		public final class AdvertisingSet {
		method public void enableAdvertising(boolean, int);
		method public void periodicAdvertisingEnable(boolean);
		method public void setAdvertisingData(android.bluetooth.le.AdvertiseData);
		method public void setAdvertisingParameters(android.bluetooth.le.AdvertisingSetParameters);
		method public void setPeriodicAdvertisingData(android.bluetooth.le.AdvertiseData);
		method public void setPeriodicAdvertisingEnable(boolean);
		method public void setPeriodicAdvertisingParameters(android.bluetooth.le.PeriodicAdvertisingParameters);
		method public void setScanResponseData(android.bluetooth.le.AdvertiseData);
		}
		@@ -7528,8 +7528,8 @@ package android.bluetooth.le {
		ctor public AdvertisingSetCallback();
		method public void onAdvertisingDataSet(android.bluetooth.le.AdvertisingSet, int);
		method public void onAdvertisingEnabled(android.bluetooth.le.AdvertisingSet, boolean, int);
		method public void onAdvertisingParametersUpdated(android.bluetooth.le.AdvertisingSet, int);
		method public void onAdvertisingSetStarted(android.bluetooth.le.AdvertisingSet, int);
		method public void onAdvertisingParametersUpdated(android.bluetooth.le.AdvertisingSet, int, int);
		method public void onAdvertisingSetStarted(android.bluetooth.le.AdvertisingSet, int, int);
		method public void onAdvertisingSetStopped(android.bluetooth.le.AdvertisingSet);
		method public void onPeriodicAdvertisingDataSet(android.bluetooth.le.AdvertisingSet, int);
		method public void onPeriodicAdvertisingEnable(android.bluetooth.le.AdvertisingSet, boolean, int);

core/java/android/bluetooth/IBluetoothGatt.aidl

+2 −2

Original line number	Diff line number	Diff line
		@@ -55,13 +55,13 @@ interface IBluetoothGatt {
		in AdvertiseData periodicData, in int timeout, in IAdvertisingSetCallback callback);
		void stopAdvertisingSet(in IAdvertisingSetCallback callback);

		void enableAdverisingSet(in int advertiserId, in boolean enable, in int timeout);
		void enableAdvertisingSet(in int advertiserId, in boolean enable, in int timeout);
		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 setPeriodicAdvertisingEnable(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);

core/java/android/bluetooth/le/AdvertisingSet.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -65,7 +65,7 @@ public final class AdvertisingSet {
		*/
		public void enableAdvertising(boolean enable, int timeout) {
		try {
		gatt.enableAdverisingSet(this.advertiserId, enable, timeout);
		gatt.enableAdvertisingSet(this.advertiserId, enable, timeout);
		} catch (RemoteException e) {
		Log.e(TAG, "remote exception - ", e);
		}
		@@ -143,9 +143,9 @@ public final class AdvertisingSet {
		* Used to enable/disable periodic advertising. This method returns immediately, the operation
		* status is delivered through {@code callback.onPeriodicAdvertisingEnable()}.
		*/
		public void periodicAdvertisingEnable(boolean enable) {
		public void setPeriodicAdvertisingEnable(boolean enable) {
		try {
		gatt.periodicAdvertisingEnable(this.advertiserId, enable);
		gatt.setPeriodicAdvertisingEnable(this.advertiserId, enable);
		} catch (RemoteException e) {
		Log.e(TAG, "remote exception - ", e);
		}