Fix the status of tuple cannot be parsed because there are some whitespace characters before the Basic tag

Bug: 186075898
Test: atest RcsUceAdapterTest; atest PidfParserTest
Change-Id: I05b3f461d8e6ab0025df5230f8c4b97fee8f024d

2 files changed, 15 insertions, 2 deletions

diff --git a/src/java/com/android/ims/rcs/uce/presence/pidfparser/pidf/Basic.java b/src/java/com/android/ims/rcs/uce/presence/pidfparser/pidf/Basic.java
index 49c0aa34..a4f487a6 100644
--- a/src/java/com/android/ims/rcs/uce/presence/pidfparser/pidf/Basic.java
+++ b/src/java/com/android/ims/rcs/uce/presence/pidfparser/pidf/Basic.java
@@ -17,8 +17,10 @@
 package com.android.ims.rcs.uce.presence.pidfparser.pidf;
 
 import android.annotation.StringDef;
+import android.util.Log;
 
 import com.android.ims.rcs.uce.presence.pidfparser.ElementBase;
+import com.android.ims.rcs.uce.util.UceUtils;
 
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
@@ -32,6 +34,8 @@ import java.lang.annotation.RetentionPolicy;
  * The "basic" element of the pidf.
  */
 public class Basic extends ElementBase {
+    private static final String LOG_TAG = UceUtils.getLogPrefix() + "Basic";
+
     /** The name of this element */
     public static final String ELEMENT_NAME = "basic";
 
@@ -104,6 +108,8 @@ public class Basic extends ElementBase {
             } else {
                 mBasic = null;
             }
+        } else {
+            Log.d(LOG_TAG, "The eventType is not TEXT=" + eventType);
         }
 
         // Move to the end tag.
diff --git a/src/java/com/android/ims/rcs/uce/presence/pidfparser/pidf/Status.java b/src/java/com/android/ims/rcs/uce/presence/pidfparser/pidf/Status.java
index 988a1a73..92ad5d68 100644
--- a/src/java/com/android/ims/rcs/uce/presence/pidfparser/pidf/Status.java
+++ b/src/java/com/android/ims/rcs/uce/presence/pidfparser/pidf/Status.java
@@ -16,7 +16,10 @@
 
 package com.android.ims.rcs.uce.presence.pidfparser.pidf;
 
+import android.util.Log;
+
 import com.android.ims.rcs.uce.presence.pidfparser.ElementBase;
+import com.android.ims.rcs.uce.util.UceUtils;
 
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
@@ -28,6 +31,8 @@ import java.io.IOException;
  * The "status" element of the pidf.
  */
 public class Status extends ElementBase {
+    private static final String LOG_TAG = UceUtils.getLogPrefix() + "Status";
+
     /** The name of this element */
     public static final String ELEMENT_NAME = "status";
 
@@ -76,14 +81,16 @@ public class Status extends ElementBase {
             throw new XmlPullParserException("Incorrect element: " + namespace + ", " + name);
         }
 
-        // Move to the next event to get the Basic tag.
-        int eventType = parser.next();
+        // Move to the next tag to get the Basic element.
+        int eventType = parser.nextTag();
 
         // Get the value if the event type is text.
         if (eventType == XmlPullParser.START_TAG) {
             Basic basic = new Basic();
             basic.parse(parser);
             mBasic = basic;
+        } else {
+            Log.d(LOG_TAG, "The eventType is not START_TAG=" + eventType);
         }
 
         // Move to the end tag.