summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorChilun <chilunhuang@google.com>2021-08-27 16:41:31 +0800
committerChilun Huang <chilunhuang@google.com>2021-08-27 10:41:41 +0000
commitf8fc1326f762012e87f501fb0aeff3adc4c9a9d5 (patch)
tree8636b5ab96dc3c9b8a7281d869e23c78a3c58527 /core/java/android
parent5f543519085b1a7dba7d0b30cfc8783e0639866f (diff)
[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
Diffstat (limited to 'core/java/android')
-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;