Merge changes from topics "rename_display_name_source", "sdbm" (6e20c774) · Commits · e / os / android_frameworks_base

core/java/android/provider/Telephony.java

+88 −0

Original line number	Diff line number	Diff line
		@@ -53,6 +53,7 @@ import com.android.internal.telephony.SmsApplication;
		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		import java.util.HashSet;
		import java.util.List;
		import java.util.Set;
		import java.util.regex.Matcher;
		import java.util.regex.Pattern;
		@@ -4353,6 +4354,12 @@ public final class Telephony {
		*/
		public static final String COLUMN_NAME_SOURCE = "name_source";

		/**
		* The name source is unknown.
		* @hide
		*/
		public static final int NAME_SOURCE_UNKNOWN = -1;

		/** The name_source is from the carrier id. {@hide} */
		public static final int NAME_SOURCE_CARRIER_ID = 0;

		@@ -4834,5 +4841,86 @@ public final class Telephony {
		* @hide
		*/
		public static final String COLUMN_USER_HANDLE = "user_handle";

		/** All columns in {@link SimInfo} table. */
		private static final List<String> ALL_COLUMNS = List.of(
		COLUMN_UNIQUE_KEY_SUBSCRIPTION_ID,
		COLUMN_ICC_ID,
		COLUMN_SIM_SLOT_INDEX,
		COLUMN_DISPLAY_NAME,
		COLUMN_CARRIER_NAME,
		COLUMN_NAME_SOURCE,
		COLUMN_COLOR,
		COLUMN_NUMBER,
		COLUMN_DISPLAY_NUMBER_FORMAT,
		COLUMN_DATA_ROAMING,
		COLUMN_MCC,
		COLUMN_MNC,
		COLUMN_MCC_STRING,
		COLUMN_MNC_STRING,
		COLUMN_EHPLMNS,
		COLUMN_HPLMNS,
		COLUMN_SIM_PROVISIONING_STATUS,
		COLUMN_IS_EMBEDDED,
		COLUMN_CARD_ID,
		COLUMN_ACCESS_RULES,
		COLUMN_ACCESS_RULES_FROM_CARRIER_CONFIGS,
		COLUMN_IS_REMOVABLE,
		COLUMN_CB_EXTREME_THREAT_ALERT,
		COLUMN_CB_SEVERE_THREAT_ALERT,
		COLUMN_CB_AMBER_ALERT,
		COLUMN_CB_EMERGENCY_ALERT,
		COLUMN_CB_ALERT_SOUND_DURATION,
		COLUMN_CB_ALERT_REMINDER_INTERVAL,
		COLUMN_CB_ALERT_VIBRATE,
		COLUMN_CB_ALERT_SPEECH,
		COLUMN_CB_ETWS_TEST_ALERT,
		COLUMN_CB_CHANNEL_50_ALERT,
		COLUMN_CB_CMAS_TEST_ALERT,
		COLUMN_CB_OPT_OUT_DIALOG,
		COLUMN_ENHANCED_4G_MODE_ENABLED,
		COLUMN_VT_IMS_ENABLED,
		COLUMN_WFC_IMS_ENABLED,
		COLUMN_WFC_IMS_MODE,
		COLUMN_WFC_IMS_ROAMING_MODE,
		COLUMN_WFC_IMS_ROAMING_ENABLED,
		COLUMN_IS_OPPORTUNISTIC,
		COLUMN_GROUP_UUID,
		COLUMN_IS_METERED,
		COLUMN_ISO_COUNTRY_CODE,
		COLUMN_CARRIER_ID,
		COLUMN_PROFILE_CLASS,
		COLUMN_SUBSCRIPTION_TYPE,
		COLUMN_GROUP_OWNER,
		COLUMN_DATA_ENABLED_OVERRIDE_RULES,
		COLUMN_ENABLED_MOBILE_DATA_POLICIES,
		COLUMN_IMSI,
		COLUMN_UICC_APPLICATIONS_ENABLED,
		COLUMN_ALLOWED_NETWORK_TYPES,
		COLUMN_IMS_RCS_UCE_ENABLED,
		COLUMN_CROSS_SIM_CALLING_ENABLED,
		COLUMN_RCS_CONFIG,
		COLUMN_ALLOWED_NETWORK_TYPES_FOR_REASONS,
		COLUMN_D2D_STATUS_SHARING,
		COLUMN_VOIMS_OPT_IN_STATUS,
		COLUMN_D2D_STATUS_SHARING_SELECTED_CONTACTS,
		COLUMN_NR_ADVANCED_CALLING_ENABLED,
		COLUMN_PHONE_NUMBER_SOURCE_CARRIER,
		COLUMN_PHONE_NUMBER_SOURCE_IMS,
		COLUMN_PORT_INDEX,
		COLUMN_USAGE_SETTING,
		COLUMN_TP_MESSAGE_REF,
		COLUMN_USER_HANDLE
		);

		/**
		* @return All columns in {@link SimInfo} table.
		*
		* @hide
		*/
		@NonNull
		public static List<String> getAllColumns() {
		return ALL_COLUMNS;
		}
		}
		}

telephony/common/com/android/internal/telephony/util/TelephonyUtils.java

+18 −0

Original line number	Diff line number	Diff line
		@@ -192,4 +192,22 @@ public final class TelephonyUtils {
		// This is the error case. The well-defined value for UNKNOWN is -1.
		return "UNKNOWN(" + state + ")";
		}

		/**
		* Convert mobile data policy to string.
		*
		* @param mobileDataPolicy The mobile data policy.
		* @return The mobile data policy in string format.
		*/
		public static @NonNull String mobileDataPolicyToString(
		@TelephonyManager.MobileDataPolicy int mobileDataPolicy) {
		switch (mobileDataPolicy) {
		case TelephonyManager.MOBILE_DATA_POLICY_DATA_ON_NON_DEFAULT_DURING_VOICE_CALL:
		return "DATA_ON_NON_DEFAULT_DURING_VOICE_CALL";
		case TelephonyManager.MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED:
		return "MMS_ALWAYS_ALLOWED";
		default:
		return "UNKNOWN(" + mobileDataPolicy + ")";
		}
		}
		}

telephony/java/android/telephony/SubscriptionInfo.java

+128 −119

File changed.

Preview size limit exceeded, changes collapsed.

telephony/java/android/telephony/SubscriptionManager.java

+68 −0

File changed.

Preview size limit exceeded, changes collapsed.

telephony/java/android/telephony/ims/ImsMmTelManager.java

+27 −0

File changed.

Preview size limit exceeded, changes collapsed.