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

Merge "Clean up fully rolled out HeadlessSingleUserFixes" into main

Browse Source
This commit is contained in:
Pavel Grafov
2024-08-30 15:20:28 +00:00
committed by Android (Google) Code Review
parent e8c9816d15 93c566ef5b
commit 6886e03e44
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,7 +27,6 @@ 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;
@@ -375,13 +374,8 @@ 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; UserHandle mainUser = mUserManager.getMainUser();
if (Flags.headlessSingleUserFixes()) { UserHandle primaryUser = mainUser != null ? mainUser : UserHandle.SYSTEM;
UserHandle mainUser = mUserManager.getMainUser();
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()) {