diff options
| author | Peter Qiu <zqiu@google.com> | 2017-01-04 20:45:50 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-04 20:45:50 +0000 |
| commit | e4890ae5f6b6cb60669d7527513ffb4598ac3476 (patch) | |
| tree | b510a281d7e1666b4f159418b760f1cfdb1b6fd8 | |
| parent | 054ddcd931164dcb6ce42a5a981748f89e6744e1 (diff) | |
| parent | 39ec37cefe9db617af2bc37ec5b05517b01576e2 (diff) | |
| download | android_frameworks_opt_net_wifi-e4890ae5f6b6cb60669d7527513ffb4598ac3476.tar.gz android_frameworks_opt_net_wifi-e4890ae5f6b6cb60669d7527513ffb4598ac3476.tar.bz2 android_frameworks_opt_net_wifi-e4890ae5f6b6cb60669d7527513ffb4598ac3476.zip | |
resolve merge conflicts of fe09754c1 to nyc-dev am: f35c310b1a am: bd91d4a476
am: 39ec37cefe
Change-Id: I82862cd9b911f3de01ce97be4dcb225259e72a74
| -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 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 { |