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

Commit dedc5d71 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents b814355d e21576fd

core/java/android/app/ContextImpl.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -1713,6 +1713,9 @@ class ContextImpl extends Context { 
                Slog.w(TAG, "Missing ActivityManager; assuming " + uid + " holds " + permission);

                Slog.w(TAG, "Missing ActivityManager; assuming " + uid + " holds " + permission);

                return PackageManager.PERMISSION_GRANTED;

                return PackageManager.PERMISSION_GRANTED;

            }

            }

            Slog.w(TAG, "Missing ActivityManager; assuming " + uid + " does not hold "

                    + permission);

            return PackageManager.PERMISSION_DENIED;

        }

        }





        try {

        try {