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

2018-03-30 01:26:27 +00:00
parent b814355d17 e21576fd28
commit dedc5d7141
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 {