Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Bluetooth: Fix interval low/min values" am: 66deee2bd4 am: 0771cb13a2

Browse Source 
am: 1655862b93

Change-Id: I32d56c5d0fca7947ac754eda100b36f2ee94ffe7
This commit is contained in:
Andre Eisenbach
2017-05-10 00:15:32 +00:00
committed by android-build-merger
parent 925145ca8f 1655862b93
commit 4246cc309d
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -8040,8 +8040,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

4
api/system-current.txt
View File

@@ -8519,8 +8519,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

4
api/test-current.txt
View File

@@ -8071,8 +8071,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

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

@@ -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.