summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChilun <chilunhuang@google.com>2021-08-27 16:41:31 +0800
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-08-30 02:11:19 +0000
commitb1c856d5fc454ac0edbf62200fd8903b9315a26b (patch)
treeb65e30f0bb6a9aa3a7a3164907d97c5e81a4b70b
parent7cb6f953e8e860332c627cee60e9767fdc6805ff (diff)
downloadbase-b1c856d5fc454ac0edbf62200fd8903b9315a26b.tar.gz
[RESTRICT AUTOMERGE] Workaround to dump error log instead of exception
This is a short-term workaround to dump error log instead of throwing the exception to unblock the test. Bug: 197484331 Test: build pass Change-Id: I2ece3b9d85edc1ae43038e6f69b35f59b160a3dd (cherry picked from commit f8fc1326f762012e87f501fb0aeff3adc4c9a9d5)
-rw-r--r--core/java/android/app/ActivityThread.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index 0c64c86daf3e..12b1df44b6f5 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -4911,7 +4911,8 @@ public final class ActivityThread extends ClientTransactionHandler
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/197484331): Remove this short-term workaround while fixing the binder failure.
+ Slog.e(TAG, "Activity top position already set to onTop=" + onTop);
}
r.isTopResumedActivity = onTop;