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

Commit 0c281de3 authored by Amit Mahajan's avatar Amit Mahajan Committed by Android (Google) Code Review
Browse files

Merge "Avoid carrier/system SMS filter if pdu(s) is null." into nyc-dev

parents 0a0852c2 fc215017

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

+10 −1
Original line number Diff line number Diff line
@@ -880,6 +880,15 @@ public abstract class InboundSmsHandler extends StateMachine { 
     */

    private boolean filterSmsWithCarrierOrSystemApp(byte[][] pdus, int destPort,

        InboundSmsTracker tracker, SmsBroadcastReceiver resultReceiver, boolean userUnlocked) {

        // Do not send null pdu(s) to CarrierSmsFilter. Check for that and return false in that case

        List<byte[]> pduList = Arrays.asList(pdus);

        if (pduList == null || pduList.size() == 0 || pduList.contains(null)) {

            loge("filterSmsWithCarrierOrSystemApp: Bypassing carrier/system sms filter due to " +

                    (pduList == null ? "pduList == null" : (pduList.size() == 0 ?

                            "pduList.size() == 0" : "pduList.contains(null)")));

            return false;

        }



        List<String> carrierPackages = null;

        UiccCard card = UiccController.getInstance().getUiccCard(mPhone.getPhoneId());

        if (card != null) {