Merge "Dump warning logs to prevent app crash while no top-resumed changes" into rvc-qpr-dev

2021-03-31 06:15:30 +00:00
parent da0264d945 ed9f50dd58
commit b6d433cdbd
1 changed files with 4 additions and 0 deletions
--- 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);
        }