drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Bluetooth 5 Enable->Enabled (1/2)"

Browse Source 
am: fa69eeac5c

Change-Id: Ia09cf5db2f69659a3b77e4c5e663d5977793df48
This commit is contained in:
Jakub Pawlowski
2017-03-23 01:25:31 +00:00
committed by android-build-merger
parent e4d926d9af fa69eeac5c
commit cde107da6c
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@ -7513,7 +7513,7 @@ package android.bluetooth.le {
method public void onAdvertisingSetStarted(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 onAdvertisingSetStopped(android.bluetooth.le.AdvertisingSet);
method public void onPeriodicAdvertisingDataSet(android.bluetooth.le.AdvertisingSet, int); method public void onPeriodicAdvertisingDataSet(android.bluetooth.le.AdvertisingSet, int);
method public void onPeriodicAdvertisingEnable(android.bluetooth.le.AdvertisingSet, boolean, int); method public void onPeriodicAdvertisingEnabled(android.bluetooth.le.AdvertisingSet, boolean, int);
method public void onPeriodicAdvertisingParametersUpdated(android.bluetooth.le.AdvertisingSet, int); method public void onPeriodicAdvertisingParametersUpdated(android.bluetooth.le.AdvertisingSet, int);
method public void onScanResponseDataSet(android.bluetooth.le.AdvertisingSet, int); method public void onScanResponseDataSet(android.bluetooth.le.AdvertisingSet, int);
field public static final int ADVERTISE_FAILED_ALREADY_STARTED = 3; // 0x3 field public static final int ADVERTISE_FAILED_ALREADY_STARTED = 3; // 0x3

2
api/system-current.txt
View File

@ -7817,7 +7817,7 @@ package android.bluetooth.le {
method public void onAdvertisingSetStarted(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 onAdvertisingSetStopped(android.bluetooth.le.AdvertisingSet);
method public void onPeriodicAdvertisingDataSet(android.bluetooth.le.AdvertisingSet, int); method public void onPeriodicAdvertisingDataSet(android.bluetooth.le.AdvertisingSet, int);
method public void onPeriodicAdvertisingEnable(android.bluetooth.le.AdvertisingSet, boolean, int); method public void onPeriodicAdvertisingEnabled(android.bluetooth.le.AdvertisingSet, boolean, int);
method public void onPeriodicAdvertisingParametersUpdated(android.bluetooth.le.AdvertisingSet, int); method public void onPeriodicAdvertisingParametersUpdated(android.bluetooth.le.AdvertisingSet, int);
method public void onScanResponseDataSet(android.bluetooth.le.AdvertisingSet, int); method public void onScanResponseDataSet(android.bluetooth.le.AdvertisingSet, int);
field public static final int ADVERTISE_FAILED_ALREADY_STARTED = 3; // 0x3 field public static final int ADVERTISE_FAILED_ALREADY_STARTED = 3; // 0x3

2
api/test-current.txt
View File

@ -7522,7 +7522,7 @@ package android.bluetooth.le {
method public void onAdvertisingSetStarted(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 onAdvertisingSetStopped(android.bluetooth.le.AdvertisingSet);
method public void onPeriodicAdvertisingDataSet(android.bluetooth.le.AdvertisingSet, int); method public void onPeriodicAdvertisingDataSet(android.bluetooth.le.AdvertisingSet, int);
method public void onPeriodicAdvertisingEnable(android.bluetooth.le.AdvertisingSet, boolean, int); method public void onPeriodicAdvertisingEnabled(android.bluetooth.le.AdvertisingSet, boolean, int);
method public void onPeriodicAdvertisingParametersUpdated(android.bluetooth.le.AdvertisingSet, int); method public void onPeriodicAdvertisingParametersUpdated(android.bluetooth.le.AdvertisingSet, int);
method public void onScanResponseDataSet(android.bluetooth.le.AdvertisingSet, int); method public void onScanResponseDataSet(android.bluetooth.le.AdvertisingSet, int);
field public static final int ADVERTISE_FAILED_ALREADY_STARTED = 3; // 0x3 field public static final int ADVERTISE_FAILED_ALREADY_STARTED = 3; // 0x3

2
core/java/android/bluetooth/le/AdvertisingSetCallback.java
View File

@ -141,6 +141,6 @@ public abstract class AdvertisingSetCallback {
* @param advertisingSet The advertising set. * @param advertisingSet The advertising set.
* @param status Status of the operation. * @param status Status of the operation.
*/ */
public void onPeriodicAdvertisingEnable(AdvertisingSet advertisingSet, boolean enable, public void onPeriodicAdvertisingEnabled(AdvertisingSet advertisingSet, boolean enable,
int status) {} int status) {}
} }

4
core/java/android/bluetooth/le/BluetoothLeAdvertiser.java
View File

@ -504,12 +504,12 @@ public final class BluetoothLeAdvertiser {
} }
@Override @Override
public void onPeriodicAdvertisingEnable(int advertiserId, boolean enable, int status) { public void onPeriodicAdvertisingEnabled(int advertiserId, boolean enable, int status) {
handler.post(new Runnable() { handler.post(new Runnable() {
@Override @Override
public void run() { public void run() {
AdvertisingSet advertisingSet = mAdvertisingSets.get(advertiserId); AdvertisingSet advertisingSet = mAdvertisingSets.get(advertiserId);
callback.onPeriodicAdvertisingEnable(advertisingSet, enable, status); callback.onPeriodicAdvertisingEnabled(advertisingSet, enable, status);
} }
}); });
} }

2
core/java/android/bluetooth/le/IAdvertisingSetCallback.aidl
View File

@ -28,5 +28,5 @@ oneway interface IAdvertisingSetCallback {
void onAdvertisingParametersUpdated(in int advertiserId, in int tx_power, in int status); void onAdvertisingParametersUpdated(in int advertiserId, in int tx_power, in int status);
void onPeriodicAdvertisingParametersUpdated(in int advertiserId, in int status); void onPeriodicAdvertisingParametersUpdated(in int advertiserId, in int status);
void onPeriodicAdvertisingDataSet(in int advertiserId, in int status); void onPeriodicAdvertisingDataSet(in int advertiserId, in int status);
void onPeriodicAdvertisingEnable(in int advertiserId, in boolean enable, in int status); void onPeriodicAdvertisingEnabled(in int advertiserId, in boolean enable, in int status);
} }