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

Commit 88973071 authored by Taesu Lee's avatar Taesu Lee Committed by android-build-merger
Browse files

Merge "Check valid bits only for EF_SMS status" am: fe6b2a07 am: dde22e76... 

Merge "Check valid bits only for EF_SMS status" am: fe6b2a07 am: dde22e76 am: 33386c3a am: 06bd72d8
am: 9ff487f9

Change-Id: Ie00bf2c3e49ad2a24feaaf97b9bea16b0f19f822
parents 52e65c14 9ff487f9

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

+12 −12
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ public class IccSmsInterfaceManager { 


        for (int i = 0; i < count; i++) {

            byte[] ba = messages.get(i);

             if (ba[0] == STATUS_ON_ICC_UNREAD) {

            if ((ba[0] & 0x07) == STATUS_ON_ICC_UNREAD) {

                int n = ba.length;

                byte[] nba = new byte[n - 1];

                System.arraycopy(ba, 1, nba, 0, n - 1);
@@ -785,7 +785,7 @@ public class IccSmsInterfaceManager { 
        }



        // Status bits for this record.  See TS 51.011 10.5.3

        data[0] = (byte)(status & 7);

        data[0] = (byte) (status & 0x07);



        System.arraycopy(pdu, 0, data, 1, pdu.length);