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

Commit eabfd15c authored by Jake Hamby's avatar Jake Hamby Committed by Gerrit Code Review
Browse files

Merge "Telephony: Don't ack CB messages"

parents dc446013 bb8277c9

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

+14 −9
Original line number Diff line number Diff line
@@ -1428,6 +1428,10 @@ public abstract class SMSDispatcher extends Handler { 
    private final BroadcastReceiver mResultReceiver = new BroadcastReceiver() {

        @Override

        public void onReceive(Context context, Intent intent) {

            if (intent.getAction().equals(Intents.SMS_CB_RECEIVED_ACTION) ||

                    intent.getAction().equals(Intents.SMS_EMERGENCY_CB_RECEIVED_ACTION)) {

                // Ignore this intent. Apps will process it.

            } else {

                // Assume the intent is one of the SMS receive intents that

                // was sent as an ordered broadcast. Check result and ACK.

                int rc = getResultCode();
@@ -1438,6 +1442,7 @@ public abstract class SMSDispatcher extends Handler { 
                // Previous parts were ACK'd as they were received.

                acknowledgeLastIncomingSms(success, rc, null);

            }

        }

    };



    protected void dispatchBroadcastMessage(SmsCbMessage message) {