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

Commit 00564c81 authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by Automerger Merge Worker
Browse files

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

Merge "Fix bug that we use the return value of bind service incorrectly." am: 85399462 am: 675a81b7

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1493879

Change-Id: I5bf0f36bc89c72abe38457b64048ce9c325c1464
parents 3b0ebf36 675a81b7

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

+2 −2
Original line number Diff line number Diff line
@@ -365,7 +365,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(
@@ -561,7 +561,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(