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

Commit d1981d6f 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" into pi-dev 

am: dedc5d71

Change-Id: I1515bf52b3561e7ce2c66adb8a4a9f87f0e012c7
parents 2eab17bc dedc5d71

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 {