commit | b879f6825cb4361b6459f9840ada80364d81593c | [log] [tgz] |
---|---|---|
author | Nathan Harold <nharold@google.com> | Thu Sep 05 17:26:21 2024 -0700 |
committer | Nathan Harold <nharold@google.com> | Thu Sep 05 20:18:56 2024 -0700 |
tree | b5f9ff7e0f612ac2fdad8cd8214ddbaed50ea19a | |
parent | 969c8e4d55b676a7ff16a14f3ec78fe734ebcb95 [diff] |
Set Data SPN to SPN when not overridden In order to allow applications to either always display the SPN or the data SPN in various contexts, override the Data SPN when it isn't otherwise provided. Bug: 358669494 Test: atest CarrierDisplayNameResolverTest Test: manually verified voice/messages/calling on Akita on P80481885 == AP3A.240905.013 + ag/29194106 Flag: EXEMPT bugfix Change-Id: Ia8353a8c4035898ce524ae76157ef2637fb68aa9
diff --git a/src/java/com/android/internal/telephony/cdnr/CarrierDisplayNameResolver.java b/src/java/com/android/internal/telephony/cdnr/CarrierDisplayNameResolver.java index 30e5aa1..3837790 100644 --- a/src/java/com/android/internal/telephony/cdnr/CarrierDisplayNameResolver.java +++ b/src/java/com/android/internal/telephony/cdnr/CarrierDisplayNameResolver.java
@@ -340,6 +340,7 @@ return new CarrierDisplayNameData.Builder() .setSpn(spn) + .setDataSpn(spn) .setShowSpn(showSpn) .setPlmn(plmn) .setShowPlmn(showPlmn)