From e21576fd28d2d99ceff304650d678fadafa804f8 Mon Sep 17 00:00:00 2001
From: Erik Wolsheimer <ewol@google.com>
Date: Thu, 29 Mar 2018 16:21:41 -0700
Subject: [PATCH] Return PERMISSION_DENIED instead of NPE when missing
 ActivityManager

Bug: 75005160
Change-Id: I710c5ee9f3d679240bf708102ef508041d0a3122
---
 core/java/android/app/ContextImpl.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java
index f5e138c164b69..71b88fa4ad916 100644
--- a/core/java/android/app/ContextImpl.java
+++ b/core/java/android/app/ContextImpl.java
@@ -1713,6 +1713,9 @@ class ContextImpl extends Context {
                 Slog.w(TAG, "Missing ActivityManager; assuming " + uid + " holds " + permission);
                 return PackageManager.PERMISSION_GRANTED;
             }
+            Slog.w(TAG, "Missing ActivityManager; assuming " + uid + " does not hold "
+                    + permission);
+            return PackageManager.PERMISSION_DENIED;
         }
 
         try {