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

Commit 293dde19 authored by Wang Han's avatar Wang Han Committed by Michael W
Browse files

PackageManager: Avoid another NPE when dereferencing mPlatfromPackage 

Change-Id: Idd989acb181b06f9c828fd740a9a20bfe6881bba
parent 5464c812

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

+2 −2
Original line number Diff line number Diff line
@@ -13493,8 +13493,8 @@ public class PackageManagerService extends IPackageManager.Stub 
        boolean allowed = (compareSignatures(

                bp.packageSetting.signatures.mSignatures, pkg.mSignatures)

                        == PackageManager.SIGNATURE_MATCH)

                || (compareSignatures(mPlatformPackage.mSignatures, pkg.mSignatures)

                        == PackageManager.SIGNATURE_MATCH)

                || (mPlatformPackage != null && compareSignatures(mPlatformPackage.mSignatures,

                        pkg.mSignatures) == PackageManager.SIGNATURE_MATCH)

                || (compareSignatures(mVendorPlatformSignatures, pkg.mSignatures)

                        == PackageManager.SIGNATURE_MATCH);

        if (!allowed && privilegedPermission) {