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

Merge "Revert "WifiManager: Return status from startScan()"" into pi-dev

Browse Source
This commit is contained in:
Doris Ling
2018-04-26 23:26:09 +00:00
committed by Android (Google) Code Review
parent 3e6ceafbaa 4c36c2903d
commit ebcb2e006b
3 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wifi/java/android/net/wifi/IWifiManager.aidl
View File

@@ -85,7 +85,7 @@ interface IWifiManager
boolean disableNetwork(int netId, String packageName); boolean disableNetwork(int netId, String packageName);
boolean startScan(String packageName); void startScan(String packageName);
List<ScanResult> getScanResults(String callingPackage); List<ScanResult> getScanResults(String callingPackage);

3
wifi/java/android/net/wifi/WifiManager.java
View File

@@ -1635,7 +1635,8 @@ public class WifiManager {
public boolean startScan(WorkSource workSource) { public boolean startScan(WorkSource workSource) {
try { try {
String packageName = mContext.getOpPackageName(); String packageName = mContext.getOpPackageName();
return mService.startScan(packageName); mService.startScan(packageName);
return true;
} catch (RemoteException e) { } catch (RemoteException e) {
throw e.rethrowFromSystemServer(); throw e.rethrowFromSystemServer();
} }

12
wifi/tests/src/android/net/wifi/WifiManagerTest.java
View File

@@ -1070,16 +1070,4 @@ i * Verify that a call to cancel WPS immediately returns a failure.
fail("setWifiApConfiguration should rethrow Exceptions from WifiService"); fail("setWifiApConfiguration should rethrow Exceptions from WifiService");
} catch (SecurityException e) { } } catch (SecurityException e) { }
} }
/**
* Check the call to startScan calls WifiService.
*/
@Test
public void testStartScan() throws Exception {
when(mWifiService.startScan(TEST_PACKAGE_NAME)).thenReturn(true);
assertTrue(mWifiManager.startScan());
when(mWifiService.startScan(TEST_PACKAGE_NAME)).thenReturn(false);
assertFalse(mWifiManager.startScan());
}
} }