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

Commit a0d3232d authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix a negative mPendingTrackerCount issue"

parents df132566 d69dc41f

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

+16 −5
Original line number Diff line number Diff line
@@ -127,7 +127,10 @@ public abstract class SMSDispatcher extends Handler { 
    static final int EVENT_SEND_CONFIRMED_SMS = 5; // accessed from inner class



    /** Don't send SMS (user did not confirm). */

    static final int EVENT_STOP_SENDING = 7;        // accessed from inner class

    static final int EVENT_STOP_SENDING = 6; // accessed from inner class



    /** Don't send SMS for this app (User had already denied eariler.) */

    static final int EVENT_SENDING_NOT_ALLOWED = 7;



    /** Confirmation required for third-party apps sending to an SMS short code. */

    private static final int EVENT_CONFIRM_SEND_TO_POSSIBLE_PREMIUM_SHORT_CODE = 8;
@@ -317,6 +320,16 @@ public abstract class SMSDispatcher extends Handler { 
            break;

        }



        case EVENT_SENDING_NOT_ALLOWED:

        {

            SmsTracker tracker = (SmsTracker) msg.obj;

            Rlog.d(TAG, "SMSDispatcher: EVENT_SENDING_NOT_ALLOWED - "

                    + "sending SHORT_CODE_NEVER_ALLOWED error code.");

            tracker.onFailed(

                    mContext, RESULT_ERROR_SHORT_CODE_NEVER_ALLOWED, 0 /*errorCode*/);

            break;

        }



        case EVENT_STOP_SENDING:

        {

            SmsTracker tracker = (SmsTracker) msg.obj;
@@ -1270,9 +1283,7 @@ public abstract class SMSDispatcher extends Handler { 


                case SmsUsageMonitor.PREMIUM_SMS_PERMISSION_NEVER_ALLOW:

                    Rlog.w(TAG, "User denied this app from sending to premium SMS");

                    Message msg = obtainMessage(EVENT_STOP_SENDING, tracker);

                    msg.arg1 = ConfirmDialogListener.SHORT_CODE_MSG;

                    msg.arg2 = ConfirmDialogListener.NEVER_ALLOW;

                    Message msg = obtainMessage(EVENT_SENDING_NOT_ALLOWED, tracker);

                    sendMessage(msg);

                    return false;   // reject this message