Revert "Show "Add users from lock screen" dependent on secure lock screen."
This reverts commit 0149363a394e3a565e6958cdca41b5621c4209d2.
Reason for revert: Droidcop: Potential culprit for Bug 149209670- verifying through Forrest before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
Change-Id: Ia1f1ce35ef5d93664cf665bea86a472376b84aab
diff --git a/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java b/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java
index e0a9c26..f931fa4 100644
--- a/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java
+++ b/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java
@@ -16,25 +16,20 @@
package com.android.settings.users;
import android.content.Context;
-import android.os.UserHandle;
import android.provider.Settings;
import androidx.preference.Preference;
-import com.android.internal.widget.LockPatternUtils;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.RestrictedSwitchPreference;
public class AddUserWhenLockedPreferenceController extends TogglePreferenceController {
private final UserCapabilities mUserCaps;
- private final LockPatternUtils mLockPatternUtils;
- public AddUserWhenLockedPreferenceController(
- Context context, String key, LockPatternUtils lockPatternUtils) {
+ public AddUserWhenLockedPreferenceController(Context context, String key) {
super(context, key);
mUserCaps = UserCapabilities.create(context);
- mLockPatternUtils = lockPatternUtils;
}
@Override
@@ -58,8 +53,6 @@
return DISABLED_FOR_USER;
} else if (mUserCaps.disallowAddUser() || mUserCaps.disallowAddUserSetByAdmin()) {
return DISABLED_FOR_USER;
- } else if (!mLockPatternUtils.isSecure(UserHandle.myUserId())) {
- return CONDITIONALLY_UNAVAILABLE;
} else {
return mUserCaps.mUserSwitcherEnabled ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
}
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 70af899..cd305e9 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -240,7 +240,7 @@
}
mAddUserWhenLockedPreferenceController = new AddUserWhenLockedPreferenceController(
- activity, KEY_ADD_USER_WHEN_LOCKED, new LockPatternUtils(getPrefContext()));
+ activity, KEY_ADD_USER_WHEN_LOCKED);
mMultiUserFooterPreferenceController = new MultiUserFooterPreferenceController(activity,
KEY_MULTIUSER_FOOTER);
@@ -1290,8 +1290,7 @@
boolean suppressAllPage) {
final List<String> niks = super.getNonIndexableKeysFromXml(context, xmlResId,
suppressAllPage);
- new AddUserWhenLockedPreferenceController(
- context, KEY_ADD_USER_WHEN_LOCKED, new LockPatternUtils(context))
+ new AddUserWhenLockedPreferenceController(context, KEY_ADD_USER_WHEN_LOCKED)
.updateNonIndexableKeys(niks);
new AutoSyncDataPreferenceController(context, null /* parent */)
.updateNonIndexableKeys(niks);
diff --git a/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java
index cb5791e..b27b636 100644
--- a/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java
@@ -18,7 +18,6 @@
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -28,8 +27,6 @@
import androidx.preference.PreferenceScreen;
-import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.shadow.ShadowUserManager;
import com.android.settingslib.RestrictedSwitchPreference;
@@ -54,16 +51,13 @@
private Context mContext;
private ShadowUserManager mUserManager;
private AddUserWhenLockedPreferenceController mController;
- private LockPatternUtils mLockPatternUtils;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- mLockPatternUtils = mock(LockPatternUtils.class);
mUserManager = ShadowUserManager.getShadow();
- mController = new AddUserWhenLockedPreferenceController(
- mContext, "fake_key", mLockPatternUtils);
+ mController = new AddUserWhenLockedPreferenceController(mContext, "fake_key");
mUserManager.setSupportsMultipleUsers(true);
}
@@ -75,7 +69,6 @@
@Test
public void displayPref_NotAdmin_shouldNotDisplay() {
mUserManager.setIsAdminUser(false);
- when(mLockPatternUtils.isSecure(anyInt())).thenReturn(true);
final RestrictedSwitchPreference preference = mock(RestrictedSwitchPreference.class);
when(preference.getKey()).thenReturn(mController.getPreferenceKey());
when(mScreen.findPreference(preference.getKey())).thenReturn(preference);
@@ -88,7 +81,6 @@
@Test
public void updateState_NotAdmin_shouldNotDisplayPreference() {
mUserManager.setIsAdminUser(false);
- when(mLockPatternUtils.isSecure(anyInt())).thenReturn(true);
final RestrictedSwitchPreference preference = mock(RestrictedSwitchPreference.class);
mController.updateState(preference);
@@ -101,9 +93,8 @@
mUserManager.setIsAdminUser(true);
mUserManager.setUserSwitcherEnabled(true);
mUserManager.setSupportsMultipleUsers(true);
- when(mLockPatternUtils.isSecure(anyInt())).thenReturn(true);
final AddUserWhenLockedPreferenceController controller =
- new AddUserWhenLockedPreferenceController(mContext, "fake_key", mLockPatternUtils);
+ new AddUserWhenLockedPreferenceController(mContext, "fake_key");
final RestrictedSwitchPreference preference = mock(RestrictedSwitchPreference.class);
controller.updateState(preference);
@@ -152,40 +143,4 @@
assertThat(Global.getInt(mContext.getContentResolver(), Global.ADD_USERS_WHEN_LOCKED, 0))
.isEqualTo(0);
}
-
- @Test
- public void updateState_insecureLockScreen_shouldNotDisplayPreference() {
- mUserManager.setIsAdminUser(true);
- mUserManager.setUserSwitcherEnabled(true);
- mUserManager.setSupportsMultipleUsers(true);
- when(mLockPatternUtils.isSecure(anyInt())).thenReturn(false);
- final AddUserWhenLockedPreferenceController controller =
- new AddUserWhenLockedPreferenceController(
- mContext, "fake_key", mLockPatternUtils);
- final RestrictedSwitchPreference preference = mock(RestrictedSwitchPreference.class);
-
- controller.updateState(preference);
-
- verify(preference).setVisible(false);
- assertThat(controller.getAvailabilityStatus()).isEqualTo(
- BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
- }
-
- @Test
- public void updateState_secureLockScreen_shouldDisplayPreference() {
- mUserManager.setIsAdminUser(true);
- mUserManager.setUserSwitcherEnabled(true);
- mUserManager.setSupportsMultipleUsers(true);
- when(mLockPatternUtils.isSecure(anyInt())).thenReturn(true);
- final AddUserWhenLockedPreferenceController controller =
- new AddUserWhenLockedPreferenceController(
- mContext, "fake_key", mLockPatternUtils);
- final RestrictedSwitchPreference preference = mock(RestrictedSwitchPreference.class);
-
- controller.updateState(preference);
-
- verify(preference).setVisible(true);
- assertThat(controller.getAvailabilityStatus()).isEqualTo(
- BasePreferenceController.AVAILABLE);
- }
}