diff options
| author | Peter Qiu <zqiu@google.com> | 2017-01-04 10:22:06 -0800 |
|---|---|---|
| committer | Peter Qiu <zqiu@google.com> | 2017-01-04 10:22:06 -0800 |
| commit | f35c310b1acc5898811c9ec9b7978bc5da50d507 (patch) | |
| tree | 6aa79efeee2d22ac16d15147587c06cec4cc2445 | |
| parent | 2a9a3a9304640c7000d0ce1c1659ae9fade08b36 (diff) | |
| parent | fe09754c17a194e2ac1342b0da9959aafdc6dc32 (diff) | |
| download | android_frameworks_opt_net_wifi-f35c310b1acc5898811c9ec9b7978bc5da50d507.tar.gz android_frameworks_opt_net_wifi-f35c310b1acc5898811c9ec9b7978bc5da50d507.tar.bz2 android_frameworks_opt_net_wifi-f35c310b1acc5898811c9ec9b7978bc5da50d507.zip | |
resolve merge conflicts of fe09754c1 to nyc-dev
Change-Id: I9845a6826188ea0c05508947f5c1266a245b04fd
| -rw-r--r-- | service/java/com/android/server/wifi/configparse/ConfigBuilder.java | 10 |
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 070c69b95..4ddf7f4be 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 { |