From f3bb6f31f4db715b0f42d1dedd13ab84624b9fe8 Mon Sep 17 00:00:00 2001 From: Makoto Onuki Date: Tue, 2 May 2017 12:02:23 -0700 Subject: [PATCH] Add more information to WTF to investigate bug 37809561 Bug 37809561 Test: Build & boot -- didn't actually exercise the WTF case but it should work since getStackTraceString accepts null too. Change-Id: Iabfbe1fcde293fec919c65df7ea9650e1b247b9a --- core/java/android/app/LoadedApk.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/java/android/app/LoadedApk.java b/core/java/android/app/LoadedApk.java index bbcf7ba591286..b84161c05a139 100644 --- a/core/java/android/app/LoadedApk.java +++ b/core/java/android/app/LoadedApk.java @@ -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,