Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05381094 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by android-build-merger
Browse files

Merge "Bluetooth 5 Enable->Enabled (1/2)" am: fa69eeac5c am: 009599c9 

am: 88e9c86822

Change-Id: I10b47fa5566c05ddeef5e13ee9d1593c648a0b48
parents 33c3a4f7 009599c9

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

+1 −1
Original line number Diff line number Diff line
@@ -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

framework/java/android/bluetooth/le/BluetoothLeAdvertiser.java

+2 −2
Original line number Diff line number Diff line
@@ -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);

                    }

                });

            }

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

+1 −1
Original line number Diff line number Diff line
@@ -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);

}