diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-01-07 22:26:01 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-01-07 22:26:01 +0000 |
| commit | ae97818df54d1b38ba03ea66b589f1df5f9265e8 (patch) | |
| tree | a4e7510e399a6a97281fb4f3631062cc66bd0424 | |
| parent | d6724a7309cb249e6c7d790aec39b73f7603ad97 (diff) | |
| parent | 707acc550b84f14800b5387be02b29265bc80b5b (diff) | |
| download | telephony-ae97818df54d1b38ba03ea66b589f1df5f9265e8.tar.gz | |
Snap for 9465878 from 707acc550b84f14800b5387be02b29265bc80b5b to tm-qpr2-release
Change-Id: I9a9a50aed30c3200b5946f26f80249ae9f263427
| -rw-r--r-- | src/java/com/android/internal/telephony/VisualVoicemailSmsFilter.java | 3 | ||||
| -rw-r--r-- | src/java/com/android/internal/telephony/metrics/ServiceStateStats.java | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/java/com/android/internal/telephony/VisualVoicemailSmsFilter.java b/src/java/com/android/internal/telephony/VisualVoicemailSmsFilter.java index 1934136fc9..0b1065160e 100644 --- a/src/java/com/android/internal/telephony/VisualVoicemailSmsFilter.java +++ b/src/java/com/android/internal/telephony/VisualVoicemailSmsFilter.java @@ -305,7 +305,8 @@ public class VisualVoicemailSmsFilter { * received message. However, the message is most likely encoded with UTF-8. Therefore, * we need to retry decoding the received message with UTF-8. */ - if ((body == null || message.getReceivedEncodingType() == ENCODING_8BIT) + if ((body == null || (message.is3gpp() + && message.getReceivedEncodingType() == ENCODING_8BIT)) && message.getUserData() != null) { Log.d(TAG, "getFullMessage decode using UTF-8"); // Attempt to interpret the user data as UTF-8. UTF-8 string over data SMS using diff --git a/src/java/com/android/internal/telephony/metrics/ServiceStateStats.java b/src/java/com/android/internal/telephony/metrics/ServiceStateStats.java index 263399ed69..9d9088eee1 100644 --- a/src/java/com/android/internal/telephony/metrics/ServiceStateStats.java +++ b/src/java/com/android/internal/telephony/metrics/ServiceStateStats.java @@ -195,6 +195,9 @@ public class ServiceStateStats { case TelephonyManager.NETWORK_TYPE_LTE_CA: band = AccessNetworkUtils.getOperatingBandForEarfcn(chNumber); break; + case TelephonyManager.NETWORK_TYPE_NR: + band = AccessNetworkUtils.getOperatingBandForNrarfcn(chNumber); + break; default: Rlog.w(TAG, "getBand: unknown WWAN RAT " + rat); band = 0; |