Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow Device Management Role Holder to update Settings strings."

Browse Source
This commit is contained in:
Jonathan Scott
2022-01-31 19:10:30 +00:00
committed by Android (Google) Code Review
parent 17c47f1447 e0d439472f
commit c3dbc3ffbd
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: