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

Commit 617b0ef8 authored by Andre Eisenbach's avatar Andre Eisenbach Committed by android-build-merger
Browse files

Merge "Bluetooth: Fix interval low/min values" am: 66deee2b am: 0771cb13 am: 1655862b 

am: 4246cc30

Change-Id: I55e757aed4cf9c8a2c9b6414804774af51188d65
parents 19e05c10 4246cc30

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -8059,8 +8059,8 @@ package android.bluetooth.le { 
    method public boolean isScannable();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.bluetooth.le.AdvertisingSetParameters> CREATOR;

    field public static final int INTERVAL_HIGH = 160; // 0xa0

    field public static final int INTERVAL_LOW = 1600; // 0x640

    field public static final int INTERVAL_HIGH = 1600; // 0x640

    field public static final int INTERVAL_LOW = 160; // 0xa0

    field public static final int INTERVAL_MAX = 16777215; // 0xffffff

    field public static final int INTERVAL_MEDIUM = 400; // 0x190

    field public static final int INTERVAL_MIN = 160; // 0xa0

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -8539,8 +8539,8 @@ package android.bluetooth.le { 
    method public boolean isScannable();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.bluetooth.le.AdvertisingSetParameters> CREATOR;

    field public static final int INTERVAL_HIGH = 160; // 0xa0

    field public static final int INTERVAL_LOW = 1600; // 0x640

    field public static final int INTERVAL_HIGH = 1600; // 0x640

    field public static final int INTERVAL_LOW = 160; // 0xa0

    field public static final int INTERVAL_MAX = 16777215; // 0xffffff

    field public static final int INTERVAL_MEDIUM = 400; // 0x190

    field public static final int INTERVAL_MIN = 160; // 0xa0

api/test-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -8090,8 +8090,8 @@ package android.bluetooth.le { 
    method public boolean isScannable();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.bluetooth.le.AdvertisingSetParameters> CREATOR;

    field public static final int INTERVAL_HIGH = 160; // 0xa0

    field public static final int INTERVAL_LOW = 1600; // 0x640

    field public static final int INTERVAL_HIGH = 1600; // 0x640

    field public static final int INTERVAL_LOW = 160; // 0xa0

    field public static final int INTERVAL_MAX = 16777215; // 0xffffff

    field public static final int INTERVAL_MEDIUM = 400; // 0x190

    field public static final int INTERVAL_MIN = 160; // 0xa0

core/java/android/bluetooth/le/AdvertisingSetParameters.java

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ public final class AdvertisingSetParameters implements Parcelable { 
    * Advertise on low frequency, around every 1000ms. This is the default and

    * preferred advertising mode as it consumes the least power.

    */

    public static final int INTERVAL_LOW = 1600;

    public static final int INTERVAL_HIGH = 1600;



    /**

     * Advertise on medium frequency, around every 250ms. This is balanced
@@ -47,7 +47,7 @@ public final class AdvertisingSetParameters implements Parcelable { 
     * has the highest power consumption and should not be used for continuous

     * background advertising.

     */

    public static final int INTERVAL_HIGH = 160;

    public static final int INTERVAL_LOW = 160;



    /**

     * Minimum value for advertising interval.