diff options
author | Roman Birg <roman@cyngn.com> | 2016-05-17 19:41:49 -0700 |
---|---|---|
committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-05-19 13:44:11 -0700 |
commit | 5cf15dbeefa4471ff6a108e89fdcfd28963ba18b (patch) | |
tree | 806776d8f0f69c43e94e4c32d5de2123b9b4f523 /src/com/android/messaging | |
parent | 916516868183d8ac427ed5f7e7a614580f1fb653 (diff) | |
download | android_packages_apps_Messaging-5cf15dbeefa4471ff6a108e89fdcfd28963ba18b.tar.gz android_packages_apps_Messaging-5cf15dbeefa4471ff6a108e89fdcfd28963ba18b.tar.bz2 android_packages_apps_Messaging-5cf15dbeefa4471ff6a108e89fdcfd28963ba18b.zip |
Messaging: handle single sim MSIM device
We don't need to always prompt if the user has one sim in a multi sim
device.
Ticket: CYNGNOS-2185, CYNGNOS-2570
Change-Id: I601d62f2df8952a97a50a43592d49ab5176010f1
Signed-off-by: Roman Birg <roman@cyngn.com>
Diffstat (limited to 'src/com/android/messaging')
-rw-r--r-- | src/com/android/messaging/ui/conversation/ComposeMessageView.java | 4 | ||||
-rw-r--r-- | src/com/android/messaging/util/PhoneUtils.java | 4 | ||||
-rw-r--r-- | src/com/android/messaging/util/UiUtils.java | 7 |
3 files changed, 7 insertions, 8 deletions
diff --git a/src/com/android/messaging/ui/conversation/ComposeMessageView.java b/src/com/android/messaging/ui/conversation/ComposeMessageView.java index 9bcd00e..20d1564 100644 --- a/src/com/android/messaging/ui/conversation/ComposeMessageView.java +++ b/src/com/android/messaging/ui/conversation/ComposeMessageView.java @@ -244,8 +244,8 @@ public class ComposeMessageView extends LinearLayout } private boolean isSMSPromptEnabled() { - return (TelephonyManager.getDefault().getPhoneCount() > 1) && - SmsManager.getDefault().isSMSPromptEnabled(); + return PhoneUtils.getDefault().getActiveSubscriptionCount() > 1 && + !PhoneUtils.getDefault().getHasPreferredSmsSim(); } @Override 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); } /* |