Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix file descriptor ownership." am: 72376bf05d

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1344037

Change-Id: I411c002095090acf12bb576051f5b05106f3dd30
This commit is contained in:
Josh Gao
2020-06-19 22:43:51 +00:00
committed by Automerger Merge Worker
parent ca5aa7dfec 72376bf05d
commit c495455b80
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/backup/java/com/android/server/backup/restore/FullRestoreEngineThread.java
View File

@@ -1,10 +1,10 @@
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 {
@@ -19,7 +19,7 @@ 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;
} }