From fec6ef8e908b52c04e489a39d4b75d58a212ad08 Mon Sep 17 00:00:00 2001 From: Jakub Pawlowski Date: Tue, 9 May 2017 14:28:21 -0700 Subject: [PATCH] Bluetooth: Fix interval low/min values Bug: 38175945 Test: none Change-Id: Idf487c7aafc518f2c57be78a1fa979b2c4a383d6 (cherry picked from commit 6b1f39502c7d5f71b42d82ac6d511ee0afd1191e) --- api/current.txt | 4 ++-- api/system-current.txt | 4 ++-- api/test-current.txt | 4 ++-- core/java/android/bluetooth/le/AdvertisingSetParameters.java | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/api/current.txt b/api/current.txt index 899381bec02dd..82b6ae978722f 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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 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 diff --git a/api/system-current.txt b/api/system-current.txt index 8aa6c362480db..fcc647d9e92c5 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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 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 diff --git a/api/test-current.txt b/api/test-current.txt index 944a35078e517..1ff9efe4dc521 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -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 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 diff --git a/core/java/android/bluetooth/le/AdvertisingSetParameters.java b/core/java/android/bluetooth/le/AdvertisingSetParameters.java index 71c4484a94748..e9747d8205bf8 100644 --- a/core/java/android/bluetooth/le/AdvertisingSetParameters.java +++ b/core/java/android/bluetooth/le/AdvertisingSetParameters.java @@ -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.