Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903

Bug: 166295507
Merged-In: Iaca4fd52da6ff744f745bb835a1f58b9091063c5
Change-Id: I03454d7328b0c1fe58206f6dbb8dab3a6d5337f1

2 files changed, 7 insertions, 8 deletions

diff --git a/Android.bp b/Android.bp
index 2ac1227..2075b81 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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);
     }