From 5bf89553f8042701af1b959dee286516d1fe0a02 Mon Sep 17 00:00:00 2001
From: Nate Myren <ntmyren@google.com>
Date: Mon, 7 Feb 2022 08:56:14 -0800
Subject: [PATCH] Null check AndroidPackage in checkPostNotifications

AndroidPkg should not be null, but is sometimes, for unclear reasons.
Check for null, and log if it is.

Fixes: 218247156
Test: none
Change-Id: I4037536076954ca837476e70b68669c05ba26203
---
 .../server/pm/permission/PermissionManagerService.java        | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
index 698068dd8091f..71554eee3127b 100644
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
@@ -606,6 +606,10 @@ public class PermissionManagerService extends IPermissionManager.Stub {
             int granted = PermissionManagerService.this.checkUidPermission(uid,
                     POST_NOTIFICATIONS);
             AndroidPackage pkg = mPackageManagerInt.getPackage(uid);
+            if (pkg == null) {
+                Slog.e(LOG_TAG, "No package for uid " + uid);
+                return granted;
+            }
             if (granted != PackageManager.PERMISSION_GRANTED
                     && pkg.getTargetSdkVersion() >= Build.VERSION_CODES.M) {
                 int flags = PermissionManagerService.this.getPermissionFlags(pkg.getPackageName(),