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

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

@@ -44,13 +44,13 @@ public class AlwaysOnVpnCurrentUserPreferenceController
public void updateState(Preference preference) {
if (mFeatureProvider.isInCompMode()) {
preference.setTitle(
mDevicePolicyManager.getString(
mDevicePolicyManager.getResources().getString(
ALWAYS_ON_VPN_PERSONAL_PROFILE,
() -> mContext.getString(
R.string.enterprise_privacy_always_on_vpn_personal)));
} else {
preference.setTitle(
mDevicePolicyManager.getString(ALWAYS_ON_VPN_DEVICE,
mDevicePolicyManager.getResources().getString(ALWAYS_ON_VPN_DEVICE,
() -> mContext.getString(
R.string.enterprise_privacy_always_on_vpn_device)));
}