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

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

Merge "Add more information to WTF to investigate bug 37809561" into oc-dev

parents 5772ffcb f3bb6f31
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -1218,6 +1218,7 @@ public final class LoadedApk {
            private Intent mCurIntent;
            private final boolean mOrdered;
            private boolean mDispatched;
            private Throwable mPreviousRunStacktrace; // To investigate b/37809561. STOPSHIP remove.

            public Args(Intent intent, int resultCode, String resultData, Bundle resultExtras,
                    boolean ordered, boolean sticky, int sendingUser) {
@@ -1243,11 +1244,14 @@ public final class LoadedApk {
                final IActivityManager mgr = ActivityManager.getService();
                final Intent intent = mCurIntent;
                if (intent == null) {
                    Log.wtf(TAG, "Null intent being dispatched, mDispatched=" + mDispatched);
                    Log.wtf(TAG, "Null intent being dispatched, mDispatched=" + mDispatched
                            + ": run() previously called at "
                            + Log.getStackTraceString(mPreviousRunStacktrace));
                }

                mCurIntent = null;
                mDispatched = true;
                mPreviousRunStacktrace = new Throwable("Previous stacktrace");
                if (receiver == null || intent == null || mForgotten) {
                    if (mRegistered && ordered) {
                        if (ActivityThread.DEBUG_BROADCAST) Slog.i(ActivityThread.TAG,