diff options
| author | Louis Chang <louischang@google.com> | 2021-03-31 06:55:05 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-31 06:55:05 +0000 |
| commit | 2b5dae1c57c4f175d138fa6becbc56495880d3b4 (patch) | |
| tree | f874beb10c3ccbba4b3238060a1b400a2ea6cfed /core/java | |
| parent | 342a8ffad0d5c4205fe087356e542cd7ceccc22f (diff) | |
| parent | b6d433cdbd4caeb7a5c886d4e0ed9b4cf70e5cd5 (diff) | |
Merge "Dump warning logs to prevent app crash while no top-resumed changes" into rvc-qpr-dev am: b6d433cdbd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13896651
Change-Id: I199c71ab75007a6fef25c71ecf433d2f939e43e9
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 65f2c02faa85..67207cbb780b 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); } |