diff options
author | Xin Li <delphij@google.com> | 2020-09-08 16:54:29 -0700 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2020-09-08 16:54:29 -0700 |
commit | 14dc3d51b63fe1ac19f511ebf3132a56ffa7cc26 (patch) | |
tree | b8dc809603df7c6852772c3fac8cc38e25fe895b | |
parent | c5e0fcb70cdf6faaf073f7d676aab8184501ac7d (diff) | |
parent | 8b5d3ff40ed30afa36c4cf47bd7f3d9076e79e29 (diff) | |
download | ksoap2-14dc3d51b63fe1ac19f511ebf3132a56ffa7cc26.tar.gz |
Merge Android R
Bug: 168057903
Merged-In: I03454d7328b0c1fe58206f6dbb8dab3a6d5337f1
Change-Id: If1413f738c10c14b318a8dfacd0a8c4c6afc7007
-rw-r--r-- | Android.bp | 1 | ||||
-rw-r--r-- | ksoap2-base/src/main/java/org/ksoap2/transport/Transport.java | 14 |
2 files changed, 7 insertions, 8 deletions
@@ -1,4 +1,5 @@ java_library { name: "ksoap2", + sdk_version: "system_current", srcs: ["**/*.java"], } diff --git a/ksoap2-base/src/main/java/org/ksoap2/transport/Transport.java b/ksoap2-base/src/main/java/org/ksoap2/transport/Transport.java index d92e8d8..c89279b 100644 --- a/ksoap2-base/src/main/java/org/ksoap2/transport/Transport.java +++ b/ksoap2-base/src/main/java/org/ksoap2/transport/Transport.java @@ -31,8 +31,6 @@ import java.net.MalformedURLException; import java.net.Proxy; import java.net.URL; -import libcore.util.XmlObjectFactory; - import org.ksoap2.*; import org.xmlpull.v1.*; @@ -125,9 +123,9 @@ abstract public class Transport { */ protected void parseResponse(SoapEnvelope envelope, InputStream is) throws XmlPullParserException, IOException { - // Android-changed: Use XmlObjectFactory instead of a specific implementation. + // Android-changed: Use XmlPullParserFactory instead of a specific implementation. // XmlPullParser xp = new KXmlParser(); - XmlPullParser xp = XmlObjectFactory.newXmlPullParser(); + XmlPullParser xp = XmlPullParserFactory.newInstance().newPullParser(); xp.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true); xp.setInput(is, null); envelope.parse(xp); @@ -141,13 +139,13 @@ abstract public class Transport { * Serializes the request. */ protected byte[] createRequestData(SoapEnvelope envelope, String encoding) - throws IOException { + throws XmlPullParserException, IOException { ByteArrayOutputStream bos = new ByteArrayOutputStream(bufferLength); byte result[] = null; bos.write(xmlVersionTag.getBytes()); - // Android-changed: Use XmlObjectFactory instead of a specific implementation. + // Android-changed: Use XmlPullParserFactory instead of a specific implementation. // XmlSerializer xw = new KXmlSerializer(); - XmlSerializer xw = XmlObjectFactory.newXmlSerializer(); + XmlSerializer xw = XmlPullParserFactory.newInstance().newSerializer(); final Iterator keysIter = prefixes.keySet().iterator(); xw.setOutput(bos, encoding); @@ -170,7 +168,7 @@ abstract public class Transport { * Serializes the request. */ protected byte[] createRequestData(SoapEnvelope envelope) - throws IOException { + throws XmlPullParserException, IOException { return createRequestData(envelope, null); } |