Merge "Remove (old) STOPSHIP" into qt-dev (772c69bd) · Commits · e / os / android_frameworks_base

core/java/android/app/LoadedApk.java

+3 −4

Original line number	Diff line number	Diff line
		@@ -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,