Merge "Return PERMISSION_DENIED instead of NPE when missing ActivityManager" into pi-dev

am: dedc5d7141 Change-Id: I1515bf52b3561e7ce2c66adb8a4a9f87f0e012c7
2018-03-30 14:43:17 +00:00
parent 2eab17bc73 dedc5d7141
commit d1981d6fb6
1 changed files with 3 additions and 0 deletions
--- 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 {