PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add config flag in Settings to control whether restricted profiles are offered.

Browse Source 
This adds a config resource to specify whether restricted profiles
should be offered as an option when a new user is added. This replaces
the previous check if a device is voice capable, and will be defaulted
to false.

Bug: 202854971
Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER="com.android.settings.users.UserCapabilitiesTest"
Change-Id: If090fe8d902d6521acfde8c26e801aa4fc4f5ff4
This commit is contained in:
Oli Lan
2022-01-11 12:45:28 +00:00
parent 6649b9b0eb
commit 8aec687b29
4 changed files with 81 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
tests/robotests/src/com/android/settings/users/UserCapabilitiesTest.java
View File

@@ -18,12 +18,17 @@ package com.android.settings.users;
import static com.google.common.truth.Truth.assertThat;
import android.content.ComponentName;
import android.content.Context;
import android.os.UserHandle;
import android.os.UserManager;
import com.android.settings.R;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.testutils.shadow.ShadowDevicePolicyManager;
import com.android.settings.testutils.shadow.ShadowUserManager;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -32,16 +37,24 @@ import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(RobolectricTestRunner.class)
@Config(shadows = {ShadowUserManager.class})
@Config(shadows = {ShadowUserManager.class, ShadowDevicePolicyManager.class,
SettingsShadowResources.class})
public class UserCapabilitiesTest {
private Context mContext;
private ShadowUserManager mUserManager;
private ShadowDevicePolicyManager mDpm;
@Before
public void setUp() {
mContext = RuntimeEnvironment.application;
mUserManager = ShadowUserManager.getShadow();
mDpm = ShadowDevicePolicyManager.getShadow();
}
@After
public void tearDown() {
SettingsShadowResources.reset();
}
@Test
@@ -85,4 +98,40 @@ public class UserCapabilitiesTest {
assertThat(userCapabilities.mUserSwitcherEnabled).isTrue();
}
@Test
public void restrictedProfile_enabled() {
mUserManager.setUserTypeEnabled(UserManager.USER_TYPE_FULL_RESTRICTED, true);
mDpm.setDeviceOwner(null);
SettingsShadowResources.overrideResource(R.bool.config_offer_restricted_profiles, true);
final UserCapabilities userCapabilities = UserCapabilities.create(mContext);
assertThat(userCapabilities.mCanAddRestrictedProfile).isTrue();
}
@Test
public void restrictedProfile_configNotSet() {
mUserManager.setUserTypeEnabled(UserManager.USER_TYPE_FULL_RESTRICTED, true);
mDpm.setDeviceOwner(null);
SettingsShadowResources.overrideResource(R.bool.config_offer_restricted_profiles, false);
final UserCapabilities userCapabilities = UserCapabilities.create(mContext);
assertThat(userCapabilities.mCanAddRestrictedProfile).isFalse();
}
@Test
public void restrictedProfile_deviceIsManaged() {
mUserManager.setUserTypeEnabled(UserManager.USER_TYPE_FULL_RESTRICTED, true);
mDpm.setDeviceOwner(new ComponentName("test", "test"));
SettingsShadowResources.overrideResource(R.bool.config_offer_restricted_profiles, true);
final UserCapabilities userCapabilities = UserCapabilities.create(mContext);
assertThat(userCapabilities.mCanAddRestrictedProfile).isFalse();
}
@Test
public void restrictedProfile_typeNotEnabled() {
mUserManager.setUserTypeEnabled(UserManager.USER_TYPE_FULL_RESTRICTED, false);
mDpm.setDeviceOwner(null);
SettingsShadowResources.overrideResource(R.bool.config_offer_restricted_profiles, true);
final UserCapabilities userCapabilities = UserCapabilities.create(mContext);
assertThat(userCapabilities.mCanAddRestrictedProfile).isFalse();
}
}