diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-01-10 04:49:25 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-01-10 04:49:25 +0000 |
| commit | bb9a83736142b39ee30f74a36e0cf53902225376 (patch) | |
| tree | adefb55004ccdc897f9e4e9870635aff4ae69742 | |
| parent | 5cf8b90c2775c1e9a0307479a90a627dd8782835 (diff) | |
| parent | b1dc5dfc5e753cfe5e7249dc967deb1e441be8f2 (diff) | |
| download | telephony-android13-d4-s1-release.tar.gz | |
Merge cherrypicks of ['ag/20889245'] into tm-d4-release.android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-release
Change-Id: I3b8f6101accdcde6b12ecadd7a6965055c62300c
| -rw-r--r-- | src/java/com/android/internal/telephony/VisualVoicemailSmsFilter.java | 3 |
1 files changed, 2 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 |