Skip to content

Commit 40e2beb

Browse files
committed
Merge tag 'LA.UM.8.12.r1-14200-sm8250.0' of https://source.codeaurora.org/quic/la/platform/frameworks/base into HEAD
"LA.UM.8.12.r1-14200-sm8250.0" Change-Id: If1d48715ea72fbac76cfd47ad56d89508def5f4a
2 parents dcc21a8 + 06bfb4c commit 40e2beb

File tree

3 files changed

+4
-0
lines changed

3 files changed

+4
-0
lines changed

services/core/java/com/android/server/wm/ActivityRecord.java

100644100755
File mode changed.

services/core/java/com/android/server/wm/ActivityStackSupervisor.java

100644100755
File mode changed.

telephony/java/com/android/internal/telephony/gsm/GsmSmsCbMessage.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -362,6 +362,10 @@ private static Pair<String, String> unpackBody(byte[] pdu, int offset, int lengt
362362
}
363363
break;
364364

365+
case SmsConstants.ENCODING_8BIT:
366+
body = GsmAlphabet.gsm8BitUnpackedToString(pdu, offset, length);
367+
break;
368+
365369
case SmsConstants.ENCODING_16BIT:
366370
if (dcs.hasLanguageIndicator && pdu.length >= offset + 2) {
367371
// Language is two GSM characters.

0 commit comments

Comments
 (0)