Merge "Revert "Allow DumpViewHierarchy cmd to be interruptible without breaking."" into main

1 files changed, 1 insertions, 11 deletions

diff --git a/services/core/java/com/android/server/pm/LauncherAppsService.java b/services/core/java/com/android/server/pm/LauncherAppsService.java
index 9e7f3662b76b..11660a59afe6 100644
--- a/services/core/java/com/android/server/pm/LauncherAppsService.java
+++ b/services/core/java/com/android/server/pm/LauncherAppsService.java
@@ -1569,17 +1569,7 @@ public class LauncherAppsService extends SystemService {
          */
         private void forEachViewCaptureWindow(
                 @NonNull BiConsumer<String, InputStream> outputtingConsumer) {
-            int i;
-            try {
-                i = mDumpCallbacks.beginBroadcast() - 1;
-            } catch (IllegalStateException e) {
-                Log.d(TAG, "The previous broadcast must have been killed, because a broadcast"
-                        + "was occurring when it should not have been. Calling finishBroadcast and "
-                        + "retrying.", e);
-                mDumpCallbacks.finishBroadcast();
-                i = mDumpCallbacks.beginBroadcast() - 1;
-            }
-            for (; i >= 0; i--) {
+            for (int i = mDumpCallbacks.beginBroadcast() - 1; i >= 0; i--) {
                 String packageName = (String) mDumpCallbacks.getBroadcastCookie(i);
                 String fileName = WM_TRACE_DIR + packageName + "_" + i + VC_FILE_SUFFIX;