commit 8dd615fd07a54d0cce7976149a9c09e17f29a390
author Jeff Sharkey <jsharkey@android.com> Fri Jul 15 23:37:29 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jul 15 23:37:29 2016 +0000
tree 9ec984682e7d5439c428cd9cc5b1c3db463308ae
parent b098fbedd34793ffbb1a0e37ba2b09e4b8f5e711
parent 40a4bf7dc13614d3669fe277605955e3aa6b872f

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

Change-Id: Iabb5ffbc0ef161bb67d373fd13385e05d88b4179

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

diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
index 239f6a6..1341476 100644
--- a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
+++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
@@ -491,6 +491,8 @@
     @Override
     public void deleteDocument(String docId) throws FileNotFoundException {
         final File file = getFileForDocId(docId);
+        final File visibleFile = getFileForDocId(docId, true);
+
         final boolean isDirectory = file.isDirectory();
         if (isDirectory) {
             FileUtils.deleteContents(file);
@@ -499,7 +501,6 @@
             throw new IllegalStateException("Failed to delete " + file);
         }
 
-        final File visibleFile = getFileForDocId(docId, true);
         if (visibleFile != null) {
             final ContentResolver resolver = getContext().getContentResolver();
             final Uri externalUri = MediaStore.Files.getContentUri("external");