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

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

Browse Source 
am: aa34d6c17d

* commit 'aa34d6c17dde17b4ace65719dcf3c9388d704893':
  Fix crash in isChildDocument when parent is in zip, and child not.
This commit is contained in:
Tomasz Mikolajewski
2016-03-01 10:32:09 +00:00
committed by android-build-merger
parent c0a0a5d43b aa34d6c17d
commit bf12176229
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
View File

@@ -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();