From abfdaead4c3a11b2a9997bf3ebe252ed975d2b28 Mon Sep 17 00:00:00 2001
From: Tyler Gunn <tgunn@google.com>
Date: Thu, 28 May 2015 15:09:10 -0700
Subject: [PATCH] Add new carrier config settings.

1. Add new carrier config setting for "bool_allow_emergency_video_calls".
This allows us to control on a per-carrier basis whether emergency
video calls are allowed.
2. Add carrier config setting "bool_allow_video_pause", which
was previously in overlay files in packages/services/Telephony (Figured I
would clean this up while I'm here).

Bug: 20089489
Change-Id: I97e0983b4a7c8e8086ab58e7e839011e62fabcaf
---
 api/system-current.txt                        |  2 ++
 .../telephony/CarrierConfigManager.java       | 26 +++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/api/system-current.txt b/api/system-current.txt
index 904c2493072b2..cda99238af5a6 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -30822,6 +30822,8 @@ package android.telephony {
     method public void reloadCarrierConfigForSubId(int);
     method public void updateConfigForPhoneId(int, java.lang.String);
     field public static final java.lang.String ACTION_CARRIER_CONFIG_CHANGED = "android.intent.action.carrier_config_changed";
+    field public static final java.lang.String BOOL_ALLOW_EMERGENCY_VIDEO_CALLS = "bool_allow_emergency_video_calls";
+    field public static final java.lang.String BOOL_ALLOW_VIDEO_PAUSE = "bool_allow_video_pause";
     field public static final java.lang.String BOOL_CARRIER_VOLTE_AVAILABLE = "bool_carrier_volte_available";
     field public static final java.lang.String BOOL_CARRIER_VOLTE_PROVISIONED = "bool_carrier_volte_provisioned";
     field public static final java.lang.String BOOL_CARRIER_VOLTE_TTY_SUPPORTED = "bool_carrier_volte_tty_supported";
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index b6f6888eebe74..116cf1bcffb9c 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -109,6 +109,30 @@ public class CarrierConfigManager {
     @SystemApi
     public static final String VVM_TYPE_OMTP = "vvm_type_omtp";
 
+    /**
+     * Flag indicating whether to allow carrier video calls to emergency numbers.
+     * When {@code true}, video calls to emergency numbers will be allowed.  When {@code false},
+     * video calls to emergency numbers will be initiated as audio-only calls instead.
+     *
+     * @hide
+     */
+    @SystemApi
+    public static final String BOOL_ALLOW_EMERGENCY_VIDEO_CALLS =
+            "bool_allow_emergency_video_calls";
+
+    /**
+     * Flag indicating whether the carrier supports video pause signaling.  When {@code true}, the
+     * carrier supports use of the {@link android.telecom.VideoProfile#STATE_PAUSED} video state
+     * to pause transmission of video when the In-Call app is sent to the background.
+     * When {@code false}, video pause signaling is not supported.  {@code True} by default unless
+     * a carrier configuration overrides the default.
+     *
+     * @hide
+     */
+    @SystemApi
+    public static final String BOOL_ALLOW_VIDEO_PAUSE =
+            "bool_allow_video_pause";
+
     private final static String TAG = "CarrierConfigManager";
 
     /** The default value for every variable. */
@@ -120,6 +144,8 @@ public class CarrierConfigManager {
         sDefaults.putBoolean(BOOL_CARRIER_VOLTE_PROVISIONED, false);
         sDefaults.putBoolean(BOOL_CARRIER_VOLTE_TTY_SUPPORTED, true);
         sDefaults.putBoolean(BOOL_SHOW_APN_SETTING_CDMA, false);
+        sDefaults.putBoolean(BOOL_ALLOW_EMERGENCY_VIDEO_CALLS, false);
+        sDefaults.putBoolean(BOOL_ALLOW_VIDEO_PAUSE, true);
 
         sDefaults.putInt(INT_VOLTE_REPLACEMENT_RAT, 0);
     }