From d53a425244958a124cf6f3d93cd97850efec3961 Mon Sep 17 00:00:00 2001 From: LibXZR Date: Sat, 12 Mar 2022 17:17:35 +0800 Subject: [PATCH] Messaging: Do not check preferred sim if conversation sim exist Fix unable to send message when preferred sms sim is set to "Ask every time". Change-Id: I0406985e29ded8157ae5252db2dd814856a93376 --- .../android/messaging/ui/conversation/ComposeMessageView.java | 4 +++- src/com/android/messaging/util/UiUtils.java | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/android/messaging/ui/conversation/ComposeMessageView.java b/src/com/android/messaging/ui/conversation/ComposeMessageView.java index c35927e..a8c1e4f 100644 --- a/src/com/android/messaging/ui/conversation/ComposeMessageView.java +++ b/src/com/android/messaging/ui/conversation/ComposeMessageView.java @@ -68,6 +68,7 @@ import com.android.messaging.util.ContentType; import com.android.messaging.util.LogUtil; import com.android.messaging.util.MediaUtil; import com.android.messaging.util.OsUtil; +import com.android.messaging.util.PhoneUtils; import com.android.messaging.util.SafeAsyncTask; import com.android.messaging.util.UiUtils; import com.android.messaging.util.UriUtil; @@ -381,7 +382,8 @@ public class ComposeMessageView extends LinearLayout return; } // Check the host for pre-conditions about any action. - if (mHost.isReadyForAction()) { + if (mHost.isReadyForAction() && (mHost.getConversationSelfSubId() > 0 + || PhoneUtils.getDefault().getHasPreferredSmsSim())) { mInputManager.showHideSimSelector(false /* show */, true /* animate */); final String messageToSend = mComposeEditText.getText().toString(); mBinding.getData().setMessageText(messageToSend); diff --git a/src/com/android/messaging/util/UiUtils.java b/src/com/android/messaging/util/UiUtils.java index 236de32..d77e945 100644 --- a/src/com/android/messaging/util/UiUtils.java +++ b/src/com/android/messaging/util/UiUtils.java @@ -342,10 +342,8 @@ public class UiUtils { // Have all the conditions been met: // Supports SMS? - // Has a preferred sim? // Is the default sms app? return phoneUtils.isSmsCapable() && - phoneUtils.getHasPreferredSmsSim() && phoneUtils.isDefaultSmsApp(); }