Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d5e9361 authored by Suprabh Shukla's avatar Suprabh Shukla Committed by Automerger Merge Worker
Browse files

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

Merge "Null check while removing suspensions" into rvc-dev am: 4c65d2cb am: d0e6323d am: 4a978b67

Original change: undetermined

Change-Id: I30d5ad4d6b62446e7ceaf43a3c1d45c4915eafae
parents 9f3a3d66 4a978b67

services/core/java/com/android/server/pm/PackageManagerService.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -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).