summaryrefslogtreecommitdiff
path: root/InCallUI
diff options
context:
space:
mode:
authorNancy Chen <nancychen@google.com>2015-12-08 16:50:34 -0800
committerNancy Chen <nancychen@google.com>2015-12-08 16:50:34 -0800
commit1a2cc46c3a4681d56c1d9a44d11725304980437b (patch)
tree75a067451767056a3df1e9af80bdc2af0aada52e /InCallUI
parenta7086bc66eca9bbae80fb40ec532b3253361ee53 (diff)
Ignore check for phone accounts when making call from pre-MSIM device.
Since Lollipop and before we don't have phone accounts, we can't check if we have a valid phone account before making a call, so ignore this check. Bug: 25776171 Change-Id: If4266029cadaf95bcd7a52dd49f4d27db9eda964
Diffstat (limited to 'InCallUI')
-rw-r--r--InCallUI/src/com/android/incallui/InCallActivity.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java
index 2eab7d396..db032e23a 100644
--- a/InCallUI/src/com/android/incallui/InCallActivity.java
+++ b/InCallUI/src/com/android/incallui/InCallActivity.java
@@ -51,6 +51,7 @@ import android.view.animation.Animation;
import android.view.animation.AnimationUtils;
import com.android.contacts.common.activity.TransactionSafeActivity;
+import com.android.contacts.common.compat.CompatUtils;
import com.android.contacts.common.interactions.TouchPointManager;
import com.android.contacts.common.widget.SelectPhoneAccountDialogFragment;
import com.android.contacts.common.widget.SelectPhoneAccountDialogFragment.SelectPhoneAccountListener;
@@ -594,8 +595,10 @@ public class InCallActivity extends TransactionSafeActivity implements FragmentD
InCallPresenter.getInstance());
// InCallActivity is responsible for disconnecting a new outgoing call if there
- // is no way of making it (i.e. no valid call capable accounts)
- if (InCallPresenter.isCallWithNoValidAccounts(call)) {
+ // is no way of making it (i.e. no valid call capable accounts).
+ // If the version is not MSIM compatible, then ignore this code.
+ if (CompatUtils.isMSIMCompatible()
+ && InCallPresenter.isCallWithNoValidAccounts(call)) {
TelecomAdapter.getInstance().disconnectCall(call.getId());
}