RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class

Bug: 217388602 Bug: 218875965 Test: atest EnterpriseResourcesTests Test: manual Change-Id: I4775d7741c7819fd811c3fc4eda1636b1e04b398
2022-03-14 11:11:33 +00:00
parent 45436a025c
commit de78149c16
49 changed files with 160 additions and 139 deletions
--- a/src/com/android/settings/accounts/RemoveAccountPreferenceController.java
+++ b/src/com/android/settings/accounts/RemoveAccountPreferenceController.java
@@ -217,6 +217,7 @@ public class RemoveAccountPreferenceController extends AbstractPreferenceControl
            return new AlertDialog.Builder(context)
                    .setTitle(R.string.remove_account_label)
                    .setMessage(getContext().getSystemService(DevicePolicyManager.class)
+                            .getResources()
                            .getString(REMOVE_ACCOUNT_FAILED_ADMIN_RESTRICTION,
                                    () -> getString(R.string.remove_account_failed)))
                    .setPositiveButton(android.R.string.ok, null)