Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ee30d34 authored by Thomas Nguyen's avatar Thomas Nguyen Committed by Automerger Merge Worker
Browse files

Merge "Apply the fix for 8-bit decoding error to only 3gpp messages" am: 67fc3157 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2384898



Change-Id: I65dd0983ac590bfc1906bb65ffb57731ccf75280
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2990754d 67fc3157

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

+2 −1
Original line number Diff line number Diff line
@@ -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