summaryrefslogtreecommitdiffstats
path: root/wifi/java/android/net/wifi/WifiManager.java
diff options
context:
space:
mode:
authorDavid Christie <dnchrist@google.com>2014-09-04 20:53:38 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-09-04 20:53:39 +0000
commite7baf5afc07127854e5791d93f05e6b46633bc47 (patch)
treedccc1979337473bb6be4747adec6ac1a1b8013fe /wifi/java/android/net/wifi/WifiManager.java
parenta4b9a191a85507b077f59b6ac5ce210caa0a84a3 (diff)
parentc20b795cf05b48fe5e024c19dab9c7e4b18cd10f (diff)
downloadframeworks_base-e7baf5afc07127854e5791d93f05e6b46633bc47.zip
frameworks_base-e7baf5afc07127854e5791d93f05e6b46633bc47.tar.gz
frameworks_base-e7baf5afc07127854e5791d93f05e6b46633bc47.tar.bz2
Merge "Add @SystemApi annotations to methods used by GmsCore. -Currently these methods are called using reflection for location. Bug: 17371392 Change-Id: I6546f5b485415beff69164ba0d526757ee831f69" into lmp-dev
Diffstat (limited to 'wifi/java/android/net/wifi/WifiManager.java')
-rw-r--r--wifi/java/android/net/wifi/WifiManager.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java
index 74f2f65..1393bce 100644
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -1000,6 +1000,7 @@ public class WifiManager {
}
/** @hide */
+ @SystemApi
public boolean startScan(WorkSource workSource) {
try {
mService.startScan(null, workSource);
@@ -1073,6 +1074,7 @@ public class WifiManager {
* @return false if not supported.
* @hide
*/
+ @SystemApi
public boolean isBatchedScanSupported() {
try {
return mService.isBatchedScanSupported();
@@ -1099,6 +1101,7 @@ public class WifiManager {
* {@link BATCHED_SCAN_RESULTS_AVAILABLE_ACTION} is received.
* @hide
*/
+ @SystemApi
public List<BatchedScanResult> getBatchedScanResults() {
try {
return mService.getBatchedScanResults(mContext.getOpPackageName());