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

Revert "Show "Add users from lock screen" dependent on secure lock screen."

Browse Source 
This reverts commit 0149363a39.

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
This commit is contained in:
Jon Spivack
2020-02-10 22:11:57 +00:00
parent 0149363a39
commit 666dacc32a
3 changed files with 5 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/users/AddUserWhenLockedPreferenceController.java
View File

@@ -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 @@ public class AddUserWhenLockedPreferenceController extends TogglePreferenceContr
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;
}