From f8fc1326f762012e87f501fb0aeff3adc4c9a9d5 Mon Sep 17 00:00:00 2001
From: Chilun <chilunhuang@google.com>
Date: Fri, 27 Aug 2021 16:41:31 +0800
Subject: [PATCH] [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
---
 core/java/android/app/ActivityThread.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index 0c64c86daf3ee..12b1df44b6f5c 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;