PackageManager: Avoid another NPE when dereferencing mPlatfromPackage

Change-Id: Idd989acb181b06f9c828fd740a9a20bfe6881bba

PackageManager: Avoid another NPE when dereferencing mPlatfromPackage
Change-Id: Idd989acb181b06f9c828fd740a9a20bfe6881bba
293dde19 · Wang Han · Michael W · 5464c812 · 293dde19
Commit 293dde19 authored Sep 09, 2018 by Wang Han Committed by Michael W Sep 10, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

services/core/java/com/android/server/pm/PackageManagerService.java ...ore/java/com/android/server/pm/PackageManagerService.java +2 -2

No files found.
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -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) {