From ed9f50dd589b2dfa0f01e2783c56ae9b7b48a1f5 Mon Sep 17 00:00:00 2001 From: Louis Chang Date: Wed, 17 Mar 2021 14:21:10 +0800 Subject: [PATCH] Dump warning logs to prevent app crash while no top-resumed changes Applications crashed due to duplicated top resumed activity change events. Currently, the only possible scenario we know if that the application invokes Looper#loop() and reverse the messages order. Write warning logs vs. throwing exceptions to prevent application crashes. Bug: 140571893 Test: build and boot pass Change-Id: If6f6c502b96ccc11b230ba075c61118f03e13d5c --- core/java/android/app/ActivityThread.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index b47d44d607907..4cc486a0b9b44 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -4602,6 +4602,10 @@ public final class ActivityThread extends ClientTransactionHandler { } if (r.isTopResumedActivity == onTop) { + if (!Build.IS_DEBUGGABLE) { + Slog.w(TAG, "Activity top position already set to onTop=" + onTop); + return; + } throw new IllegalStateException("Activity top position already set to onTop=" + onTop); }