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

Commit 1c26f71f authored by Arc Wang's avatar Arc Wang Committed by Gerrit Code Review
Browse files

Merge "Only check the least bit of status byte for EF_SMS free space"

parents f6d96344 fe2de617

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

+2 −2
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ public class IccSmsInterfaceManager { 
            mSuccess = false;

            Message response = mHandler.obtainMessage(EVENT_UPDATE_DONE);



            if (status == STATUS_ON_ICC_FREE) {

            if ((status & 0x01) == STATUS_ON_ICC_FREE) {

                // RIL_REQUEST_DELETE_SMS_ON_SIM vs RIL_REQUEST_CDMA_DELETE_SMS_ON_RUIM

                // Special case FREE: call deleteSmsOnSim/Ruim instead of

                // manipulating the record
@@ -741,7 +741,7 @@ public class IccSmsInterfaceManager { 


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

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

            if (ba[0] == STATUS_ON_ICC_FREE) {

            if ((ba[0] & 0x01) == STATUS_ON_ICC_FREE) {

                ret.add(null);

            } else {

                ret.add(new SmsRawData(messages.get(i)));