diff options
author | Peter Qiu <zqiu@google.com> | 2016-12-12 13:56:48 -0800 |
---|---|---|
committer | Peter Qiu <zqiu@google.com> | 2016-12-12 13:58:25 -0800 |
commit | de3de10eec061d39c5691bc1ba7556d22a6d2ecb (patch) | |
tree | 74418baf27d8ad5893d3c8f1b87d18fa600c5675 | |
parent | 29a2baf3195256bab6a0a4a2d07b7f2efa46b614 (diff) | |
download | android_frameworks_opt_net_wifi-de3de10eec061d39c5691bc1ba7556d22a6d2ecb.tar.gz android_frameworks_opt_net_wifi-de3de10eec061d39c5691bc1ba7556d22a6d2ecb.tar.bz2 android_frameworks_opt_net_wifi-de3de10eec061d39c5691bc1ba7556d22a6d2ecb.zip |
configparse: do not delete passpoint configuration file
It is the caller's responsibility for deleting configuration files.
This avoids the ConfigBuilder from deleting arbitrary files
(specified by URI) pass-in by the callers.
Bug: 33178389
Test: Verify Passpoint Configuration installation works using Shamu
Change-Id: I54803dc711ede98a1ec1259077522032c543dca1
-rw-r--r-- | service/java/com/android/server/wifi/configparse/ConfigBuilder.java | 6 |
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 { |