commit f701609c4dd86e97bafec1bf47bf2c3234ab65b4
author android-build-team Robot <android-build-team-robot@google.com> Sun Oct 15 07:22:47 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sun Oct 15 07:22:47 2017 +0000
tree 6c8a0e84c9d8e833d3ef097e92acff714752ac6c
parent cbcce7a5edff8dd13d805e9864b493fde869c469
parent 881958d4b9d28e8723c70a51bec3b9f1544d8e77

Snap for 4396223 from 881958d4b9d28e8723c70a51bec3b9f1544d8e77 to oc-mr1-release

Change-Id: Ia688ed7b4a5cfd6a9c52ecd9fc746d77313874a2

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);
+      }
     }
 }