commit 986a97e20a3c7a54ffba8aac1bda858bbb4388ee
author Wei Wang <weiwa@google.com> Thu Mar 19 05:02:09 2015 +0000
committer Android Partner Code Review <android-gerrit-partner@google.com> Thu Mar 19 05:02:09 2015 +0000
tree 5c63ceb5d834fcfdcf798c61e362b024c93b8feb
parent 14186247144300f888f7b9ece22e79fb8948204e
parent e1d0f58aa85531e261f10ff132018a0e8fac8370

Merge "Make Opportunistic Scan API public." into m-wireless-dev

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 87ed7a9..f9ea1a7 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -6662,6 +6662,7 @@
     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
+    field public static final int SCAN_MODE_OPPORTUNISTIC = -1; // 0xffffffff
   }
 
   public static final class ScanSettings.Builder {

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 34fb8ca..a1b53c1 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -6889,6 +6889,7 @@
     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
+    field public static final int SCAN_MODE_OPPORTUNISTIC = -1; // 0xffffffff
     field public static final int SCAN_RESULT_TYPE_ABBREVIATED = 1; // 0x1
     field public static final int SCAN_RESULT_TYPE_FULL = 0; // 0x0
   }

core/java/android/bluetooth/le/ScanSettings.java

diff --git a/core/java/android/bluetooth/le/ScanSettings.java b/core/java/android/bluetooth/le/ScanSettings.java
index 5bdfdb5..0106686 100644
--- a/core/java/android/bluetooth/le/ScanSettings.java
+++ b/core/java/android/bluetooth/le/ScanSettings.java
@@ -29,8 +29,6 @@
     /**
      * A special Bluetooth LE scan mode. Applications using this scan mode will passively listen for
      * other scan results without starting BLE scans themselves.
-     *
-     * @hide
      */
     public static final int SCAN_MODE_OPPORTUNISTIC = -1;