Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "WifiScanner: Remove pnosetting stopPno API (1/2)" into nyc-dev

Browse Source 
am: 5a4027e

* commit '5a4027e26ca07b921824757433bfd62481a6a78c':
  WifiScanner: Remove pnosetting stopPno API (1/2)

Change-Id: Ia4038fc1f06a16f78a328ff6709f48886242eb77
This commit is contained in:
Roshan Pius
2016-04-07 19:36:27 +00:00
committed by android-build-merger
parent d1acd13cb0 5a4027e26c
commit ad1e692c65
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wifi/java/android/net/wifi/WifiScanner.java
View File

@@ -810,19 +810,17 @@ public class WifiScanner {
} }
/** /**
* Stop an ongoing wifi PNO scan * Stop an ongoing wifi PNO scan
* @param pnoSettings specifies various parameters for PNO; for more information look at
* {@link PnoSettings}
* @param listener specifies which scan to cancel; must be same object as passed in {@link * @param listener specifies which scan to cancel; must be same object as passed in {@link
* #startPnoScan} * #startPnoScan}
* TODO(rpius): Check if we can remove pnoSettings param in stop. * TODO(rpius): Check if we can remove pnoSettings param in stop.
* {@hide} * {@hide}
*/ */
public void stopPnoScan(PnoSettings pnoSettings, ScanListener listener) { public void stopPnoScan(ScanListener listener) {
Preconditions.checkNotNull(listener, "listener cannot be null"); Preconditions.checkNotNull(listener, "listener cannot be null");
int key = removeListener(listener); int key = removeListener(listener);
if (key == INVALID_KEY) return; if (key == INVALID_KEY) return;
validateChannel(); validateChannel();
sAsyncChannel.sendMessage(CMD_STOP_PNO_SCAN, 0, key, pnoSettings); sAsyncChannel.sendMessage(CMD_STOP_PNO_SCAN, 0, key);
} }
/** specifies information about an access point of interest */ /** specifies information about an access point of interest */