diff options
| author | 2018-03-30 01:26:27 +0000 | |
|---|---|---|
| committer | 2018-03-30 01:26:27 +0000 | |
| commit | dedc5d71413432b334dc97bc6d49d898f9eeed9f (patch) | |
| tree | 838282adf3214dd8ec6000f2ed3cf997f66ec5ea | |
| parent | b814355d170388312288cf78875363db29897e1b (diff) | |
| parent | e21576fd28d2d99ceff304650d678fadafa804f8 (diff) | |
Merge "Return PERMISSION_DENIED instead of NPE when missing ActivityManager" into pi-dev
| -rw-r--r-- | core/java/android/app/ContextImpl.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index f5e138c164b6..71b88fa4ad91 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 { |