diff options
| author | Brandon Maxwell <maxwelb@google.com> | 2016-01-21 23:25:16 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-21 23:25:16 +0000 |
| commit | 9ece0c03ffd4ea0d8bb15e23bf2097a4d7422311 (patch) | |
| tree | 189ae2b8033709f2f3ad4bf98fbf93836d2046d6 /InCallUI/src | |
| parent | 5f732e5efab015dd1742016d2c1d61d0aa831194 (diff) | |
| parent | e8b7032e0c7c4fbb834f8bda9e5823bd8d32ada0 (diff) | |
Merge "Hiding addCall button while the device is fbe locked" into ub-contactsdialer-b-dev
am: 8a63fc40cb
* commit '8a63fc40cbd04c9f3d3ce8bffac8340f62d19ddb':
Hiding addCall button while the device is fbe locked
Diffstat (limited to 'InCallUI/src')
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallButtonPresenter.java | 4 |
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); |