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

[Settings] Don't allow apps on external storage to be active admin

Browse Source 
Bug 27149287

Change-Id: I7e0905228812fbc326cf4ac4984e7f59003996a8
This commit is contained in:
Makoto Onuki
2016-02-17 11:15:04 -08:00
parent 95d7c970dc
commit 9dbad57a84
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -3389,6 +3389,8 @@
<string name="app_forward_locked">App is copy-protected.</string> <string name="app_forward_locked">App is copy-protected.</string>
<string name="invalid_location">Install location isn\u2019t valid.</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> <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> <string name="force_stop_dlg_title">Force stop?</string>
<!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps--> <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->

5
src/com/android/settings/DeviceAdminSettings.java
View File

@@ -359,6 +359,9 @@ public class DeviceAdminSettings extends ListFragment {
DeviceAdminInfo deviceAdminInfo = createDeviceAdminInfo(resolveInfo); DeviceAdminInfo deviceAdminInfo = createDeviceAdminInfo(resolveInfo);
// add only visible ones (note: active admins are added regardless of visibility) // add only visible ones (note: active admins are added regardless of visibility)
if (deviceAdminInfo != null && deviceAdminInfo.isVisible()) { if (deviceAdminInfo != null && deviceAdminInfo.isVisible()) {
if (!deviceAdminInfo.getActivityInfo().applicationInfo.isInternal()) {
continue;
}
DeviceAdminListItem item = new DeviceAdminListItem(); DeviceAdminListItem item = new DeviceAdminListItem();
item.info = deviceAdminInfo; item.info = deviceAdminInfo;
item.name = deviceAdminInfo.loadLabel(pm).toString(); item.name = deviceAdminInfo.loadLabel(pm).toString();
@@ -391,6 +394,8 @@ public class DeviceAdminSettings extends ListFragment {
for (int j = 0; j < resolvedMax; ++j) { for (int j = 0; j < resolvedMax; ++j) {
DeviceAdminInfo deviceAdminInfo = createDeviceAdminInfo(resolved.get(j)); DeviceAdminInfo deviceAdminInfo = createDeviceAdminInfo(resolved.get(j));
if (deviceAdminInfo != null) { 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(); DeviceAdminListItem item = new DeviceAdminListItem();
item.info = deviceAdminInfo; item.info = deviceAdminInfo;
item.name = deviceAdminInfo.loadLabel(packageManager).toString(); item.name = deviceAdminInfo.loadLabel(packageManager).toString();

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

@@ -86,6 +86,8 @@ public class StorageWizardMoveProgress extends StorageWizardBase {
switch (returnCode) { switch (returnCode) {
case PackageManager.MOVE_FAILED_INSUFFICIENT_STORAGE: case PackageManager.MOVE_FAILED_INSUFFICIENT_STORAGE:
return getString(R.string.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: case PackageManager.MOVE_FAILED_DOESNT_EXIST:
return getString(R.string.does_not_exist); return getString(R.string.does_not_exist);
case PackageManager.MOVE_FAILED_FORWARD_LOCKED: case PackageManager.MOVE_FAILED_FORWARD_LOCKED: