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

RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class

Browse Source 
Bug: 217388602
Bug: 218875965
Test: atest EnterpriseResourcesTests
Test: manual
Change-Id: I4775d7741c7819fd811c3fc4eda1636b1e04b398
(cherry picked from commit de78149c16)
Merged-In: I4775d7741c7819fd811c3fc4eda1636b1e04b398
This commit is contained in:
kholoud mohamed
2022-03-14 11:11:33 +00:00
committed by Kholoud Mohamed
parent 5cc09fbd7f
commit 90afe190e8
49 changed files with 162 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -247,7 +247,7 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends InstrumentedFr
R.string.lock_last_attempt_before_wipe_warning_title);
final String overrideMessageId = getLastTryOverrideErrorMessageId(userType);
final int defaultMessageId = getLastTryDefaultErrorMessage(userType);
final String message = mDevicePolicyManager.getString(
final String message = mDevicePolicyManager.getResources().getString(
overrideMessageId, () -> getString(defaultMessageId));
LastTryDialog.show(fragmentManager, title, message,
android.R.string.ok, false /* dismiss */);
@@ -281,9 +281,10 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends InstrumentedFr
return getString(com.android.settingslib
.R.string.failed_attempts_now_wiping_device);
case USER_TYPE_MANAGED_PROFILE:
return mDevicePolicyManager.getString(WORK_PROFILE_LOCK_ATTEMPTS_FAILED,
() -> getString(com.android.settingslib
.R.string.failed_attempts_now_wiping_profile));
return mDevicePolicyManager.getResources().getString(
WORK_PROFILE_LOCK_ATTEMPTS_FAILED,
() -> getString(
com.android.settingslib.R.string.failed_attempts_now_wiping_profile));
case USER_TYPE_SECONDARY:
return getString(com.android.settingslib.R.string.failed_attempts_now_wiping_user);
default: