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

Merge "If package has no active admins, just uninstall right away" into nyc-dev

Browse Source
This commit is contained in:
Makoto Onuki
2016-02-11 19:42:53 +00:00
committed by Android (Google) Code Review
parent 635f71925a ed9fa2ca3c
commit 5f05cf9612
1 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -8533,26 +8533,32 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
mPackagesToRemove.add(packageUserPair);
}
final List<ComponentName> activeAdminsList = getActiveAdmins(userId);
if (activeAdminsList == null || activeAdminsList.size() == 0) {
startUninstallIntent(packageName, userId);
return;
}
// All active admins on the user.
final List<ComponentName> allActiveAdmins = getActiveAdmins(userId);
for (ComponentName activeAdmin : activeAdminsList) {
if (packageName.equals(activeAdmin.getPackageName())) {
removeActiveAdmin(activeAdmin, userId);
// Active admins in the target package.
final List<ComponentName> packageActiveAdmins = new ArrayList<>();
if (allActiveAdmins != null) {
for (ComponentName activeAdmin : allActiveAdmins) {
if (packageName.equals(activeAdmin.getPackageName())) {
packageActiveAdmins.add(activeAdmin);
removeActiveAdmin(activeAdmin, userId);
}
}
}
mHandler.postDelayed(new Runnable() {
@Override
public void run() {
for (ComponentName activeAdmin : activeAdminsList) {
removeAdminArtifacts(activeAdmin, userId);
if (packageActiveAdmins.size() == 0) {
startUninstallIntent(packageName, userId);
} else {
mHandler.postDelayed(new Runnable() {
@Override
public void run() {
for (ComponentName activeAdmin : packageActiveAdmins) {
removeAdminArtifacts(activeAdmin, userId);
}
startUninstallIntent(packageName, userId);
}
startUninstallIntent(packageName, userId);
}
}, DEVICE_ADMIN_DEACTIVATE_TIMEOUT); // Start uninstall after timeout anyway.
}, DEVICE_ADMIN_DEACTIVATE_TIMEOUT); // Start uninstall after timeout anyway.
}
}
private void removePackageIfRequired(final String packageName, final int userId) {