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

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

Merge "Bluetooth: bluetooth.le API fixes" am: cf959732 am: 6af9bde8 

am: 62fc08f6

Change-Id: I98bf6fc7d8d58f102b1268cb3e6d27fb6fd86b78
parents ffe7134d 62fc08f6

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -8025,7 +8025,7 @@ package android.bluetooth.le { 
    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 setPeriodicAdvertisingEnabled(boolean);

    method public void setPeriodicAdvertisingParameters(android.bluetooth.le.PeriodicAdvertisingParameters);

    method public void setScanResponseData(android.bluetooth.le.AdvertiseData);

  }

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -8503,7 +8503,7 @@ package android.bluetooth.le { 
    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 setPeriodicAdvertisingEnabled(boolean);

    method public void setPeriodicAdvertisingParameters(android.bluetooth.le.PeriodicAdvertisingParameters);

    method public void setScanResponseData(android.bluetooth.le.AdvertiseData);

  }

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -8056,7 +8056,7 @@ package android.bluetooth.le { 
    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 setPeriodicAdvertisingEnabled(boolean);

    method public void setPeriodicAdvertisingParameters(android.bluetooth.le.PeriodicAdvertisingParameters);

    method public void setScanResponseData(android.bluetooth.le.AdvertiseData);

  }

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

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ public final class AdvertisingSet { 
     *

     * @param enable whether the periodic advertising should be enabled (true), or disabled (false).

     */

    public void setPeriodicAdvertisingEnable(boolean enable) {

    public void setPeriodicAdvertisingEnabled(boolean enable) {

        try {

            gatt.setPeriodicAdvertisingEnable(this.advertiserId, enable);

        } catch (RemoteException e) {

core/java/android/bluetooth/le/AdvertisingSetCallback.java

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ public abstract class AdvertisingSetCallback { 
                                             int status) {}



    /**

     * Callback triggered in response to {@link AdvertisingSet#setPeriodicAdvertisingEnable}

     * Callback triggered in response to {@link AdvertisingSet#setPeriodicAdvertisingEnabled}

     * indicating result of the operation.

     *

     * @param advertisingSet The advertising set.