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
This commit is contained in:
kholoud mohamed
2022-03-14 11:11:33 +00:00
parent 45436a025c
commit de78149c16
49 changed files with 160 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
View File

@@ -98,11 +98,11 @@ public class EnterprisePrivacyFeatureProviderImpl implements EnterprisePrivacyFe
final SpannableStringBuilder disclosure = new SpannableStringBuilder();
final CharSequence organizationName = mDpm.getDeviceOwnerOrganizationName();
if (organizationName != null) {
disclosure.append(mDpm.getString(DEVICE_MANAGED_WITH_NAME,
disclosure.append(mDpm.getResources().getString(DEVICE_MANAGED_WITH_NAME,
() -> mResources.getString(R.string.do_disclosure_with_name,
organizationName), organizationName));
} else {
disclosure.append(mDpm.getString(DEVICE_MANAGED_WITHOUT_NAME,
disclosure.append(mDpm.getResources().getString(DEVICE_MANAGED_WITHOUT_NAME,
() -> mResources.getString(R.string.do_disclosure_generic)));
}
return disclosure;