diff options
| author | David Christie <dnchrist@google.com> | 2014-09-04 21:29:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-04 21:29:00 +0000 |
| commit | 4ec0cf048ad52027bd1773f436aa01268ce5c18b (patch) | |
| tree | 0ad2d347760cf7f24089e314d848ea34c7d878fb /wifi | |
| parent | ec7aa9d9d1c4c1ec8a09203197fcc1c71c55bdcc (diff) | |
| parent | 25fb15035b21833e882c736281b126c925827e45 (diff) | |
| download | frameworks_base-4ec0cf048ad52027bd1773f436aa01268ce5c18b.zip frameworks_base-4ec0cf048ad52027bd1773f436aa01268ce5c18b.tar.gz frameworks_base-4ec0cf048ad52027bd1773f436aa01268ce5c18b.tar.bz2 | |
am 1fc17b58: am d3a78eff: am 36b0eac4: 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
* commit '1fc17b58efa68b7128fd5b1cfa3355c353aaff4e':
Add @SystemApi annotations to methods used by GmsCore. -Currently these methods are called using reflection for location. Bug: 17371392 Change-Id: I6546f5b485415beff69164ba0d526757ee831f69
Diffstat (limited to 'wifi')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiManager.java | 3 |
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 5fc2397..6559287 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -1022,6 +1022,7 @@ public class WifiManager { } /** @hide */ + @SystemApi public boolean startScan(WorkSource workSource) { try { mService.startScan(null, workSource); @@ -1095,6 +1096,7 @@ public class WifiManager { * @return false if not supported. * @hide */ + @SystemApi public boolean isBatchedScanSupported() { try { return mService.isBatchedScanSupported(); @@ -1121,6 +1123,7 @@ public class WifiManager { * {@link BATCHED_SCAN_RESULTS_AVAILABLE_ACTION} is received. * @hide */ + @SystemApi public List<BatchedScanResult> getBatchedScanResults() { try { return mService.getBatchedScanResults(mContext.getOpPackageName()); |