Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbf842dc authored by Erik Wolsheimer's avatar Erik Wolsheimer Committed by android-build-merger
Browse files

Merge "Return PERMISSION_DENIED instead of NPE when missing ActivityManager"... 

Merge "Return PERMISSION_DENIED instead of NPE when missing ActivityManager" into pi-dev am: dedc5d71
am: d1981d6f

Change-Id: I8213e9dcf2103e48cc3f8013ddde3ca63f804564
parents 2f3c9f62 d1981d6f

core/java/android/app/ContextImpl.java

+3 −0
Original line number Diff line number Diff line
@@ -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 {