Support case-insensitive TS.43 XML response param names am: 6a10ad1c15 am: ed364302f9 am: f0f900a6de am: 679df5c990

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/2670279

Change-Id: Ib5b5da4a8a4268dec153a81a6e91ab0afaae2007
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/java/com/android/libraries/entitlement/utils/Ts43XmlDoc.java b/java/com/android/libraries/entitlement/utils/Ts43XmlDoc.java
index 8ad57a4..ec6910c 100644
--- a/java/com/android/libraries/entitlement/utils/Ts43XmlDoc.java
+++ b/java/com/android/libraries/entitlement/utils/Ts43XmlDoc.java
@@ -35,6 +35,7 @@ import java.io.IOException;
 import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 
@@ -155,7 +156,7 @@ public final class Ts43XmlDoc {
     public String get(ImmutableList<String> characteristicTypes, String parameterName) {
         Map<String, String> parmMap = mCharacteristicsMap.get(
                 TextUtils.join("|", characteristicTypes));
-        return parmMap == null ? null : parmMap.get(parameterName);
+        return parmMap == null ? null : parmMap.get(parameterName.toLowerCase(Locale.ROOT));
     }
 
     /**
@@ -215,7 +216,7 @@ public final class Ts43XmlDoc {
             Map<String, String> parmMap =
                     mCharacteristicsMap.getOrDefault(characteristicKey, new ArrayMap<>());
             parmMap.put(
-                    Objects.requireNonNull(parmNameNode.getNodeValue()),
+                    Objects.requireNonNull(parmNameNode.getNodeValue().toLowerCase(Locale.ROOT)),
                     Objects.requireNonNull(parmValueNode.getNodeValue()));
             mCharacteristicsMap.put(characteristicKey, parmMap);
         }