Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb27c77b authored by Doris Ling's avatar Doris Ling Committed by android-build-merger
Browse files

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

am: ebcb2e00

Change-Id: I328b6e331052a8b2b0717663c65599ed3cee04bc
parents f0c09d6e ebcb2e00

wifi/java/android/net/wifi/IWifiManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ interface IWifiManager 


    boolean disableNetwork(int netId, String packageName);



    boolean startScan(String packageName);

    void startScan(String packageName);



    List<ScanResult> getScanResults(String callingPackage);

wifi/java/android/net/wifi/WifiManager.java

+2 −1
Original line number Diff line number Diff line
@@ -1635,7 +1635,8 @@ public class WifiManager { 
    public boolean startScan(WorkSource workSource) {

        try {

            String packageName = mContext.getOpPackageName();

            return mService.startScan(packageName);

            mService.startScan(packageName);

            return true;

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

wifi/tests/src/android/net/wifi/WifiManagerTest.java

+0 −12
Original line number Diff line number Diff line
@@ -1070,16 +1070,4 @@ i * Verify that a call to cancel WPS immediately returns a failure. 
            fail("setWifiApConfiguration should rethrow Exceptions from WifiService");

        } 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());

    }

}