commit 9883f7ebb7033a9583bdf1974bccae07263e7d37
author Thomas Nguyen <tnd@google.com> Thu Jan 05 17:16:54 2023 -0800
committer Sooraj Sasindran <sasindran@google.com> Sat Jan 07 00:53:20 2023 +0000
tree a996276e4fbb56e63fa2232073c23b554dc0c097
parent 94085d459dcd69eacbf6bb09f33bb11e958daad8

Apply the fix for 8-bit decoding error to only 3gpp messages

Bug: 262735040
Test: atest android.telephony.cts.VisualVoicemailServiceTest
            Verified with live test that voice mail is received

Change-Id: Icf64b668a11a1d7cb7b7c28b4937695ab8997929

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