Merge "[Satellite] Satellite entitlement results are saved to persistent memory." into main (3f23bc28) · Commits · e / os / android_frameworks_base

core/java/android/provider/Telephony.java

+66 −1

Original line number	Diff line number	Diff line
		@@ -4988,6 +4988,66 @@ public final class Telephony {
		public static final String COLUMN_IS_SATELLITE_PROVISIONED_FOR_NON_IP_DATAGRAM =
		"is_satellite_provisioned_for_non_ip_datagram";

		/**
		* TelephonyProvider column name for satellite entitlement barred plmns list separated by
		* comma [,]. The value of this column is set based on entitlement query result for
		* satellite configuration. Ex : 31026,302820,40445
		* By default, it's empty.
		*
		* @hide
		*/
		public static final String COLUMN_SATELLITE_ENTITLEMENT_BARRED_PLMNS =
		"satellite_entitlement_barred_plmns";


		/**
		* TelephonyProvider column name for satellite entitlement data plan for plmns which is
		* built in Json format in Key:Value pair. The value of this column is set based on
		* entitlement query result for satellite configuration.
		* Ex : {"302820":0,"31026":1, "40445":0}
		* By default, it's empty.
		*
		* @hide
		*/
		public static final String COLUMN_SATELLITE_ENTITLEMENT_DATA_PLAN_PLMNS =
		"satellite_entitlement_data_plan_plmns";

		/**
		* TelephonyProvider column name for satellite entitlement service type map which is
		* built in Json format in Key:Value pair. The value of this column is set based on
		* entitlement query result for satellite configuration.
		* Ex : {"302820":[1,3],"31026":[2,3],"40445":[1,3]}
		* By default, it's empty.
		*
		* @hide
		*/
		public static final String COLUMN_SATELLITE_ENTITLEMENT_SERVICE_TYPE_MAP =
		"satellite_entitlement_service_type_map";

		/**
		* TelephonyProvider column name for satellite entitlement data service policy type map
		* which is built in Json format in Key:Value pair. The value of this column is set based
		* on entitlement query result for satellite configuration.
		* Ex : {"302820":2, "31026":1}
		* By default, it's empty.
		*
		* @hide
		*/
		public static final String COLUMN_SATELLITE_ENTITLEMENT_DATA_SERVICE_POLICY =
		"satellite_entitlement_data_service_policy";

		/**
		* TelephonyProvider column name for satellite entitlement voice service policy type map
		* which is built in Json format in Key:Value pair. The value of this column is set
		* based on entitlement query result for satellite configuration.
		* Ex : {"302820":2, "31026":1}.
		* By default, it's empty.
		*
		* @hide
		*/
		public static final String COLUMN_SATELLITE_ENTITLEMENT_VOICE_SERVICE_POLICY =
		"satellite_entitlement_voice_service_policy";

		/** All columns in {@link SimInfo} table. */
		private static final List<String> ALL_COLUMNS = List.of(
		COLUMN_UNIQUE_KEY_SUBSCRIPTION_ID,
		@@ -5065,7 +5125,12 @@ public final class Telephony {
		COLUMN_SATELLITE_ENTITLEMENT_STATUS,
		COLUMN_SATELLITE_ENTITLEMENT_PLMNS,
		COLUMN_SATELLITE_ESOS_SUPPORTED,
		COLUMN_IS_SATELLITE_PROVISIONED_FOR_NON_IP_DATAGRAM
		COLUMN_IS_SATELLITE_PROVISIONED_FOR_NON_IP_DATAGRAM,
		COLUMN_SATELLITE_ENTITLEMENT_BARRED_PLMNS,
		COLUMN_SATELLITE_ENTITLEMENT_DATA_PLAN_PLMNS,
		COLUMN_SATELLITE_ENTITLEMENT_SERVICE_TYPE_MAP,
		COLUMN_SATELLITE_ENTITLEMENT_DATA_SERVICE_POLICY,
		COLUMN_SATELLITE_ENTITLEMENT_VOICE_SERVICE_POLICY
		);

		/**

telephony/java/android/telephony/SubscriptionManager.java

+55 −0

Original line number	Diff line number	Diff line
		@@ -1187,6 +1187,61 @@ public class SubscriptionManager {
		public static final String IS_SATELLITE_PROVISIONED_FOR_NON_IP_DATAGRAM =
		SimInfo.COLUMN_IS_SATELLITE_PROVISIONED_FOR_NON_IP_DATAGRAM;

		/**
		* TelephonyProvider column name for satellite entitlement barred plmns. The value of this
		* column is set based on entitlement query result for satellite configuration.
		* By default, it's empty.
		* <P>Type: TEXT </P>
		*
		* @hide
		*/
		public static final String SATELLITE_ENTITLEMENT_BARRED_PLMNS =
		SimInfo.COLUMN_SATELLITE_ENTITLEMENT_BARRED_PLMNS;

		/**
		* TelephonyProvider column name for satellite entitlement data plan for plmns. The value
		* of this column is set based on entitlement query result for satellite configuration.
		* By default, it's empty.
		* <P>Type: TEXT </P>
		*
		* @hide
		*/
		public static final String SATELLITE_ENTITLEMENT_DATA_PLAN_PLMNS =
		SimInfo.COLUMN_SATELLITE_ENTITLEMENT_DATA_PLAN_PLMNS;

		/**
		* TelephonyProvider column name for satellite entitlement service type map. The value of
		* this column is set based on entitlement query result for satellite configuration.
		* By default, it's empty.
		* <P>Type: TEXT </P>
		*
		* @hide
		*/
		public static final String SATELLITE_ENTITLEMENT_SERVICE_TYPE_MAP =
		SimInfo.COLUMN_SATELLITE_ENTITLEMENT_SERVICE_TYPE_MAP;

		/**
		* TelephonyProvider column name for satellite entitlement data service policy. The value
		* of this column is set based on entitlement query result for satellite configuration.
		* By default, it's empty.
		* <P>Type: TEXT </P>
		*
		* @hide
		*/
		public static final String SATELLITE_ENTITLEMENT_DATA_SERVICE_POLICY =
		SimInfo.COLUMN_SATELLITE_ENTITLEMENT_DATA_SERVICE_POLICY;

		/**
		* TelephonyProvider column name for satellite entitlement voice service policy. The value
		* of this column is set based on entitlement query result for satellite configuration.
		* By default, it's empty.
		* <P>Type: TEXT </P>
		*
		* @hide
		*/
		public static final String SATELLITE_ENTITLEMENT_VOICE_SERVICE_POLICY =
		SimInfo.COLUMN_SATELLITE_ENTITLEMENT_VOICE_SERVICE_POLICY;

		/** @hide */
		@Retention(RetentionPolicy.SOURCE)
		@IntDef(prefix = {"USAGE_SETTING_"},