summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Qiu <zqiu@google.com>2017-01-04 18:03:38 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-01-04 18:03:38 +0000
commit39ae399af786656ddb820ecb6a46eaf98042aaf6 (patch)
tree1d3a1375f8f517cfbf3f7f56aaa0ad95aa47a880
parente61906f92cdf50e6221f0911b1f47c107e2181dc (diff)
parent8d43428276b08f5afcec6c64cc24fc4e7a8fd498 (diff)
downloadandroid_frameworks_opt_net_wifi-39ae399af786656ddb820ecb6a46eaf98042aaf6.tar.gz
android_frameworks_opt_net_wifi-39ae399af786656ddb820ecb6a46eaf98042aaf6.tar.bz2
android_frameworks_opt_net_wifi-39ae399af786656ddb820ecb6a46eaf98042aaf6.zip
configparse: do not delete passpoint configuration file am: de3de10eec
am: 8d43428276 Change-Id: I2fdc59cf23a122bcc6cbc4f0596e384152d29160
-rw-r--r--service/java/com/android/server/wifi/configparse/ConfigBuilder.java6
1 files changed, 0 insertions, 6 deletions
diff --git a/service/java/com/android/server/wifi/configparse/ConfigBuilder.java b/service/java/com/android/server/wifi/configparse/ConfigBuilder.java
index e8e5e6a18..602b120cf 100644
--- a/service/java/com/android/server/wifi/configparse/ConfigBuilder.java
+++ b/service/java/com/android/server/wifi/configparse/ConfigBuilder.java
@@ -55,8 +55,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)),
@@ -80,10 +78,6 @@ public class ConfigBuilder {
return parse(inner, context);
}
- private static void dropFile(Uri uri, Context context) {
- context.getContentResolver().delete(uri, null, null);
- }
-
private static WifiConfiguration parse(MIMEContainer root, Context context)
throws IOException, GeneralSecurityException, SAXException {