From 4c36c2903d85a829efcc0ecaf2a67d0d05fcb967 Mon Sep 17 00:00:00 2001 From: Doris Ling Date: Thu, 26 Apr 2018 22:28:27 +0000 Subject: [PATCH] Revert "WifiManager: Return status from startScan()" This reverts commit b81c3d5f9a86e4e1f90be2ffaa81ea5df8fce684. Bug: 77297012 Change-Id: Ie8727343650b549d4f438643d50a10fe50ab52b1 Reason: this change is breaking the build --- wifi/java/android/net/wifi/IWifiManager.aidl | 2 +- wifi/java/android/net/wifi/WifiManager.java | 3 ++- wifi/tests/src/android/net/wifi/WifiManagerTest.java | 12 ------------ 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/wifi/java/android/net/wifi/IWifiManager.aidl b/wifi/java/android/net/wifi/IWifiManager.aidl index a7fffca8e4ef1..b3331264aa176 100644 --- a/wifi/java/android/net/wifi/IWifiManager.aidl +++ b/wifi/java/android/net/wifi/IWifiManager.aidl @@ -85,7 +85,7 @@ interface IWifiManager boolean disableNetwork(int netId, String packageName); - boolean startScan(String packageName); + void startScan(String packageName); List getScanResults(String callingPackage); diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index a19965d24c3e9..9c6c8a90369d3 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -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(); } diff --git a/wifi/tests/src/android/net/wifi/WifiManagerTest.java b/wifi/tests/src/android/net/wifi/WifiManagerTest.java index 20e49cd9e6a2e..f3ffcadf25463 100644 --- a/wifi/tests/src/android/net/wifi/WifiManagerTest.java +++ b/wifi/tests/src/android/net/wifi/WifiManagerTest.java @@ -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()); - } }