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

Merge "Null check while removing suspensions" into rvc-dev am: 4c65d2cbee

Browse Source 
Original change: undetermined

Change-Id: Id4b85d1ccd025d3ab1a11bce8ff7c78cff5d703f
This commit is contained in:
Suprabh Shukla
2020-06-01 22:28:04 +00:00
committed by Automerger Merge Worker
parent 3382048743 4c65d2cbee
commit b3c8d07625
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

@@ -13451,7 +13451,7 @@ public class PackageManagerService extends IPackageManager.Stub
synchronized (mLock) { synchronized (mLock) {
for (String packageName : packagesToChange) { for (String packageName : packagesToChange) {
final PackageSetting ps = mSettings.mPackages.get(packageName); final PackageSetting ps = mSettings.mPackages.get(packageName);
if (ps.getSuspended(userId)) { if (ps != null && ps.getSuspended(userId)) {
ps.removeSuspension(suspendingPackagePredicate, userId); ps.removeSuspension(suspendingPackagePredicate, userId);
if (!ps.getSuspended(userId)) { if (!ps.getSuspended(userId)) {
unsuspendedPackages.add(ps.name); unsuspendedPackages.add(ps.name);
@@ -13492,7 +13492,7 @@ public class PackageManagerService extends IPackageManager.Stub
synchronized (mLock) { synchronized (mLock) {
for (String packageName : packagesToChange) { for (String packageName : packagesToChange) {
final PackageSetting ps = mSettings.mPackages.get(packageName); final PackageSetting ps = mSettings.mPackages.get(packageName);
if (ps.getDistractionFlags(userId) != 0) { if (ps != null && ps.getDistractionFlags(userId) != 0) {
ps.setDistractionFlags(0, userId); ps.setDistractionFlags(0, userId);
changedPackages.add(ps.name); changedPackages.add(ps.name);
changedUids.add(UserHandle.getUid(userId, ps.getAppId())); changedUids.add(UserHandle.getUid(userId, ps.getAppId()));
@@ -18884,6 +18884,7 @@ public class PackageManagerService extends IPackageManager.Stub
int userId) { int userId) {
mContext.enforceCallingOrSelfPermission( mContext.enforceCallingOrSelfPermission(
android.Manifest.permission.DELETE_PACKAGES, null); android.Manifest.permission.DELETE_PACKAGES, null);
// TODO (b/157774108): This should fail on non-existent packages.
synchronized (mLock) { synchronized (mLock) {
// Cannot block uninstall of static shared libs as they are // Cannot block uninstall of static shared libs as they are
// considered a part of the using app (emulating static linking). // considered a part of the using app (emulating static linking).