Merge "Add SubscriptionManager APIs for satellite communication." (e4241197) · Commits · e / os / android_frameworks_base

core/java/android/provider/Telephony.java

+10 −1

Original line number	Diff line number	Diff line
		@@ -4847,6 +4847,14 @@ public final class Telephony {
		*/
		public static final String COLUMN_USER_HANDLE = "user_handle";

		/**
		* TelephonyProvider column name for satellite enabled.
		* By default, it's disabled.
		*
		* @hide
		*/
		public static final String COLUMN_SATELLITE_ENABLED = "satellite_enabled";

		/** All columns in {@link SimInfo} table. */
		private static final List<String> ALL_COLUMNS = List.of(
		COLUMN_UNIQUE_KEY_SUBSCRIPTION_ID,
		@@ -4915,7 +4923,8 @@ public final class Telephony {
		COLUMN_PORT_INDEX,
		COLUMN_USAGE_SETTING,
		COLUMN_TP_MESSAGE_REF,
		COLUMN_USER_HANDLE
		COLUMN_USER_HANDLE,
		COLUMN_SATELLITE_ENABLED
		);

		/**

+8 −0

Original line number	Diff line number	Diff line
		@@ -1139,6 +1139,14 @@ public class SubscriptionManager {
		*/
		public static final String USER_HANDLE = SimInfo.COLUMN_USER_HANDLE;

		/**
		* TelephonyProvider column name for satellite enabled.
		* By default, it's disabled.
		* <P>Type: INTEGER (int)</P>
		* @hide
		*/
		public static final String SATELLITE_ENABLED = SimInfo.COLUMN_SATELLITE_ENABLED;

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