From 5882f5455f6a9e7e4d6b5f7d9f2ae650de0f2b5c Mon Sep 17 00:00:00 2001 From: Prerepa Viswanadham Date: Wed, 22 Apr 2015 11:11:43 -0700 Subject: [PATCH] Make onlost/onfound APIs public Change-Id: I455124478d953d652f216f71d5813782fc9633ab --- api/current.txt | 9 +++++++++ api/system-current.txt | 7 +++++++ core/java/android/bluetooth/le/ScanCallback.java | 6 ++++-- core/java/android/bluetooth/le/ScanSettings.java | 11 ----------- 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/api/current.txt b/api/current.txt index 2b6f50c14c9d1..698f36d627bf0 100644 --- a/api/current.txt +++ b/api/current.txt @@ -6685,7 +6685,14 @@ package android.bluetooth.le { method public int getScanResultType(); method public void writeToParcel(android.os.Parcel, int); field public static final int CALLBACK_TYPE_ALL_MATCHES = 1; // 0x1 + field public static final int CALLBACK_TYPE_FIRST_MATCH = 2; // 0x2 + field public static final int CALLBACK_TYPE_MATCH_LOST = 4; // 0x4 field public static final android.os.Parcelable.Creator CREATOR; + field public static final int MATCH_MODE_AGGRESSIVE = 1; // 0x1 + field public static final int MATCH_MODE_STICKY = 2; // 0x2 + field public static final int MATCH_NUM_FEW_ADVERTISEMENT = 2; // 0x2 + field public static final int MATCH_NUM_MAX_ADVERTISEMENT = 3; // 0x3 + field public static final int MATCH_NUM_ONE_ADVERTISEMENT = 1; // 0x1 field public static final int SCAN_MODE_BALANCED = 1; // 0x1 field public static final int SCAN_MODE_LOW_LATENCY = 2; // 0x2 field public static final int SCAN_MODE_LOW_POWER = 0; // 0x0 @@ -6695,6 +6702,8 @@ package android.bluetooth.le { public static final class ScanSettings.Builder { ctor public ScanSettings.Builder(); method public android.bluetooth.le.ScanSettings build(); + method public android.bluetooth.le.ScanSettings.Builder setMatchMode(int); + method public android.bluetooth.le.ScanSettings.Builder setNumOfMatches(int); method public android.bluetooth.le.ScanSettings.Builder setReportDelay(long); method public android.bluetooth.le.ScanSettings.Builder setScanMode(int); } diff --git a/api/system-current.txt b/api/system-current.txt index 2cb4609b51df6..a23199dce6073 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -6915,6 +6915,11 @@ package android.bluetooth.le { field public static final int CALLBACK_TYPE_FIRST_MATCH = 2; // 0x2 field public static final int CALLBACK_TYPE_MATCH_LOST = 4; // 0x4 field public static final android.os.Parcelable.Creator CREATOR; + field public static final int MATCH_MODE_AGGRESSIVE = 1; // 0x1 + field public static final int MATCH_MODE_STICKY = 2; // 0x2 + field public static final int MATCH_NUM_FEW_ADVERTISEMENT = 2; // 0x2 + field public static final int MATCH_NUM_MAX_ADVERTISEMENT = 3; // 0x3 + field public static final int MATCH_NUM_ONE_ADVERTISEMENT = 1; // 0x1 field public static final int SCAN_MODE_BALANCED = 1; // 0x1 field public static final int SCAN_MODE_LOW_LATENCY = 2; // 0x2 field public static final int SCAN_MODE_LOW_POWER = 0; // 0x0 @@ -6927,6 +6932,8 @@ package android.bluetooth.le { ctor public ScanSettings.Builder(); method public android.bluetooth.le.ScanSettings build(); method public android.bluetooth.le.ScanSettings.Builder setCallbackType(int); + method public android.bluetooth.le.ScanSettings.Builder setMatchMode(int); + method public android.bluetooth.le.ScanSettings.Builder setNumOfMatches(int); method public android.bluetooth.le.ScanSettings.Builder setReportDelay(long); method public android.bluetooth.le.ScanSettings.Builder setScanMode(int); method public android.bluetooth.le.ScanSettings.Builder setScanResultType(int); diff --git a/core/java/android/bluetooth/le/ScanCallback.java b/core/java/android/bluetooth/le/ScanCallback.java index 27b96bd6e43ea..61b2e787c86c0 100644 --- a/core/java/android/bluetooth/le/ScanCallback.java +++ b/core/java/android/bluetooth/le/ScanCallback.java @@ -53,8 +53,10 @@ public abstract class ScanCallback { /** * Callback when a BLE advertisement has been found. * - * @param callbackType Determines how this callback was triggered. Could be of - * {@link ScanSettings#CALLBACK_TYPE_ALL_MATCHES} + * @param callbackType Determines how this callback was triggered. Could be one of + * {@link ScanSettings#CALLBACK_TYPE_ALL_MATCHES}, + * {@link ScanSettings#CALLBACK_TYPE_FIRST_MATCH} or + * {@link ScanSettings#CALLBACK_TYPE_MATCH_LOST} * @param result A Bluetooth LE scan result. */ public void onScanResult(int callbackType, ScanResult result) { diff --git a/core/java/android/bluetooth/le/ScanSettings.java b/core/java/android/bluetooth/le/ScanSettings.java index f103cae5c252a..31d7963cd01d5 100644 --- a/core/java/android/bluetooth/le/ScanSettings.java +++ b/core/java/android/bluetooth/le/ScanSettings.java @@ -59,17 +59,13 @@ public final class ScanSettings implements Parcelable { /** * A result callback is only triggered for the first advertisement packet received that matches * the filter criteria. - * @hide */ - @SystemApi public static final int CALLBACK_TYPE_FIRST_MATCH = 2; /** * Receive a callback when advertisements are no longer received from a device that has been * previously reported by a first match callback. - * @hide */ - @SystemApi public static final int CALLBACK_TYPE_MATCH_LOST = 4; @@ -78,21 +74,18 @@ public final class ScanSettings implements Parcelable { */ /** * Match one advertisement per filter - * @hide */ public static final int MATCH_NUM_ONE_ADVERTISEMENT = 1; /** * Match few advertisement per filter, depends on current capability and availibility of * the resources in hw - * @hide */ public static final int MATCH_NUM_FEW_ADVERTISEMENT = 2; /** * Match as many advertisement per filter as hw could allow, depends on current * capability and availibility of the resources in hw - * @hide */ public static final int MATCH_NUM_MAX_ADVERTISEMENT = 3; @@ -100,14 +93,12 @@ public final class ScanSettings implements Parcelable { /** * In Aggressive mode, hw will determine a match sooner even with feeble signal strength * and few number of sightings/match in a duration. - * @hide */ public static final int MATCH_MODE_AGGRESSIVE = 1; /** * For sticky mode, higher threshold of signal strength and sightings is required * before reporting by hw - * @hide */ public static final int MATCH_MODE_STICKY = 2; @@ -324,7 +315,6 @@ public final class ScanSettings implements Parcelable { * {@link ScanSettings#MATCH_NUM_FEW_ADVERTISEMENT} or * {@link ScanSettings#MATCH_NUM_MAX_ADVERTISEMENT} * @throws IllegalArgumentException If the {@code matchMode} is invalid. - * @hide */ public Builder setNumOfMatches(int numOfMatches) { if (numOfMatches < MATCH_NUM_ONE_ADVERTISEMENT @@ -342,7 +332,6 @@ public final class ScanSettings implements Parcelable { * {@link ScanSettings#MATCH_MODE_AGGRESSIVE} or * {@link ScanSettings#MATCH_MODE_STICKY} * @throws IllegalArgumentException If the {@code matchMode} is invalid. - * @hide */ public Builder setMatchMode(int matchMode) { if (matchMode < MATCH_MODE_AGGRESSIVE