From f03cfa66361936b0a444ebac3ef8ee6127229905 Mon Sep 17 00:00:00 2001 From: Stephen Bird Date: Fri, 22 Apr 2016 12:27:37 -0700 Subject: CallButtons: Prevent FRP bypass via the video calling option When OOBE is open, phone calls can be placed to the device. The incall dialog feature to change to a video call is exploitable via the dialogs that it creates. Check to ensure that the device is provisioned by us before showing this button. Ticket: CD-545 Change-Id: I49db4df359118a8ea4194b94abf9024fd32064d5 (cherry picked from commit 536b9f5beb1a7d367bd306c0c664ed5cc6f9ee1c) --- src/com/android/incallui/CallButtonPresenter.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/com/android/incallui/CallButtonPresenter.java b/src/com/android/incallui/CallButtonPresenter.java index cb7b6a03..648bf431 100644 --- a/src/com/android/incallui/CallButtonPresenter.java +++ b/src/com/android/incallui/CallButtonPresenter.java @@ -32,6 +32,7 @@ import android.os.Bundle; import android.os.Handler; import android.os.Looper; import android.os.ResultReceiver; +import android.provider.Settings; import android.telecom.CallAudioState; import android.telecom.InCallService.VideoCall; import android.telecom.PhoneAccount; @@ -61,6 +62,8 @@ import com.cyanogen.ambient.incall.extension.OriginCodes; import com.cyanogen.ambient.incall.extension.StatusCodes; import com.cyanogen.ambient.incall.extension.StartCallRequest; +import cyanogenmod.providers.CMSettings; + import java.util.List; import java.util.Objects; @@ -578,6 +581,13 @@ public class CallButtonPresenter extends Presenter