From 350ed67bf4c15ab724b526b6fc992bc58096164f Mon Sep 17 00:00:00 2001 From: Makoto Onuki Date: Tue, 30 Apr 2019 14:34:08 -0700 Subject: Remove (old) STOPSHIP Change-Id: I1de9adbab1f75973fe4ed330c742153ec846063f Fix: 37809561 Test: build --- core/java/android/app/LoadedApk.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/core/java/android/app/LoadedApk.java b/core/java/android/app/LoadedApk.java index 310cce41fa41..1ac619c386cc 100644 --- a/core/java/android/app/LoadedApk.java +++ b/core/java/android/app/LoadedApk.java @@ -1497,7 +1497,7 @@ public final class LoadedApk { private Intent mCurIntent; private final boolean mOrdered; private boolean mDispatched; - private Throwable mPreviousRunStacktrace; // To investigate b/37809561. STOPSHIP remove. + private boolean mRunCalled; public Args(Intent intent, int resultCode, String resultData, Bundle resultExtras, boolean ordered, boolean sticky, int sendingUser) { @@ -1525,13 +1525,12 @@ public final class LoadedApk { final Intent intent = mCurIntent; if (intent == null) { Log.wtf(TAG, "Null intent being dispatched, mDispatched=" + mDispatched - + ": run() previously called at " - + Log.getStackTraceString(mPreviousRunStacktrace)); + + (mRunCalled ? ", run() has already been called" : "")); } mCurIntent = null; mDispatched = true; - mPreviousRunStacktrace = new Throwable("Previous stacktrace"); + mRunCalled = true; if (receiver == null || intent == null || mForgotten) { if (mRegistered && ordered) { if (ActivityThread.DEBUG_BROADCAST) Slog.i(ActivityThread.TAG, -- cgit v1.2.3-59-g8ed1b