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

Browse Source 
am: 1f67c8740c

* commit '1f67c8740cf9d3e2852b9685500271779d5e09cb':
  Fix crash in isChildDocument when parent is in zip, and child not.
This commit is contained in:
Tomasz Mikolajewski
2016-03-01 10:29:54 +00:00
committed by android-build-merger
parent b763aebb2b 1f67c8740c
commit aa34d6c17d
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)) { if (mArchiveHelper.isArchivedDocument(docId)) {
return mArchiveHelper.isChildDocument(parentDocId, 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 parent = getFileForDocId(parentDocId).getCanonicalFile();
final File doc = getFileForDocId(docId).getCanonicalFile(); final File doc = getFileForDocId(docId).getCanonicalFile();