diff options
author | Jack Yu <jackyu@google.com> | 2023-07-21 20:43:30 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-07-21 20:43:30 +0000 |
commit | f0f900a6de6c887635dc64aac955f1d035c3f932 (patch) | |
tree | 62d3115f80ea08fed442f9ada1e5fcb03097d956 | |
parent | 16fd7aefdbdb6229913a6c18b1bc469cfd053abb (diff) | |
parent | ed364302f9aa17dcc8df08b9543096f579adc542 (diff) | |
download | service_entitlement-f0f900a6de6c887635dc64aac955f1d035c3f932.tar.gz |
Support case-insensitive TS.43 XML response param names am: 6a10ad1c15 am: ed364302f9
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/2670279
Change-Id: I80f826cf73168655dae1a900791c44e13d14151e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | java/com/android/libraries/entitlement/utils/Ts43XmlDoc.java | 5 |
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); } |