am 45261633: Merge "Indicate failed scans with EXTRA_RESULTS_UPDATED" into mnc-dev

* commit '4526163398e49713065d05be010d3233a281b05f':
  Indicate failed scans with EXTRA_RESULTS_UPDATED
This commit is contained in:
Vinit Deshpande
2015-05-22 15:19:34 +00:00
committed by Android Git Automerger
3 changed files with 10 additions and 0 deletions

View File

@@ -19259,6 +19259,7 @@ package android.net.wifi {
field public static final java.lang.String EXTRA_NEW_RSSI = "newRssi";
field public static final java.lang.String EXTRA_NEW_STATE = "newState";
field public static final java.lang.String EXTRA_PREVIOUS_WIFI_STATE = "previous_wifi_state";
field public static final java.lang.String EXTRA_RESULTS_UPDATED = "resultsUpdated";
field public static final java.lang.String EXTRA_SUPPLICANT_CONNECTED = "connected";
field public static final java.lang.String EXTRA_SUPPLICANT_ERROR = "supplicantError";
field public static final java.lang.String EXTRA_WIFI_INFO = "wifiInfo";

View File

@@ -21020,6 +21020,7 @@ package android.net.wifi {
field public static final java.lang.String EXTRA_NEW_RSSI = "newRssi";
field public static final java.lang.String EXTRA_NEW_STATE = "newState";
field public static final java.lang.String EXTRA_PREVIOUS_WIFI_STATE = "previous_wifi_state";
field public static final java.lang.String EXTRA_RESULTS_UPDATED = "resultsUpdated";
field public static final java.lang.String EXTRA_SUPPLICANT_CONNECTED = "connected";
field public static final java.lang.String EXTRA_SUPPLICANT_ERROR = "supplicantError";
field public static final java.lang.String EXTRA_WIFI_CONFIGURATION = "wifiConfiguration";

View File

@@ -403,6 +403,14 @@ public class WifiManager {
*/
@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String SCAN_RESULTS_AVAILABLE_ACTION = "android.net.wifi.SCAN_RESULTS";
/**
* The result of previous scan, reported with {@link #SCAN_RESULTS_AVAILABLE_ACTION}.
* @return true scan was successful, results updated
* @return false scan was not successful, results haven't been updated since previous scan
*/
public static final String EXTRA_RESULTS_UPDATED = "resultsUpdated";
/**
* A batch of access point scans has been completed and the results areavailable.
* Call {@link #getBatchedScanResults()} to obtain the results.