Merge "Add KEY_USE_RCS_PRESENCE_BOOL carrier config option." (f5afe6ab) · Commits · e / os / android_frameworks_base

api/system-current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -37922,6 +37922,7 @@ package android.telephony {
	field public static final java.lang.String KEY_SUPPORT_SWAP_AFTER_MERGE_BOOL = "support_swap_after_merge_bool";		field public static final java.lang.String KEY_SUPPORT_SWAP_AFTER_MERGE_BOOL = "support_swap_after_merge_bool";
	field public static final java.lang.String KEY_USE_HFA_FOR_PROVISIONING_BOOL = "use_hfa_for_provisioning_bool";		field public static final java.lang.String KEY_USE_HFA_FOR_PROVISIONING_BOOL = "use_hfa_for_provisioning_bool";
	field public static final java.lang.String KEY_USE_OTASP_FOR_PROVISIONING_BOOL = "use_otasp_for_provisioning_bool";		field public static final java.lang.String KEY_USE_OTASP_FOR_PROVISIONING_BOOL = "use_otasp_for_provisioning_bool";
			field public static final java.lang.String KEY_USE_RCS_PRESENCE_BOOL = "use_rcs_presence_bool";
	field public static final java.lang.String KEY_VOICEMAIL_NOTIFICATION_PERSISTENT_BOOL = "voicemail_notification_persistent_bool";		field public static final java.lang.String KEY_VOICEMAIL_NOTIFICATION_PERSISTENT_BOOL = "voicemail_notification_persistent_bool";
	field public static final java.lang.String KEY_VOICE_PRIVACY_DISABLE_UI_BOOL = "voice_privacy_disable_ui_bool";		field public static final java.lang.String KEY_VOICE_PRIVACY_DISABLE_UI_BOOL = "voice_privacy_disable_ui_bool";
	field public static final java.lang.String KEY_VOLTE_REPLACEMENT_RAT_INT = "volte_replacement_rat_int";		field public static final java.lang.String KEY_VOLTE_REPLACEMENT_RAT_INT = "volte_replacement_rat_int";

telecomm/java/android/telecom/PhoneAccount.java

+39 −1

Original line number	Original line	Diff line number	Diff line
	@@ -687,7 +687,7 @@ public final class PhoneAccount implements Parcelable {
	.append("] PhoneAccount: ")		.append("] PhoneAccount: ")
	.append(mAccountHandle)		.append(mAccountHandle)
	.append(" Capabilities: ")		.append(" Capabilities: ")
	.append(mCapabilities)		.append(capabilitiesToString(mCapabilities))
	.append(" Schemes: ");		.append(" Schemes: ");
	for (String scheme : mSupportedUriSchemes) {		for (String scheme : mSupportedUriSchemes) {
	sb.append(scheme)		sb.append(scheme)
	@@ -698,4 +698,42 @@ public final class PhoneAccount implements Parcelable {
	sb.append("]");		sb.append("]");
	return sb.toString();		return sb.toString();
	}		}

			/**
			* Generates a string representation of a capabilities bitmask.
			*
			* @param capabilities The capabilities bitmask.
			* @return String representation of the capabilities bitmask.
			*/
			private String capabilitiesToString(int capabilities) {
			StringBuilder sb = new StringBuilder();
			if (hasCapabilities(CAPABILITY_VIDEO_CALLING)) {
			sb.append("Video ");
			}
			if (hasCapabilities(CAPABILITY_VIDEO_CALLING_RELIES_ON_PRESENCE)) {
			sb.append("Presence ");
			}
			if (hasCapabilities(CAPABILITY_CALL_PROVIDER)) {
			sb.append("CallProvider ");
			}
			if (hasCapabilities(CAPABILITY_CALL_SUBJECT)) {
			sb.append("CallSubject ");
			}
			if (hasCapabilities(CAPABILITY_CONNECTION_MANAGER)) {
			sb.append("ConnectionMgr ");
			}
			if (hasCapabilities(CAPABILITY_EMERGENCY_CALLS_ONLY)) {
			sb.append("EmergOnly ");
			}
			if (hasCapabilities(CAPABILITY_MULTI_USER)) {
			sb.append("MultiUser ");
			}
			if (hasCapabilities(CAPABILITY_PLACE_EMERGENCY_CALLS)) {
			sb.append("PlaceEmerg ");
			}
			if (hasCapabilities(CAPABILITY_SIM_SUBSCRIPTION)) {
			sb.append("SimSub ");
			}
			return sb.toString();
			}
	}		}

telephony/java/android/telephony/CarrierConfigManager.java

+18 −0

Original line number	Original line	Diff line number	Diff line
	@@ -553,6 +553,23 @@ public class CarrierConfigManager {
	public static final String BOOL_ALLOW_VIDEO_PAUSE =		public static final String BOOL_ALLOW_VIDEO_PAUSE =
	"bool_allow_video_pause";		"bool_allow_video_pause";


			/**
			* Flag indicating whether the carrier supports RCS presence indication for video calls. When
			* {@code true}, the carrier supports RCS presence indication for video calls. When presence
			* is supported, the device should use the
			* {@link android.provider.ContactsContract.Data#CARRIER_PRESENCE} bit mask and set the
			* {@link android.provider.ContactsContract.Data#CARRIER_PRESENCE_VT_CAPABLE} bit to indicate
			* whether each contact supports video calling. The UI is made aware that presence is enabled
			* via {@link android.telecom.PhoneAccount#CAPABILITY_VIDEO_CALLING_RELIES_ON_PRESENCE}
			* and can choose to hide or show the video calling icon based on whether a contact supports
			* video.
			*
			* @hide
			*/
			@SystemApi
			public static final String KEY_USE_RCS_PRESENCE_BOOL = "use_rcs_presence_bool";

	/** The default value for every variable. */		/** The default value for every variable. */
	private final static PersistableBundle sDefaults;		private final static PersistableBundle sDefaults;

	@@ -662,6 +679,7 @@ public class CarrierConfigManager {
	sDefaults.putString(KEY_MMS_UA_PROF_URL_STRING, "");		sDefaults.putString(KEY_MMS_UA_PROF_URL_STRING, "");
	sDefaults.putString(KEY_MMS_USER_AGENT_STRING, "");		sDefaults.putString(KEY_MMS_USER_AGENT_STRING, "");
	sDefaults.putBoolean(KEY_ALLOW_NON_EMERGENCY_CALLS_IN_ECM_BOOL, true);		sDefaults.putBoolean(KEY_ALLOW_NON_EMERGENCY_CALLS_IN_ECM_BOOL, true);
			sDefaults.putBoolean(KEY_USE_RCS_PRESENCE_BOOL, false);
	}		}

	/**		/**