| commit | b0126b10252e2dbfba77a619f0219e47df7d02d6 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Dec 17 16:45:14 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 17 16:45:14 2021 +0000 |
| tree | 8afd8c59daf187da1b9be06fc8b8c0b0b2a03dfb | |
| parent | aaec96cdab812ffd05902d514f464bfa3f99c349 [diff] | |
| parent | 09ff886960d3f4239fc546d9ff48a1390f5f3cc0 [diff] |
Merge "Workaround to dump error log instead of exception" into sc-v2-dev am: 0eeab2b04d am: 09ff886960 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16489361 Change-Id: I2f125ab44082651982a7422468897d86cff57517
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index c0a8c1e..7eb92a7 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java
@@ -4982,7 +4982,8 @@ Slog.w(TAG, "Activity top position already set to onTop=" + onTop); return; } - throw new IllegalStateException("Activity top position already set to onTop=" + onTop); + // TODO(b/209744518): Remove this short-term workaround while fixing the binder failure. + Slog.e(TAG, "Activity top position already set to onTop=" + onTop); } r.isTopResumedActivity = onTop;