diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-01-10 04:49:19 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-01-10 04:49:19 +0000 |
commit | 5fe59f65b09e2d6b6658feab77b1b32de56f693a (patch) | |
tree | c00d955a0542110e65ac592b522aca3040f10a97 | |
parent | f06c2866c9c4df07f03886c4ad46cf56831d2500 (diff) | |
parent | 8680a83a7af6faf7c58b244670a060b74e3ae541 (diff) | |
download | cts-android13-d4-s2-release.tar.gz |
Merge cherrypicks of ['ag/20885781'] 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: I7f681393415a6770f5d39bac13765ed464342f68
-rw-r--r-- | tests/tests/telephony/current/src/android/telephony/cts/VisualVoicemailServiceTest.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/tests/telephony/current/src/android/telephony/cts/VisualVoicemailServiceTest.java b/tests/tests/telephony/current/src/android/telephony/cts/VisualVoicemailServiceTest.java index f77b879effe..f9691828646 100644 --- a/tests/tests/telephony/current/src/android/telephony/cts/VisualVoicemailServiceTest.java +++ b/tests/tests/telephony/current/src/android/telephony/cts/VisualVoicemailServiceTest.java @@ -532,7 +532,8 @@ public class VisualVoicemailServiceTest { for (SmsMessage message : messages) { String body = message.getMessageBody(); - if ((body == null || message.getReceivedEncodingType() == ENCODING_8BIT) + if ((body == null || (message.is3gpp() + && message.getReceivedEncodingType() == ENCODING_8BIT)) && message.getUserData() != null) { Log.d(TAG, "onReceive decode using UTF-8"); // Attempt to interpret the user data as UTF-8. UTF-8 string over data SMS using |