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

Fix incorrect password attempts messaging on headless

Browse Source 
Bug: 257276847
Test: manual
Flag: ACONFIG android.app.admin.flags.headless_single_user_fixes DISABLED
Change-Id: I2fb70d99203228ce4ee36f84eb4dfed36fa6fd8c
This commit is contained in:
Kholoud Mohamed
2024-04-18 13:27:42 +00:00
parent 491cb8fbe1
commit 85c38bc078
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Android.bp
View File

@@ -112,6 +112,7 @@ android_library {
"androidx.test.rules", "androidx.test.rules",
"telephony_flags_core_java_lib", "telephony_flags_core_java_lib",
"setupdesign-lottie-loading-layout", "setupdesign-lottie-loading-layout",
"device_policy_aconfig_flags_lib",
], ],
plugins: ["androidx.room_room-compiler-plugin"], plugins: ["androidx.room_room-compiler-plugin"],

10
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,7 +375,14 @@ 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));
if (userToBeWiped == null || userToBeWiped.isPrimary()) { UserHandle primaryUser = UserHandle.SYSTEM;
if (Flags.headlessSingleUserFixes()) {
UserHandle mainUser = mUserManager.getMainUser();
if (mainUser != null ) {
primaryUser = mainUser;
}
}
if (userToBeWiped == null || userToBeWiped.getUserHandle().equals(primaryUser)) {
return USER_TYPE_PRIMARY; return USER_TYPE_PRIMARY;
} else if (userToBeWiped.isManagedProfile()) { } else if (userToBeWiped.isManagedProfile()) {
return USER_TYPE_MANAGED_PROFILE; return USER_TYPE_MANAGED_PROFILE;