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

Commit 23c94a3a authored by Amith Yamasani's avatar Amith Yamasani Committed by android-build-merger
Browse files

Merge "Handle null user in deletePackageLIF" into pi-dev am: ea4f21f6 

am: 359b0116

Change-Id: I51b0a2998b4f40a47354e327b834165c43936008
parents 93d1cfe8 359b0116

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

+4 −3
Original line number Diff line number Diff line
@@ -18703,9 +18703,10 @@ public class PackageManagerService extends IPackageManager.Stub 
                return true;

            }

        }

        if (ps.getPermissionsState().hasPermission(

                Manifest.permission.SUSPEND_APPS, user.getIdentifier())) {

            onSuspendingPackageRemoved(packageName, user.getIdentifier());













        final int userId = user == null ? UserHandle.USER_ALL : user.getIdentifier();













        if (ps.getPermissionsState().hasPermission(Manifest.permission.SUSPEND_APPS, userId)) {













            onSuspendingPackageRemoved(packageName, userId);















        }