summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrandon Maxwell <maxwelb@google.com>2016-01-20 17:05:09 -0800
committerBrandon Maxwell <maxwelb@google.com>2016-01-20 17:05:09 -0800
commit3917ad157ba21d024ec3232c9891f1f0a170bcaf (patch)
tree214e323c7d12f8e6b7233c3cbae0b52c4b39448e
parent7f07f9f6f1e209359cf069b1fa4b0dfc0b371f64 (diff)
Hiding addCall button while the device is fbe locked
Bug=26543932 Change-Id: I37c46404f20d16c91ab391c14b7f2d2cb5528630
-rw-r--r--InCallUI/src/com/android/incallui/CallButtonPresenter.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/InCallUI/src/com/android/incallui/CallButtonPresenter.java b/InCallUI/src/com/android/incallui/CallButtonPresenter.java
index 7e5f7c63f..34298c3fa 100644
--- a/InCallUI/src/com/android/incallui/CallButtonPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallButtonPresenter.java
@@ -35,6 +35,7 @@ import android.telecom.VideoProfile;
import com.android.contacts.common.compat.SdkVersionOverride;
import com.android.dialer.compat.CallAudioStateCompat;
+import com.android.dialer.compat.UserManagerCompat;
import com.android.incallui.AudioModeProvider.AudioModeListener;
import com.android.incallui.InCallCameraManager.Listener;
import com.android.incallui.InCallPresenter.CanAddCallListener;
@@ -378,7 +379,8 @@ public class CallButtonPresenter extends Presenter<CallButtonPresenter.CallButto
&& call.can(android.telecom.Call.Details.CAPABILITY_HOLD);
final boolean isCallOnHold = call.getState() == Call.State.ONHOLD;
- final boolean showAddCall = TelecomAdapter.getInstance().canAddCall(call);
+ final boolean showAddCall = TelecomAdapter.getInstance().canAddCall(call)
+ && UserManagerCompat.isUserUnlocked(ui.getContext());
final boolean showMerge = call.can(
android.telecom.Call.Details.CAPABILITY_MERGE_CONFERENCE);
final boolean showUpgradeToVideo = !isVideo && hasVideoCallCapabilities(call);