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

am 288e82f8: Merge "Keep intent verification status of system apps when uninstalling them." into mnc-dev

Browse Source 
* commit '288e82f8f67db894c43bf4ea659ca832f979c65a':
  Keep intent verification status of system apps when uninstalling them.
This commit is contained in:
Nicolas Prévot
2015-08-07 19:30:40 +00:00
committed by Android Git Automerger
parent 04b9614548 288e82f8f6
commit 543fd8be75
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -13037,7 +13037,8 @@ public class PackageManagerService extends IPackageManager.Stub {
// they have set the special DELETE_SYSTEM_APP which requests different // they have set the special DELETE_SYSTEM_APP which requests different
// semantics than normal for uninstalling system apps. // semantics than normal for uninstalling system apps.
if (DEBUG_REMOVE) Slog.d(TAG, "Only deleting for single user"); if (DEBUG_REMOVE) Slog.d(TAG, "Only deleting for single user");
ps.setUserState(user.getIdentifier(), final int userId = user.getIdentifier();
ps.setUserState(userId,
COMPONENT_ENABLED_STATE_DEFAULT, COMPONENT_ENABLED_STATE_DEFAULT,
false, //installed false, //installed
true, //stopped true, //stopped
@@ -13045,7 +13046,7 @@ public class PackageManagerService extends IPackageManager.Stub {
false, //hidden false, //hidden
null, null, null, null, null, null,
false, // blockUninstall false, // blockUninstall
INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED, 0); ps.readUserState(userId).domainVerificationStatus, 0);
if (!isSystemApp(ps)) { if (!isSystemApp(ps)) {
if (ps.isAnyInstalled(sUserManager.getUserIds())) { if (ps.isAnyInstalled(sUserManager.getUserIds())) {
// Other user still have this package installed, so all // Other user still have this package installed, so all