| commit | 3f790d2ebaa18be651a9168e2d4408e5010d36e2 | [log] [tgz] |
|---|---|---|
| author | Louis Chang <louischang@google.com> | Wed Mar 31 07:17:54 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 31 07:17:54 2021 +0000 |
| tree | 3ce61bfb7bc5a052d8b7c1eb274db8df7fa2a0f2 | |
| parent | eb4158fbb0352fb88bc738d573d8a69475d600fc [diff] | |
| parent | 2b5dae1c57c4f175d138fa6becbc56495880d3b4 [diff] |
Merge "Dump warning logs to prevent app crash while no top-resumed changes" into rvc-qpr-dev am: b6d433cdbd am: 2b5dae1c57 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13896651 Change-Id: I4719a6ff203dafa59fd688f405efe44f19c1577b
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 7298d87..e596e7c 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java
@@ -4803,6 +4803,10 @@ } 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); }