diff options
| author | Roshan Pius <rpius@google.com> | 2019-10-10 11:03:04 -0700 |
|---|---|---|
| committer | Roshan Pius <rpius@google.com> | 2019-11-04 09:48:58 -0800 |
| commit | 60b37aedb5caed51700dcdd77b1d10375ee446a8 (patch) | |
| tree | 99b1dcebcaeb6e08ead104b073be513ca746e6df /tests | |
| parent | 3d7b1f6739cb302c5f116b52df1a294d20402f49 (diff) | |
Wifistack: Request signature permissions
Changes in the CL:
a) Revert "Wifistack: Request INTERACT_ACROSS_USERS permission"
This reverts commit 04bcdded86079da0715b1a7bfa2f6cbfc933b62f.
b) Revert "WifiStack: Use UserHandle.CURRENT_OR_SELF temporarily"
This reverts commit 77492ea42bdef3d347c13e1a8313da49af862246.
c) Add INTERACT_ACROSS_USERS_FULL signature permissions which
we can obtain now because of the wifi protection level.
Bug: 142234604
Bug: 142301155
Test: Can provision & connect to R2 passoint network
Change-Id: I73361a8a0d8abb6feb5b9d563322457ce25b2382
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/OpenNetworkNotifierTest.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/wifitests/src/com/android/server/wifi/OpenNetworkNotifierTest.java b/tests/wifitests/src/com/android/server/wifi/OpenNetworkNotifierTest.java index bdb82b20a..f88272d45 100644 --- a/tests/wifitests/src/com/android/server/wifi/OpenNetworkNotifierTest.java +++ b/tests/wifitests/src/com/android/server/wifi/OpenNetworkNotifierTest.java @@ -458,9 +458,8 @@ public class OpenNetworkNotifierTest extends WifiBaseTest { /** Verifies that {@link UserManager#DISALLOW_CONFIG_WIFI} disables the feature. */ @Test public void userHasDisallowConfigWifiRestriction_notificationNotDisplayed() { - // TODO (b/142234604): This will not work on multi-user device scenarios. when(mUserManager.hasUserRestrictionForUser(UserManager.DISALLOW_CONFIG_WIFI, - UserHandle.CURRENT_OR_SELF)) + UserHandle.CURRENT)) .thenReturn(true); mNotificationController.handleScanResults(mOpenNetworks); @@ -479,9 +478,8 @@ public class OpenNetworkNotifierTest extends WifiBaseTest { ConnectToNetworkNotificationAndActionCount.NOTIFICATION_RECOMMEND_NETWORK); verify(mNotificationManager).notify(anyInt(), any()); - // TODO (b/142234604): This will not work on multi-user device scenarios. when(mUserManager.hasUserRestrictionForUser(UserManager.DISALLOW_CONFIG_WIFI, - UserHandle.CURRENT_OR_SELF)) + UserHandle.CURRENT)) .thenReturn(true); mNotificationController.handleScanResults(mOpenNetworks); |