diff options
| author | 2023-03-31 21:30:46 +0000 | |
|---|---|---|
| committer | 2023-03-31 21:30:46 +0000 | |
| commit | 4be3212bb9a1e0eafbd86f6f123b9eb5a6bed3bd (patch) | |
| tree | 68bcf1ab2302102d821b74dcf3959deaf91bd082 | |
| parent | 80e6084a8d7b5c0c85b66255968705de44a2ca19 (diff) | |
| parent | b8a1b57bb9f9e4a9f8b6ba72a63e981664315391 (diff) | |
Merge "Add SubscriptionManager APIs for satellite communication." am: b8a1b57bb9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2517155
Change-Id: Ib7f1acf060b832707312fe3e7c2e1fad84fb030e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/provider/Telephony.java | 11 | ||||
| -rw-r--r-- | telephony/java/android/telephony/SubscriptionManager.java | 8 |
2 files changed, 18 insertions, 1 deletions
diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java index 3dc805e03f9d..bb76b469e96d 100644 --- a/core/java/android/provider/Telephony.java +++ b/core/java/android/provider/Telephony.java @@ -4842,6 +4842,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, @@ -4910,7 +4918,8 @@ public final class Telephony { COLUMN_PORT_INDEX, COLUMN_USAGE_SETTING, COLUMN_TP_MESSAGE_REF, - COLUMN_USER_HANDLE + COLUMN_USER_HANDLE, + COLUMN_SATELLITE_ENABLED ); /** diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index b99f3d681585..d590ce22e9df 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -1116,6 +1116,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_"}, |