diff options
Diffstat (limited to 'src/com/android/messaging/util')
| -rw-r--r-- | src/com/android/messaging/util/PhoneUtils.java | 4 | ||||
| -rw-r--r-- | src/com/android/messaging/util/UiUtils.java | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/com/android/messaging/util/PhoneUtils.java b/src/com/android/messaging/util/PhoneUtils.java index 1eb410c..2ba735b 100644 --- a/src/com/android/messaging/util/PhoneUtils.java +++ b/src/com/android/messaging/util/PhoneUtils.java @@ -571,9 +571,7 @@ public abstract class PhoneUtils { @Override public boolean getHasPreferredSmsSim() { - return getDefaultSmsSubscriptionId() != ParticipantData.DEFAULT_SELF_SUB_ID - || (sOverrideSendingSubId != ParticipantData.DEFAULT_SELF_SUB_ID - && SmsManager.getDefault().isSMSPromptEnabled()); + return getDefaultSmsSubscriptionId() != ParticipantData.DEFAULT_SELF_SUB_ID; } @Override diff --git a/src/com/android/messaging/util/UiUtils.java b/src/com/android/messaging/util/UiUtils.java index 84fe353..6ff01ba 100644 --- a/src/com/android/messaging/util/UiUtils.java +++ b/src/com/android/messaging/util/UiUtils.java @@ -46,6 +46,7 @@ import android.widget.Toast; import com.android.messaging.Factory; import com.android.messaging.R; +import com.android.messaging.datamodel.data.ParticipantData; import com.android.messaging.ui.SnackBar; import com.android.messaging.ui.SnackBar.Placement; import com.android.messaging.ui.conversationlist.ConversationListActivity; @@ -334,9 +335,9 @@ public class UiUtils { // Supports SMS? // Has a preferred sim? // Is the default sms app? - return phoneUtils.isSmsCapable() && - phoneUtils.getHasPreferredSmsSim() && - phoneUtils.isDefaultSmsApp(); + return phoneUtils.isSmsCapable() && phoneUtils.isDefaultSmsApp() && + (phoneUtils.getHasPreferredSmsSim() || PhoneUtils.getOverrideSendingSubId() + != ParticipantData.DEFAULT_SELF_SUB_ID); } /* |