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

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

Merge "Fix crash in isChildDocument when parent is in zip, and child not." into nyc-dev

parents 8175846e e192cb71

packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java

+4 −0
Original line number Diff line number Diff line
@@ -391,6 +391,10 @@ public class ExternalStorageProvider extends DocumentsProvider { 
            if (mArchiveHelper.isArchivedDocument(docId)) {

                return mArchiveHelper.isChildDocument(parentDocId, docId);

            }

            // Archives do not contain regular files.

            if (mArchiveHelper.isArchivedDocument(parentDocId)) {

                return false;

            }



            final File parent = getFileForDocId(parentDocId).getCanonicalFile();

            final File doc = getFileForDocId(docId).getCanonicalFile();