Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: e497b698d2

Change-Id: I0d5ace9d9b302e8f924d096fb245a81a3dfa8568
This commit is contained in:
Makoto Onuki
2017-05-02 23:57:45 +00:00
committed by android-build-merger
parent 9d6474140f e497b698d2
commit bab47edecb
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/app/LoadedApk.java
View File

@@ -1218,6 +1218,7 @@ public final class LoadedApk {
private Intent mCurIntent; private Intent mCurIntent;
private final boolean mOrdered; private final boolean mOrdered;
private boolean mDispatched; private boolean mDispatched;
private Throwable mPreviousRunStacktrace; // To investigate b/37809561. STOPSHIP remove.
public Args(Intent intent, int resultCode, String resultData, Bundle resultExtras, public Args(Intent intent, int resultCode, String resultData, Bundle resultExtras,
boolean ordered, boolean sticky, int sendingUser) { boolean ordered, boolean sticky, int sendingUser) {
@@ -1243,11 +1244,14 @@ public final class LoadedApk {
final IActivityManager mgr = ActivityManager.getService(); final IActivityManager mgr = ActivityManager.getService();
final Intent intent = mCurIntent; final Intent intent = mCurIntent;
if (intent == null) { 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; mCurIntent = null;
mDispatched = true; mDispatched = true;
mPreviousRunStacktrace = new Throwable("Previous stacktrace");
if (receiver == null || intent == null || mForgotten) { if (receiver == null || intent == null || mForgotten) {
if (mRegistered && ordered) { if (mRegistered && ordered) {
if (ActivityThread.DEBUG_BROADCAST) Slog.i(ActivityThread.TAG, if (ActivityThread.DEBUG_BROADCAST) Slog.i(ActivityThread.TAG,