From 7998be9e44f7797a96fb0a2568b95581ebccc1d0 Mon Sep 17 00:00:00 2001 From: Jakub Pawlowski Date: Wed, 22 Mar 2017 15:40:21 -0700 Subject: [PATCH] Bluetooth 5 Enable->Enabled (1/2) Test: manual Bug: 30622771 Change-Id: I37b198927076a0267de67e1bd94eaea9e88e53bb --- api/current.txt | 2 +- api/system-current.txt | 2 +- api/test-current.txt | 2 +- core/java/android/bluetooth/le/AdvertisingSetCallback.java | 2 +- core/java/android/bluetooth/le/BluetoothLeAdvertiser.java | 4 ++-- core/java/android/bluetooth/le/IAdvertisingSetCallback.aidl | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/api/current.txt b/api/current.txt index fb2a2cfef1a67..01a27f9d939fb 100644 --- a/api/current.txt +++ b/api/current.txt @@ -7513,7 +7513,7 @@ package android.bluetooth.le { 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); + method public void onPeriodicAdvertisingEnabled(android.bluetooth.le.AdvertisingSet, boolean, int); method public void onPeriodicAdvertisingParametersUpdated(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 diff --git a/api/system-current.txt b/api/system-current.txt index 45c78e4dc0685..896baa3508b3d 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -7817,7 +7817,7 @@ package android.bluetooth.le { 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); + method public void onPeriodicAdvertisingEnabled(android.bluetooth.le.AdvertisingSet, boolean, int); method public void onPeriodicAdvertisingParametersUpdated(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 diff --git a/api/test-current.txt b/api/test-current.txt index 4688fd6376492..3a7e366a88758 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -7522,7 +7522,7 @@ package android.bluetooth.le { 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); + method public void onPeriodicAdvertisingEnabled(android.bluetooth.le.AdvertisingSet, boolean, int); method public void onPeriodicAdvertisingParametersUpdated(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 diff --git a/core/java/android/bluetooth/le/AdvertisingSetCallback.java b/core/java/android/bluetooth/le/AdvertisingSetCallback.java index 8d2b82ab350c1..fe3b1cdd63a05 100644 --- a/core/java/android/bluetooth/le/AdvertisingSetCallback.java +++ b/core/java/android/bluetooth/le/AdvertisingSetCallback.java @@ -141,6 +141,6 @@ public abstract class AdvertisingSetCallback { * @param advertisingSet The advertising set. * @param status Status of the operation. */ - public void onPeriodicAdvertisingEnable(AdvertisingSet advertisingSet, boolean enable, + public void onPeriodicAdvertisingEnabled(AdvertisingSet advertisingSet, boolean enable, int status) {} } \ No newline at end of file diff --git a/core/java/android/bluetooth/le/BluetoothLeAdvertiser.java b/core/java/android/bluetooth/le/BluetoothLeAdvertiser.java index ae012d9391e3e..242ee77ce0e9e 100644 --- a/core/java/android/bluetooth/le/BluetoothLeAdvertiser.java +++ b/core/java/android/bluetooth/le/BluetoothLeAdvertiser.java @@ -504,12 +504,12 @@ public final class BluetoothLeAdvertiser { } @Override - public void onPeriodicAdvertisingEnable(int advertiserId, boolean enable, int status) { + public void onPeriodicAdvertisingEnabled(int advertiserId, boolean enable, int status) { handler.post(new Runnable() { @Override public void run() { AdvertisingSet advertisingSet = mAdvertisingSets.get(advertiserId); - callback.onPeriodicAdvertisingEnable(advertisingSet, enable, status); + callback.onPeriodicAdvertisingEnabled(advertisingSet, enable, status); } }); } diff --git a/core/java/android/bluetooth/le/IAdvertisingSetCallback.aidl b/core/java/android/bluetooth/le/IAdvertisingSetCallback.aidl index e6a09f1d71d6e..2c9f4baad520f 100644 --- a/core/java/android/bluetooth/le/IAdvertisingSetCallback.aidl +++ b/core/java/android/bluetooth/le/IAdvertisingSetCallback.aidl @@ -28,5 +28,5 @@ oneway interface IAdvertisingSetCallback { void onAdvertisingParametersUpdated(in int advertiserId, in int tx_power, in int status); void onPeriodicAdvertisingParametersUpdated(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); }