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

Commit 5e51a2b1 authored by Stefan Andonian's avatar Stefan Andonian
Browse files

Fix "Hanging Final Read" bug for ViewCapture data transfers. 

Bug: 224595733
Test: Verified this works manually on device.
Change-Id: I6b20ffb5625ade06844245341342b0dba134bf76
parent 1049b455

viewcapturelib/src/com/android/app/viewcapture/ViewCapture.java

+7 −1
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import com.android.app.viewcapture.data.MotionWindowData; 
import com.android.app.viewcapture.data.ViewNode;

import com.android.app.viewcapture.data.WindowData;



import java.io.DataOutputStream;

import java.io.IOException;

import java.io.OutputStream;

import java.util.ArrayList;
@@ -175,7 +176,12 @@ public abstract class ViewCapture { 
    @AnyThread

    protected void dumpTo(OutputStream os, Context context)

            throws InterruptedException, ExecutionException, IOException {

        if (mIsEnabled) getExportedData(context).writeTo(os);

        if (mIsEnabled) {

            DataOutputStream dataOutputStream = new DataOutputStream(os);

            ExportedData ex = getExportedData(context);

            dataOutputStream.writeInt(ex.getSerializedSize());

            ex.writeTo(dataOutputStream);

        }

    }



    @VisibleForTesting