diff options
| -rw-r--r-- | java/com/android/dialer/util/PermissionsUtil.java | 5 | ||||
| -rw-r--r-- | java/com/android/incallui/CallButtonPresenter.java | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/java/com/android/dialer/util/PermissionsUtil.java b/java/com/android/dialer/util/PermissionsUtil.java index 012b83ff1..6684f954b 100644 --- a/java/com/android/dialer/util/PermissionsUtil.java +++ b/java/com/android/dialer/util/PermissionsUtil.java @@ -36,6 +36,7 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.pm.PackageManager; import android.support.annotation.NonNull; +import android.support.annotation.VisibleForTesting; import android.support.v4.content.ContextCompat; import android.support.v4.content.LocalBroadcastManager; import android.widget.Toast; @@ -49,7 +50,9 @@ import java.util.List; /** Utility class to help with runtime permissions. */ public class PermissionsUtil { - private static final String PREFERENCE_CAMERA_ALLOWED_BY_USER = "camera_allowed_by_user"; + @VisibleForTesting + public static final String PREFERENCE_CAMERA_ALLOWED_BY_USER = "camera_allowed_by_user"; + private static final String PERMISSION_PREFERENCE = "dialer_permissions"; private static final String CEQUINT_PERMISSION = "com.cequint.ecid.CALLER_ID_LOOKUP"; diff --git a/java/com/android/incallui/CallButtonPresenter.java b/java/com/android/incallui/CallButtonPresenter.java index cc95f7b84..6b7eb9b4c 100644 --- a/java/com/android/incallui/CallButtonPresenter.java +++ b/java/com/android/incallui/CallButtonPresenter.java @@ -477,7 +477,8 @@ public class CallButtonPresenter mInCallButtonUi.showButton(InCallButtonIds.BUTTON_UPGRADE_TO_VIDEO, showUpgradeToVideo); mInCallButtonUi.showButton(InCallButtonIds.BUTTON_DOWNGRADE_TO_AUDIO, showDowngradeToAudio); mInCallButtonUi.showButton( - InCallButtonIds.BUTTON_SWITCH_CAMERA, isVideo && hasCameraPermission); + InCallButtonIds.BUTTON_SWITCH_CAMERA, + isVideo && hasCameraPermission && call.getVideoTech().isTransmitting()); mInCallButtonUi.showButton(InCallButtonIds.BUTTON_PAUSE_VIDEO, showPauseVideo); if (isVideo) { mInCallButtonUi.setVideoPaused(!call.getVideoTech().isTransmitting() || !hasCameraPermission); |