commit f315b875ac2408aa853fc5e903d37eb4bb48262f
author android-build-team Robot <android-build-team-robot@google.com> Wed Oct 18 17:01:52 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Oct 18 17:01:52 2017 +0000
tree 6c8a0e84c9d8e833d3ef097e92acff714752ac6c
parent 4a73c0a85a1284392bff90bcda1af5515cc7e4cc
parent f701609c4dd86e97bafec1bf47bf2c3234ab65b4

Snap for 4402310 from f701609c4dd86e97bafec1bf47bf2c3234ab65b4 to oc-m2-release

Change-Id: I9d9682a1a816031e03bfd298ea1a951dd453a763

src/com/android/certinstaller/WiFiInstaller.java

diff --git a/src/com/android/certinstaller/WiFiInstaller.java b/src/com/android/certinstaller/WiFiInstaller.java
index b745211..90b8eb7 100644
--- a/src/com/android/certinstaller/WiFiInstaller.java
+++ b/src/com/android/certinstaller/WiFiInstaller.java
@@ -147,14 +147,14 @@
      * @param context The context of the current application
      */
     private static void dropFile(Uri uri, Context context) {
+      try {
         if (DocumentsContract.isDocumentUri(context, uri)) {
-            try {
-                DocumentsContract.deleteDocument(context.getContentResolver(), uri);
-            } catch (Exception e) {
-                Log.e(TAG, "could not delete document " + uri);
-            }
+          DocumentsContract.deleteDocument(context.getContentResolver(), uri);
         } else {
-            context.getContentResolver().delete(uri, null, null);
+          context.getContentResolver().delete(uri, null, null);
         }
+      } catch (Exception e) {
+        Log.e(TAG, "could not delete document " + uri);
+      }
     }
 }