Merge "Fix file descriptor ownership." into rvc-dev

package com.android.server.backup.restore;

package com.android.server.backup.restore;

import android.os.ParcelFileDescriptor;

import android.os.ParcelFileDescriptor;

import android.os.ParcelFileDescriptor.AutoCloseInputStream;

import libcore.io.IoUtils;

import libcore.io.IoUtils;

import java.io.FileInputStream;

import java.io.InputStream;

import java.io.InputStream;

class FullRestoreEngineThread implements Runnable {

class FullRestoreEngineThread implements Runnable {

        // We *do* want this FileInputStream to own the underlying fd, so that

        // We *do* want this FileInputStream to own the underlying fd, so that

        // when we are finished with it, it closes this end of the pipe in a way

        // when we are finished with it, it closes this end of the pipe in a way

        // that signals its other end.

        // that signals its other end.

        mEngineStream = new FileInputStream(engineSocket.getFileDescriptor(), true);

        mEngineStream = new AutoCloseInputStream(engineSocket);

        // Tell it to be sure to leave the agent instance up after finishing

        // Tell it to be sure to leave the agent instance up after finishing

        mMustKillAgent = false;

        mMustKillAgent = false;

    }

    }