summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmruth Ramachandran <amruthr@google.com>2023-01-07 03:32:55 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2023-01-07 03:32:55 +0000
commitfea58811da97306a4364a83088bf10ae877100a3 (patch)
tree922e8108e83e90657b3070c66407827ca9e731dc
parentc96b452f8e15b52cc6ed2cc59a74868da9f8d73f (diff)
parentd438189d9d8b48ffa28bb798f4a14d270a239961 (diff)
downloadcts-fea58811da97306a4364a83088bf10ae877100a3.tar.gz
Merge "Apply the fix for 8-bit decoding error to only 3gpp messages" into tm-qpr-dev
-rw-r--r--tests/tests/telephony/current/src/android/telephony/cts/VisualVoicemailServiceTest.java3
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