PawletOS/app_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

6
src/com/android/settings/enterprise/DeviceAdminStringProviderImpl.java
View File

@@ -39,7 +39,7 @@ class DeviceAdminStringProviderImpl implements DeviceAdminStringProvider {
@Override
public String getDefaultDisabledByPolicyTitle() {
return mDevicePolicyManager.getString(DISABLED_BY_IT_ADMIN_TITLE,
return mDevicePolicyManager.getResources().getString(DISABLED_BY_IT_ADMIN_TITLE,
() -> mContext.getString(R.string.disabled_by_policy_title));
}
@@ -75,13 +75,13 @@ class DeviceAdminStringProviderImpl implements DeviceAdminStringProvider {
@Override
public String getDefaultDisabledByPolicyContent() {
return mDevicePolicyManager.getString(CONTACT_YOUR_IT_ADMIN,
return mDevicePolicyManager.getResources().getString(CONTACT_YOUR_IT_ADMIN,
() -> mContext.getString(R.string.default_admin_support_msg));
}
@Override
public String getLearnMoreHelpPageUrl() {
return mDevicePolicyManager.getString(IT_ADMIN_POLICY_DISABLING_INFO_URL,
return mDevicePolicyManager.getResources().getString(IT_ADMIN_POLICY_DISABLING_INFO_URL,
() -> mContext.getString(R.string.help_url_action_disabled_by_it_admin));
}