diff options
author | Rebecca Silberstein <silberst@google.com> | 2017-06-08 00:12:44 -0700 |
---|---|---|
committer | Rebecca Silberstein <silberst@google.com> | 2017-06-08 00:17:08 -0700 |
commit | a6e534fc17203d535ec786b25aad9ff65afdbbea (patch) | |
tree | f5a75eb435e98b0d196620dc9c8f75675491b8b0 /tests | |
parent | 875a7dcc0db5b82c49a02741e779395388cf44c6 (diff) |
WifiServiceImpl: check app status for startLOHS
When apps register a request for LOHS, they should be the foreground app
at the time of the request. If the requesting app is not the foreground
app, the ERROR_INCOMPATIBLE_MODE error will be returned.
Bug: 62356000
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Test: softap integration tests locally
Test: in progress LOHS integration tests locally
Test: cts-tradefed run cts-dev --module CtsNetTestCases -t
android.net.wifi.cts.WifiManagerTest
Change-Id: Ic51bbc28478f90983555943a45f4fd70f4b2b385
Diffstat (limited to 'tests')
-rw-r--r-- | tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java | 40 |
1 files changed, 38 insertions, 2 deletions
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java b/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java index 562143335..e45bee549 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java @@ -74,6 +74,7 @@ import android.os.Message; import android.os.Messenger; import android.os.PowerManager; import android.os.Process; +import android.os.RemoteException; import android.os.UserManager; import android.os.WorkSource; import android.os.test.TestLooper; @@ -760,6 +761,9 @@ public class WifiServiceImplTest { // allow test to proceed without a permission check failure when(mSettingsStore.getLocationModeSetting(mContext)) .thenReturn(LOCATION_MODE_HIGH_ACCURACY); + try { + when(mFrameworkFacade.isAppForeground(anyInt())).thenReturn(true); + } catch (RemoteException e) { } when(mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_TETHERING)) .thenReturn(false); int result = mWifiServiceImpl.startLocalOnlyHotspot(mAppMessenger, mAppBinder, @@ -812,12 +816,43 @@ public class WifiServiceImplTest { } /** + * Only start LocalOnlyHotspot if the caller is the foreground app at the time of the request. + */ + @Test + public void testStartLocalOnlyHotspotFailsIfRequestorNotForegroundApp() throws Exception { + when(mSettingsStore.getLocationModeSetting(mContext)) + .thenReturn(LOCATION_MODE_HIGH_ACCURACY); + + when(mFrameworkFacade.isAppForeground(anyInt())).thenReturn(false); + int result = mWifiServiceImpl.startLocalOnlyHotspot(mAppMessenger, mAppBinder, + TEST_PACKAGE_NAME); + assertEquals(LocalOnlyHotspotCallback.ERROR_INCOMPATIBLE_MODE, result); + } + + /** + * Do not register the LocalOnlyHotspot request if the caller app cannot be verified as the + * foreground app at the time of the request (ie, throws an exception in the check). + */ + @Test + public void testStartLocalOnlyHotspotFailsIfForegroundAppCheckThrowsRemoteException() + throws Exception { + when(mSettingsStore.getLocationModeSetting(mContext)) + .thenReturn(LOCATION_MODE_HIGH_ACCURACY); + + when(mFrameworkFacade.isAppForeground(anyInt())).thenThrow(new RemoteException()); + int result = mWifiServiceImpl.startLocalOnlyHotspot(mAppMessenger, mAppBinder, + TEST_PACKAGE_NAME); + assertEquals(LocalOnlyHotspotCallback.ERROR_INCOMPATIBLE_MODE, result); + } + + /** * Only start LocalOnlyHotspot if we are not tethering. */ @Test - public void testHotspotDoesNotStartWhenAlreadyTethering() { + public void testHotspotDoesNotStartWhenAlreadyTethering() throws Exception { when(mSettingsStore.getLocationModeSetting(mContext)) .thenReturn(LOCATION_MODE_HIGH_ACCURACY); + when(mFrameworkFacade.isAppForeground(anyInt())).thenReturn(true); mWifiServiceImpl.updateInterfaceIpState(WIFI_IFACE_NAME, IFACE_IP_MODE_TETHERED); mLooper.dispatchAll(); int returnCode = mWifiServiceImpl.startLocalOnlyHotspot( @@ -829,9 +864,10 @@ public class WifiServiceImplTest { * Only start LocalOnlyHotspot if admin setting does not disallow tethering. */ @Test - public void testHotspotDoesNotStartWhenTetheringDisallowed() { + public void testHotspotDoesNotStartWhenTetheringDisallowed() throws Exception { when(mSettingsStore.getLocationModeSetting(mContext)) .thenReturn(LOCATION_MODE_HIGH_ACCURACY); + when(mFrameworkFacade.isAppForeground(anyInt())).thenReturn(true); when(mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_TETHERING)) .thenReturn(true); int returnCode = mWifiServiceImpl.startLocalOnlyHotspot( |