Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Clean up fully rolled out HeadlessSingleUserFixes"" into main

Browse Source
This commit is contained in:
Priyanka Advani (xWF)
2024-08-30 22:10:24 +00:00
committed by Android (Google) Code Review
parent df4ecbdc01 eff79d3365
commit 9260350b93
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
View File

@@ -27,6 +27,7 @@ import android.app.KeyguardManager;
import android.app.RemoteLockscreenValidationSession; import android.app.RemoteLockscreenValidationSession;
import android.app.admin.DevicePolicyManager; import android.app.admin.DevicePolicyManager;
import android.app.admin.ManagedSubscriptionsPolicy; import android.app.admin.ManagedSubscriptionsPolicy;
import android.app.admin.flags.Flags;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
@@ -374,8 +375,13 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends InstrumentedFr
private int getUserTypeForWipe() { private int getUserTypeForWipe() {
final UserInfo userToBeWiped = mUserManager.getUserInfo( final UserInfo userToBeWiped = mUserManager.getUserInfo(
mDevicePolicyManager.getProfileWithMinimumFailedPasswordsForWipe(mEffectiveUserId)); mDevicePolicyManager.getProfileWithMinimumFailedPasswordsForWipe(mEffectiveUserId));
UserHandle primaryUser = UserHandle.SYSTEM;
if (Flags.headlessSingleUserFixes()) {
UserHandle mainUser = mUserManager.getMainUser(); UserHandle mainUser = mUserManager.getMainUser();
UserHandle primaryUser = mainUser != null ? mainUser : UserHandle.SYSTEM; if (mainUser != null ) {
primaryUser = mainUser;
}
}
if (userToBeWiped == null || userToBeWiped.getUserHandle().equals(primaryUser)) { if (userToBeWiped == null || userToBeWiped.getUserHandle().equals(primaryUser)) {
return USER_TYPE_PRIMARY; return USER_TYPE_PRIMARY;
} else if (userToBeWiped.isManagedProfile()) { } else if (userToBeWiped.isManagedProfile()) {