Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4bd2152c authored by Makoto Onuki's avatar Makoto Onuki Committed by Android (Google) Code Review
Browse files

Merge "[Settings] Don't allow apps on external storage to be active admin" into nyc-dev

parents 451ff8e9 9dbad57a

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -3390,6 +3390,8 @@ 
    <string name="app_forward_locked">App is copy-protected.</string>

    <string name="invalid_location">Install location isn\u2019t valid.</string>

    <string name="system_package">System updates can\u2019t be installed on external media.</string>

    <!-- Error message shown when trying to move device administrators to external disks, such as SD card [CHAR_LIMIT=none] -->

    <string name="move_error_device_admin">Device Administrator can\u2019t be installed on external media.</string>















    <string name="force_stop_dlg_title">Force stop?</string>















    <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->

































src/com/android/settings/DeviceAdminSettings.java



+5
−0




























Original line number
Diff line number
Diff line








@@ -359,6 +359,9 @@ public class DeviceAdminSettings extends ListFragment {













                DeviceAdminInfo deviceAdminInfo =  createDeviceAdminInfo(resolveInfo);















                // add only visible ones (note: active admins are added regardless of visibility)















                if (deviceAdminInfo != null && deviceAdminInfo.isVisible()) {













                    if (!deviceAdminInfo.getActivityInfo().applicationInfo.isInternal()) {













                        continue;













                    }















                    DeviceAdminListItem item = new DeviceAdminListItem();















                    item.info = deviceAdminInfo;















                    item.name = deviceAdminInfo.loadLabel(pm).toString();










@@ -391,6 +394,8 @@ public class DeviceAdminSettings extends ListFragment {













                    for (int j = 0; j < resolvedMax; ++j) {















                        DeviceAdminInfo deviceAdminInfo = createDeviceAdminInfo(resolved.get(j));















                        if (deviceAdminInfo != null) {













                            // Don't do the applicationInfo.isInternal() check here; if an active













                            // admin is already on SD card, just show it.















                            DeviceAdminListItem item = new DeviceAdminListItem();















                            item.info = deviceAdminInfo;















                            item.name = deviceAdminInfo.loadLabel(packageManager).toString();

































src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java



+2
−0




























Original line number
Diff line number
Diff line








@@ -86,6 +86,8 @@ public class StorageWizardMoveProgress extends StorageWizardBase {













        switch (returnCode) {















            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);















            case PackageManager.MOVE_FAILED_DOESNT_EXIST:















                return getString(R.string.does_not_exist);















            case PackageManager.MOVE_FAILED_FORWARD_LOCKED: