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

Commit 1050e5b0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add null check for package in setEnabledSetting"

parents 5b730482 f019dbc7

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

+2 −1
Original line number Diff line number Diff line
@@ -21242,7 +21242,8 @@ public class PackageManagerService extends IPackageManager.Stub 
            // Prior to enabling the package, we need to decompress the APK(s) to the

            // data partition and then replace the version on the system partition.

            final AndroidPackage deletedPkg = pkgSetting.pkg;

            final boolean isSystemStub = deletedPkg.isStub()

            final boolean isSystemStub = (deletedPkg != null)

                    && deletedPkg.isStub()

                    && deletedPkg.isSystem();

            if (isSystemStub

                    && (newState == PackageManager.COMPONENT_ENABLED_STATE_DEFAULT