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

Commit fdf9534c authored by Tomasz Mikolajewski's avatar Tomasz Mikolajewski Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE: Temporarily disable the non-snapshot path for archives."... 

Merge "DO NOT MERGE: Temporarily disable the non-snapshot path for archives." into nyc-andromeda-dev
parents b22a0d2d 1010b256

src/com/android/documentsui/archives/Archive.java

+6 −4
Original line number Diff line number Diff line
@@ -212,10 +212,12 @@ public class Archive implements Closeable { 
            Context context, ParcelFileDescriptor descriptor, Uri archiveUri,

            @Nullable Uri notificationUri)

            throws IOException {

        if (canSeek(descriptor)) {

            return new Archive(context, new File(PROC_FD_PATH + descriptor.getFd()),

                    archiveUri, notificationUri);

        }

        // TODO: Temporarily disable non-snapshot code path, as /proc/self/fd/* files

        // are not openable across processes. b/32228589

        // if (canSeek(descriptor)) {

        //     return new Archive(context, new File(PROC_FD_PATH + descriptor.getFd()),

        //             archiveUri, notificationUri);

        // }



        // Fallback for non-seekable file descriptors.

        File snapshotFile = null;