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

Commit ba025ee2 authored by Chris Tate's avatar Chris Tate Committed by Android (Google) Code Review
Browse files

Merge "It's legit for AMS to throw IllegalArgumentException"

parents 12f5678e 328e7d71

services/core/java/com/android/server/am/ActivityManagerService.java

+4 −2
Original line number Diff line number Diff line
@@ -2947,9 +2947,11 @@ public class ActivityManagerService extends IActivityManager.Stub 
        try {

            return super.onTransact(code, data, reply, flags);

        } catch (RuntimeException e) {

            // The activity manager only throws security exceptions, so let's

            // The activity manager only throws certain exceptions intentionally, so let's

            // log all others.

            if (!(e instanceof SecurityException)) {

            if (!(e instanceof SecurityException

                    || e instanceof IllegalArgumentException

                    || e instanceof IllegalStateException)) {

                Slog.wtf(TAG, "Activity Manager Crash."

                        + " UID:" + Binder.getCallingUid()

                        + " PID:" + Binder.getCallingPid()