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

Fix crash in isChildDocument when parent is in zip, and child not.

Browse Source 
There is no regular file representation for archive documents, so
the call to getFileForDocId(archivedDocId) was throwing an exception.

Bug: 27383423
Change-Id: Icbc1e8ecdddc7698cfdb79b41da6e1d3cecf11ae
This commit is contained in:
Tomasz Mikolajewski
2016-03-01 10:36:10 +09:00
parent 52cdc1593a
commit e192cb71d6
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();