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

Commit 19658e9f authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by Android (Google) Code Review
Browse files

Merge "Fix bug that we use the return value of bind service incorrectly."

parents 1e2822c3 3b12a1da

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

+2 −2
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ public abstract class SMSDispatcher extends Handler { 
        public void sendSmsByCarrierApp(String carrierPackageName,

                                        SmsSenderCallback senderCallback) {

            mSenderCallback = senderCallback;

            if (mCarrierMessagingServiceWrapper.bindToCarrierMessagingService(

            if (!mCarrierMessagingServiceWrapper.bindToCarrierMessagingService(

                    mContext, carrierPackageName, ()->onServiceReady())) {

                Rlog.e(TAG, "bindService() for carrier messaging service failed");

                mSenderCallback.onSendSmsComplete(
@@ -562,7 +562,7 @@ public abstract class SMSDispatcher extends Handler { 
        void sendSmsByCarrierApp(String carrierPackageName,

                                 MultipartSmsSenderCallback senderCallback) {

            mSenderCallback = senderCallback;

            if (mCarrierMessagingServiceWrapper.bindToCarrierMessagingService(

            if (!mCarrierMessagingServiceWrapper.bindToCarrierMessagingService(

                    mContext, carrierPackageName, ()->onServiceReady())) {

                Rlog.e(TAG, "bindService() for carrier messaging service failed");

                mSenderCallback.onSendMultipartSmsComplete(