diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-21 19:18:41 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-21 19:18:41 +0000 |
commit | 617b35d63ea9ebec377247c9abf2763ede1486d5 (patch) | |
tree | f64d55814fe50793a4a42922c6ffbc3769f3a65d | |
parent | ce4dc5c2dfaf8a9738a7bace552e204e47a7ea72 (diff) | |
parent | e79fa2e6864d5182b39fc89e6433823dca479283 (diff) | |
download | Settings-android14-qpr2-release.tar.gz |
Merge cherrypicks of ['googleplex-android-review.googlesource.com/26024636'] into 24Q1-release.android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-release
Change-Id: I3ddf804a3f3ef4a180a71baa3e6761687362fd15
-rw-r--r-- | src/com/android/settings/wifi/WifiDialogActivity.java | 13 | ||||
-rw-r--r-- | tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java | 17 |
2 files changed, 27 insertions, 3 deletions
diff --git a/src/com/android/settings/wifi/WifiDialogActivity.java b/src/com/android/settings/wifi/WifiDialogActivity.java index 7e901c27ba6..eb3d88a9668 100644 --- a/src/com/android/settings/wifi/WifiDialogActivity.java +++ b/src/com/android/settings/wifi/WifiDialogActivity.java @@ -17,6 +17,7 @@ package com.android.settings.wifi; import static android.Manifest.permission.ACCESS_FINE_LOCATION; +import static android.os.UserManager.DISALLOW_ADD_WIFI_CONFIG; import static android.os.UserManager.DISALLOW_CONFIG_WIFI; import android.app.KeyguardManager; @@ -122,7 +123,7 @@ public class WifiDialogActivity extends ObservableActivity implements WifiDialog } super.onCreate(savedInstanceState); - if (!isConfigWifiAllowed()) { + if (!isConfigWifiAllowed() || !isAddWifiConfigAllowed()) { finish(); return; } @@ -393,6 +394,16 @@ public class WifiDialogActivity extends ObservableActivity implements WifiDialog return isConfigWifiAllowed; } + @VisibleForTesting + boolean isAddWifiConfigAllowed() { + UserManager userManager = getSystemService(UserManager.class); + if (userManager != null && userManager.hasUserRestriction(DISALLOW_ADD_WIFI_CONFIG)) { + Log.e(TAG, "The user is not allowed to add Wi-Fi configuration."); + return false; + } + return true; + } + private boolean hasWifiManager() { if (mWifiManager != null) return true; mWifiManager = getSystemService(WifiManager.class); diff --git a/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java b/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java index ff0395db72f..d1cbd0ee1b7 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java @@ -18,6 +18,7 @@ package com.android.settings.wifi; import static android.Manifest.permission.ACCESS_COARSE_LOCATION; import static android.Manifest.permission.ACCESS_FINE_LOCATION; +import static android.os.UserManager.DISALLOW_ADD_WIFI_CONFIG; import static android.os.UserManager.DISALLOW_CONFIG_WIFI; import static com.android.settings.wifi.WifiDialogActivity.REQUEST_CODE_WIFI_DPP_ENROLLEE_QR_CODE_SCANNER; @@ -50,7 +51,6 @@ import com.android.wifitrackerlib.WifiEntry; import com.google.android.setupcompat.util.WizardManagerHelper; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -58,7 +58,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; import org.robolectric.RobolectricTestRunner; -@Ignore("b/314867581") @RunWith(RobolectricTestRunner.class) public class WifiDialogActivityTest { @@ -243,6 +242,20 @@ public class WifiDialogActivityTest { } @Test + public void isAddWifiConfigAllowed_hasNoUserRestriction_returnTrue() { + when(mUserManager.hasUserRestriction(DISALLOW_ADD_WIFI_CONFIG)).thenReturn(false); + + assertThat(mActivity.isAddWifiConfigAllowed()).isTrue(); + } + + @Test + public void isAddWifiConfigAllowed_hasUserRestriction_returnFalse() { + when(mUserManager.hasUserRestriction(DISALLOW_ADD_WIFI_CONFIG)).thenReturn(true); + + assertThat(mActivity.isAddWifiConfigAllowed()).isFalse(); + } + + @Test public void hasPermissionForResult_noCallingPackage_returnFalse() { when(mActivity.getCallingPackage()).thenReturn(null); |