diff options
| author | Nicolas Prévot <nprevot@google.com> | 2015-08-07 19:23:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-07 19:23:52 +0000 |
| commit | 288e82f8f67db894c43bf4ea659ca832f979c65a (patch) | |
| tree | 81b2efff59c2f9d8c9c3dd24780fd6f78b74c595 /services | |
| parent | 9dc4d50be1db82359050fd082828680bde44b9fd (diff) | |
| parent | b5ab2ffc213dbc976544ef6e0922d72d4fa241ff (diff) | |
| download | frameworks_base-288e82f8f67db894c43bf4ea659ca832f979c65a.zip frameworks_base-288e82f8f67db894c43bf4ea659ca832f979c65a.tar.gz frameworks_base-288e82f8f67db894c43bf4ea659ca832f979c65a.tar.bz2 | |
Merge "Keep intent verification status of system apps when uninstalling them." into mnc-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index ce40c28..6a4ae3d 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -13037,7 +13037,8 @@ public class PackageManagerService extends IPackageManager.Stub { // they have set the special DELETE_SYSTEM_APP which requests different // semantics than normal for uninstalling system apps. 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, false, //installed true, //stopped @@ -13045,7 +13046,7 @@ public class PackageManagerService extends IPackageManager.Stub { false, //hidden null, null, null, false, // blockUninstall - INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED, 0); + ps.readUserState(userId).domainVerificationStatus, 0); if (!isSystemApp(ps)) { if (ps.isAnyInstalled(sUserManager.getUserIds())) { // Other user still have this package installed, so all |