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

Merge "Merge \"Build both filename views before deleting.\" into nyc-mr1-dev am: fff6a11438" into nyc-mr1-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2016-07-15 23:16:56 +00:00
committed by Android (Google) Code Review
parent 64c147b2cd ab062fc81f
commit 40a4bf7dc1
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -484,6 +484,8 @@ public class ExternalStorageProvider extends DocumentsProvider {
@Override @Override
public void deleteDocument(String docId) throws FileNotFoundException { public void deleteDocument(String docId) throws FileNotFoundException {
final File file = getFileForDocId(docId); final File file = getFileForDocId(docId);
final File visibleFile = getFileForDocId(docId, true);
final boolean isDirectory = file.isDirectory(); final boolean isDirectory = file.isDirectory();
if (isDirectory) { if (isDirectory) {
FileUtils.deleteContents(file); FileUtils.deleteContents(file);
@@ -492,7 +494,6 @@ public class ExternalStorageProvider extends DocumentsProvider {
throw new IllegalStateException("Failed to delete " + file); throw new IllegalStateException("Failed to delete " + file);
} }
final File visibleFile = getFileForDocId(docId, true);
if (visibleFile != null) { if (visibleFile != null) {
final ContentResolver resolver = getContext().getContentResolver(); final ContentResolver resolver = getContext().getContentResolver();
final Uri externalUri = MediaStore.Files.getContentUri("external"); final Uri externalUri = MediaStore.Files.getContentUri("external");