diff options
author | Nancy Chen <nancychen@google.com> | 2015-12-10 19:51:00 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-12-10 19:51:00 -0800 |
commit | db84963c79ceae857d4f350c9c4694437c8e31c7 (patch) | |
tree | f16afc2ccb90254e7c430e053d455009bbdd273f /InCallUI | |
parent | 1749e34811f0095ac5a31ebb7932ef76b74a8bf7 (diff) | |
parent | 0f82dee1922517bd68d1f8cb024fcd219c740af8 (diff) |
Merge changes Iedc86109,If4266029 into ub-contactsdialer-b-dev
am: 7adfa41bc9
* commit '7adfa41bc9bbbb6d768e8862251d39d85b8c5c82':
Switch from DialerCompatUtils to CompatUtils for video calling.
Ignore check for phone accounts when making call from pre-MSIM device.
Diffstat (limited to 'InCallUI')
-rw-r--r-- | InCallUI/src/com/android/incallui/InCallActivity.java | 7 | ||||
-rw-r--r-- | InCallUI/src/com/android/incallui/VideoCallPresenter.java | 10 | ||||
-rw-r--r-- | InCallUI/src/com/android/incallui/VideoUtils.java | 8 |
3 files changed, 14 insertions, 11 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()); } diff --git a/InCallUI/src/com/android/incallui/VideoCallPresenter.java b/InCallUI/src/com/android/incallui/VideoCallPresenter.java index 621c699a9..9f1f8f89c 100644 --- a/InCallUI/src/com/android/incallui/VideoCallPresenter.java +++ b/InCallUI/src/com/android/incallui/VideoCallPresenter.java @@ -32,7 +32,7 @@ import android.view.Surface; import android.widget.ImageView; import com.android.contacts.common.ContactPhotoManager; -import com.android.dialer.compat.DialerCompatUtils; +import com.android.contacts.common.compat.CompatUtils; import com.android.incallui.InCallPresenter.InCallDetailsListener; import com.android.incallui.InCallPresenter.InCallOrientationListener; import com.android.incallui.InCallPresenter.InCallStateListener; @@ -224,7 +224,7 @@ public class VideoCallPresenter extends Presenter<VideoCallPresenter.VideoCallUi // Do not register any listeners if video calling is not compatible to safeguard against // any accidental calls of video calling code. - if (!DialerCompatUtils.isVideoCompatible()) { + if (!CompatUtils.isVideoCompatible()) { return; } @@ -255,7 +255,7 @@ public class VideoCallPresenter extends Presenter<VideoCallPresenter.VideoCallUi super.onUiUnready(ui); Log.d(this, "onUiUnready:"); - if (!DialerCompatUtils.isVideoCompatible()) { + if (!CompatUtils.isVideoCompatible()) { return; } @@ -781,7 +781,7 @@ public class VideoCallPresenter extends Presenter<VideoCallPresenter.VideoCallUi * @return {@code true} if the incoming video surface should be shown, {@code false} otherwise. */ public static boolean showIncomingVideo(int videoState, int callState) { - if (!DialerCompatUtils.isVideoCompatible()) { + if (!CompatUtils.isVideoCompatible()) { return false; } @@ -800,7 +800,7 @@ public class VideoCallPresenter extends Presenter<VideoCallPresenter.VideoCallUi * otherwise. */ public static boolean showOutgoingVideo(int videoState) { - if (!DialerCompatUtils.isVideoCompatible()) { + if (!CompatUtils.isVideoCompatible()) { return false; } diff --git a/InCallUI/src/com/android/incallui/VideoUtils.java b/InCallUI/src/com/android/incallui/VideoUtils.java index 73eb3a990..8641d60ec 100644 --- a/InCallUI/src/com/android/incallui/VideoUtils.java +++ b/InCallUI/src/com/android/incallui/VideoUtils.java @@ -18,7 +18,7 @@ package com.android.incallui; import android.telecom.VideoProfile; -import com.android.dialer.compat.DialerCompatUtils; +import com.android.contacts.common.compat.CompatUtils; import com.google.common.base.Preconditions; @@ -29,7 +29,7 @@ public class VideoUtils { } public static boolean isVideoCall(int videoState) { - if (!DialerCompatUtils.isVideoCompatible()) { + if (!CompatUtils.isVideoCompatible()) { return false; } @@ -38,7 +38,7 @@ public class VideoUtils { } public static boolean isBidirectionalVideoCall(Call call) { - if (!DialerCompatUtils.isVideoCompatible()) { + if (!CompatUtils.isVideoCompatible()) { return false; } @@ -67,7 +67,7 @@ public class VideoUtils { } public static boolean isAudioCall(Call call) { - if (!DialerCompatUtils.isVideoCompatible()) { + if (!CompatUtils.isVideoCompatible()) { return true; } |