Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add SubscriptionManager APIs for satellite communication." am: b8a1b57bb9

Browse Source 
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>
This commit is contained in:
Jack Yu
2023-03-31 21:30:46 +00:00
committed by Automerger Merge Worker
parent 80e6084a8d b8a1b57bb9
commit 4be3212bb9
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/provider/Telephony.java
View File

@@ -4842,6 +4842,14 @@ public final class Telephony {
*/ */
public static final String COLUMN_USER_HANDLE = "user_handle"; 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. */ /** All columns in {@link SimInfo} table. */
private static final List<String> ALL_COLUMNS = List.of( private static final List<String> ALL_COLUMNS = List.of(
COLUMN_UNIQUE_KEY_SUBSCRIPTION_ID, COLUMN_UNIQUE_KEY_SUBSCRIPTION_ID,
@@ -4910,7 +4918,8 @@ public final class Telephony {
COLUMN_PORT_INDEX, COLUMN_PORT_INDEX,
COLUMN_USAGE_SETTING, COLUMN_USAGE_SETTING,
COLUMN_TP_MESSAGE_REF, COLUMN_TP_MESSAGE_REF,
COLUMN_USER_HANDLE COLUMN_USER_HANDLE,
COLUMN_SATELLITE_ENABLED
); );
/** /**

8
telephony/java/android/telephony/SubscriptionManager.java
View File

@@ -1116,6 +1116,14 @@ public class SubscriptionManager {
*/ */
public static final String USER_HANDLE = SimInfo.COLUMN_USER_HANDLE; 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 */ /** @hide */
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef(prefix = {"USAGE_SETTING_"}, @IntDef(prefix = {"USAGE_SETTING_"},