Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add device and carrier flags for video calling fallback"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-06-02 23:35:44 +00:00
committed by Android (Google) Code Review
parent d1de115fca 9d20d98919
commit d6fb3081d9
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
telecomm/java/android/telecom/PhoneAccount.java
View File

@@ -90,6 +90,18 @@ public final class PhoneAccount implements Parcelable {
public static final String EXTRA_SUPPORTS_HANDOVER_TO =
"android.telecom.extra.SUPPORTS_HANDOVER_TO";
/**
* Boolean {@link PhoneAccount} extras key (see {@link PhoneAccount#getExtras()}) which
* indicates whether this {@link PhoneAccount} supports using a fallback if video calling is
* not available. This extra is for device level support, {@link
* android.telephony.CarrierConfigManager#KEY_ALLOW_VIDEO_CALLING_FALLBACK_BOOL} should also
* be checked to ensure it is not disabled by individual carrier.
*
* @hide
*/
public static final String EXTRA_SUPPORTS_VIDEO_CALLING_FALLBACK =
"android.telecom.extra.SUPPORTS_VIDEO_CALLING_FALLBACK";
/**
* Boolean {@link PhoneAccount} extras key (see {@link PhoneAccount#getExtras()}) which
* indicates whether this {@link PhoneAccount} is capable of supporting a request to handover a

10
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -1219,6 +1219,15 @@ public class CarrierConfigManager {
*/
public static final String KEY_VIDEO_CALLS_CAN_BE_HD_AUDIO = "video_calls_can_be_hd_audio";
/**
* Whether system apps are allowed to use fallback if carrier video call is not available.
* Defaults to {@code true}.
*
* @hide
*/
public static final String KEY_ALLOW_VIDEO_CALLING_FALLBACK_BOOL =
"allow_video_calling_fallback_bool";
/**
* Defines operator-specific {@link com.android.ims.ImsReasonInfo} mappings.
*
@@ -1665,6 +1674,7 @@ public class CarrierConfigManager {
sDefaults.putBoolean(KEY_ALLOW_ADD_CALL_DURING_VIDEO_CALL_BOOL, true);
sDefaults.putBoolean(KEY_WIFI_CALLS_CAN_BE_HD_AUDIO, true);
sDefaults.putBoolean(KEY_VIDEO_CALLS_CAN_BE_HD_AUDIO, true);
sDefaults.putBoolean(KEY_ALLOW_VIDEO_CALLING_FALLBACK_BOOL, true);
sDefaults.putStringArray(KEY_IMS_REASONINFO_MAPPING_STRING_ARRAY, null);
sDefaults.putBoolean(KEY_ENHANCED_4G_LTE_TITLE_VARIANT_BOOL, false);