resolve merge conflicts of fe09754c1 to nyc-dev am: f35c310b1a am: bd91d4a476 am: 39ec37cefe

am: e4890ae5f6

Change-Id: Ib39ff0bf19dd2a0390cee7c371167d9db3bda487

1 files changed, 0 insertions, 10 deletions

diff --git a/service/java/com/android/server/wifi/configparse/ConfigBuilder.java b/service/java/com/android/server/wifi/configparse/ConfigBuilder.java
index 9bcfddbb6..ad0165e4c 100644
--- a/service/java/com/android/server/wifi/configparse/ConfigBuilder.java
+++ b/service/java/com/android/server/wifi/configparse/ConfigBuilder.java
@@ -54,8 +54,6 @@ public class ConfigBuilder {
         byte[] b64 = Base64.decode(new String(data, StandardCharsets.ISO_8859_1), Base64.DEFAULT);
         Log.d(TAG, "Decoded: " + b64.length + " bytes.");
 
-        dropFile(Uri.parse(uriString), context);
-
         MIMEContainer mimeContainer = new
                 MIMEContainer(new LineNumberReader(
                 new InputStreamReader(new ByteArrayInputStream(b64), StandardCharsets.ISO_8859_1)),
@@ -79,14 +77,6 @@ public class ConfigBuilder {
         return parse(inner);
     }
 
-    private static void dropFile(Uri uri, Context context) {
-        if (DocumentsContract.isDocumentUri(context, uri)) {
-            DocumentsContract.deleteDocument(context.getContentResolver(), uri);
-        } else {
-            context.getContentResolver().delete(uri, null, null);
-        }
-    }
-
     private static WifiConfiguration parse(MIMEContainer root)
             throws IOException, GeneralSecurityException, SAXException {