commit e8b7032e0c7c4fbb834f8bda9e5823bd8d32ada0
author Brandon Maxwell <maxwelb@google.com> Thu Jan 21 22:55:41 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 21 22:55:41 2016 +0000
tree db8858394ffc763ce42f768dde111eff9784e174
parent d05ac12ca3e94a52afbe31fe01f83b817eebea85
parent 3917ad157ba21d024ec3232c9891f1f0a170bcaf

Merge "Hiding addCall button while the device is fbe locked" into ub-contactsdialer-b-dev

InCallUI/src/com/android/incallui/CallButtonPresenter.java

diff --git a/InCallUI/src/com/android/incallui/CallButtonPresenter.java b/InCallUI/src/com/android/incallui/CallButtonPresenter.java
index 7e5f7c6..34298c3 100644
--- a/InCallUI/src/com/android/incallui/CallButtonPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallButtonPresenter.java
@@ -35,6 +35,7 @@
 
 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 @@
                 && 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);