Merge commit 'eba66c3' into master_merge

1 files changed, 0 insertions, 11 deletions

diff --git a/framework/java/android/bluetooth/le/ScanSettings.java b/framework/java/android/bluetooth/le/ScanSettings.java
index dad486dd94..4eeb577a1d 100644
--- a/framework/java/android/bluetooth/le/ScanSettings.java
+++ b/framework/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