Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d8b52c1 authored by Stefan Andonian's avatar Stefan Andonian Committed by Android (Google) Code Review
Browse files

Revert "Allow DumpViewHierarchy cmd to be interruptible without breaking." 

This reverts commit 559393ee.

Reason for revert: Didn't actually get approval.

Change-Id: I17c46691c08904c39c125255ee5bbf90e2cf5486
parent 559393ee

services/core/java/com/android/server/pm/LauncherAppsService.java

+1 −11
Original line number Diff line number Diff line
@@ -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;