commit 707acc550b84f14800b5387be02b29265bc80b5b
author Chi Zhang <czhangsd@google.com> Sat Jan 07 03:48:50 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jan 07 03:48:50 2023 +0000
tree a4e7510e399a6a97281fb4f3631062cc66bd0424
parent 9883f7ebb7033a9583bdf1974bccae07263e7d37
parent 66fd8d1e5ef2ce211e44696be2dd25b39cf8c6ac

Merge "Add NR bands to service state." into tm-qpr-dev

src/java/com/android/internal/telephony/VisualVoicemailSmsFilter.java

diff --git a/src/java/com/android/internal/telephony/VisualVoicemailSmsFilter.java b/src/java/com/android/internal/telephony/VisualVoicemailSmsFilter.java
index 1934136..0b10651 100644
--- a/src/java/com/android/internal/telephony/VisualVoicemailSmsFilter.java
+++ b/src/java/com/android/internal/telephony/VisualVoicemailSmsFilter.java
@@ -305,7 +305,8 @@
              * 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