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

Commit 2062fd16 authored by Hall Liu's avatar Hall Liu Committed by Android (Google) Code Review
Browse files

Merge "Follow CarrierMessagingServiceWrapper changes"

parents 48df89d3 c8ca347e

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

+1 −1
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ public class CarrierServicesSmsFilter { 
            // is run afterwards, we should not follow through

            if (!mIsOnFilterCompleteCalled) {

                mIsOnFilterCompleteCalled = true;

                mCarrierMessagingServiceWrapper.disposeConnection(mContext);

                mCarrierMessagingServiceWrapper.disconnect();

                mFilterAggregator.onFilterComplete(result);

            }

        }

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

+2 −2
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ public abstract class SMSDispatcher extends Handler { 
            checkCallerIsPhoneOrCarrierApp();

            final long identity = Binder.clearCallingIdentity();

            try {

                mSmsSender.mCarrierMessagingServiceWrapper.disposeConnection(mContext);

                mSmsSender.mCarrierMessagingServiceWrapper.disconnect();

                processSendSmsResponse(mSmsSender.mTracker, result, messageRef);

            } finally {

                Binder.restoreCallingIdentity(identity);
@@ -621,7 +621,7 @@ public abstract class SMSDispatcher extends Handler { 
         */

        @Override

        public void onSendMultipartSmsComplete(int result, int[] messageRefs) {

            mSmsSender.mCarrierMessagingServiceWrapper.disposeConnection(mContext);

            mSmsSender.mCarrierMessagingServiceWrapper.disconnect();



            if (mSmsSender.mTrackers == null) {

                Rlog.e(TAG, "Unexpected onSendMultipartSmsComplete call with null trackers.");