PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow Device Management Role Holder to update Settings strings.

Browse Source 
Test: manual
Bug: 188414370
Change-Id: I6e1a06619799a9e99382d791e72e2e4518f93cac
This commit is contained in:
Jonathan Scott
2022-01-19 15:19:08 +00:00
parent 47d115c3ff
commit e0d439472f
55 changed files with 788 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java
View File

@@ -16,9 +16,11 @@
package com.android.settings.deviceinfo;
import static android.app.admin.DevicePolicyResources.Strings.Settings.ERROR_MOVE_DEVICE_ADMIN;
import static android.content.Intent.EXTRA_TITLE;
import static android.content.pm.PackageManager.EXTRA_MOVE_ID;
import android.app.admin.DevicePolicyManager;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.MoveCallback;
import android.os.Bundle;
@@ -87,7 +89,9 @@ public class StorageWizardMoveProgress extends StorageWizardBase {
case PackageManager.MOVE_FAILED_INSUFFICIENT_STORAGE:
return getString(R.string.insufficient_storage);
case PackageManager.MOVE_FAILED_DEVICE_ADMIN:
return getString(R.string.move_error_device_admin);
return getSystemService(DevicePolicyManager.class)
.getString(ERROR_MOVE_DEVICE_ADMIN,
() -> getString(R.string.move_error_device_admin));
case PackageManager.MOVE_FAILED_DOESNT_EXIST:
return getString(R.string.does_not_exist);
case PackageManager.MOVE_FAILED_INVALID_LOCATION: