commit de78149c167b645077992f84cb33c7081a99664f
author kholoud mohamed <kholoudm@google.com> Mon Mar 14 11:11:33 2022 +0000
committer kholoud mohamed <kholoudm@google.com> Thu Mar 17 17:37:45 2022 +0000
tree de00f51e93c1e2dee50a42d010885e94aceabae7
parent 45436a025c36de3d48a8571128a372d49ef8bd46

RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class

Bug: 217388602
Bug: 218875965
Test: atest EnterpriseResourcesTests
Test: manual
Change-Id: I4775d7741c7819fd811c3fc4eda1636b1e04b398

src/com/android/settings/MainClear.java

diff --git a/src/com/android/settings/MainClear.java b/src/com/android/settings/MainClear.java
index 7eb4a5d..62462b3 100644
--- a/src/com/android/settings/MainClear.java
+++ b/src/com/android/settings/MainClear.java
@@ -500,10 +500,10 @@
                         context.getSystemService(DevicePolicyManager.class);
 
                 if (userInfo.isManagedProfile()) {
-                    titleText.setText(devicePolicyManager.getString(
+                    titleText.setText(devicePolicyManager.getResources().getString(
                             WORK_CATEGORY_HEADER, () -> getString(R.string.category_work)));
                 } else {
-                    titleText.setText(devicePolicyManager.getString(
+                    titleText.setText(devicePolicyManager.getResources().getString(
                             PERSONAL_CATEGORY_HEADER, () -> getString(R.string.category_personal)));
                 }
                 contents.addView(titleView);