Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8dfd569c authored by Hyosun Kim's avatar Hyosun Kim
Browse files

Add new columns for satellite entitlement status and satellite entitlement plmns 

Added new COLUMN_SATELLITE_ENTITLEMENT_STATUS and COLUMN_SATELLITE_ENTITLEMENT_PLMNS columns in the SimInfo table.

Bug: 322143408
Test: atest TelephonyProviderTests, FrameworksTelephonyTests
Test: manual test
1. onCreate case
verified the COLUMN_SATELLITE_ENTITLEMENT_STATUS value set to 0.
verified the COLUMN_SATELLITE_ENTITLEMENT_PLMNS value set to empty.
2. onUpgrade case
verified the COLUMN_SATELLITE_ENTITLEMENT_STATUS value did not exist, but was set to 0 after the upgrade.
verified the COLUMN_SATELLITE_ENTITLEMENT_PLMNS value did not exist, but was set to empty after the upgrade.

Change-Id: I9f523f6f5fab53282c6de83950a55bac5b2df6e4
parent a84693ee

core/java/android/provider/Telephony.java

+23 −1
Original line number Diff line number Diff line
@@ -4956,6 +4956,26 @@ public final class Telephony { 
         */

        public static final String COLUMN_SERVICE_CAPABILITIES = "service_capabilities";



        /**

         * TelephonyProvider column name for satellite entitlement status. The value of this column

         * is set based on entitlement query result for satellite configuration.

         * By default, it's disabled.

         *

         * @hide

         */

        public static final String COLUMN_SATELLITE_ENTITLEMENT_STATUS =

                "satellite_entitlement_status";



        /**

         * TelephonyProvider column name for satellite entitlement plmns. The value of this

         * column is set based on entitlement query result for satellite configuration.

         * By default, it's empty.

         *

         * @hide

         */

        public static final String COLUMN_SATELLITE_ENTITLEMENT_PLMNS =

                "satellite_entitlement_plmns";



        /** All columns in {@link SimInfo} table. */

        private static final List<String> ALL_COLUMNS = List.of(

                COLUMN_UNIQUE_KEY_SUBSCRIPTION_ID,
@@ -5029,7 +5049,9 @@ public final class Telephony { 
                COLUMN_SATELLITE_ATTACH_ENABLED_FOR_CARRIER,

                COLUMN_IS_NTN,

                COLUMN_SERVICE_CAPABILITIES,

                COLUMN_TRANSFER_STATUS

                COLUMN_TRANSFER_STATUS,

                COLUMN_SATELLITE_ENTITLEMENT_STATUS,

                COLUMN_SATELLITE_ENTITLEMENT_PLMNS

        );



        /**

telephony/java/android/telephony/SubscriptionManager.java

+22 −0
Original line number Diff line number Diff line
@@ -1156,6 +1156,28 @@ public class SubscriptionManager { 
     */

    public static final String TRANSFER_STATUS = SimInfo.COLUMN_TRANSFER_STATUS;



    /**

     * TelephonyProvider column name for satellite entitlement status. The value of this column is

     * set based on entitlement query result for satellite configuration.

     * By default, it's disabled.

     * <P>Type: INTEGER (int)</P>

     *

     * @hide

     */

    public static final String SATELLITE_ENTITLEMENT_STATUS =

            SimInfo.COLUMN_SATELLITE_ENTITLEMENT_STATUS;



    /**

     * TelephonyProvider column name for satellite entitlement 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_PLMNS =

            SimInfo.COLUMN_SATELLITE_ENTITLEMENT_PLMNS;



    /** @hide */

    @Retention(RetentionPolicy.SOURCE)

    @IntDef(prefix = {"USAGE_SETTING_"},