diff options
| author | Peter Qiu <zqiu@google.com> | 2016-12-12 13:56:48 -0800 |
|---|---|---|
| committer | Adam Seaton <aseaton@google.com> | 2017-01-20 00:10:51 +0000 |
| commit | ab23d798ff74a2f2a6e1568292785d879b5a418b (patch) | |
| tree | dc09e1810df4503552253ad27ec3ae1a3569e81b | |
| parent | 4da98e32a7c53663b1af4d979b27df214a3d3b46 (diff) | |
| download | wifi-nougat-mr1-cts-release.tar.gz | |
configparse: do not delete passpoint configuration fileandroid-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-7.1.1_r23nougat-mr1-releasenougat-mr1-cts-release
Fix merge conflict into nyc-mr1-security release branches
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 | 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 { |