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

Commit ada9f0e4 authored by Peter Wang's avatar Peter Wang
Browse files

[API Review] APIs in SubscriptionManager 

Bug: 146362772
Bug: 148180034
Test: atest SubscriptionControllerTest, TelephonyDatabaseHelperTest, TelephonyProviderTest
Change-Id: I80a51d2b82453b2bad5bd14a068f6f74024e1894
parent d55780da

src/java/com/android/internal/telephony/SubscriptionController.java

+5 −5
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ public class SubscriptionController extends ISub.Stub { 
        int nameSource = cursor.getInt(cursor.getColumnIndexOrThrow(

                SubscriptionManager.NAME_SOURCE));

        int iconTint = cursor.getInt(cursor.getColumnIndexOrThrow(

                SubscriptionManager.COLOR));

                SubscriptionManager.HUE));

        String number = cursor.getString(cursor.getColumnIndexOrThrow(

                SubscriptionManager.NUMBER));

        int dataRoaming = cursor.getInt(cursor.getColumnIndexOrThrow(
@@ -1454,7 +1454,7 @@ public class SubscriptionController extends ISub.Stub { 
        value.put(SubscriptionManager.ICC_ID, uniqueId);

        int color = getUnusedColor(mContext.getOpPackageName(), mContext.getAttributionTag());

        // default SIM color differs between slots

        value.put(SubscriptionManager.COLOR, color);

        value.put(SubscriptionManager.HUE, color);

        value.put(SubscriptionManager.SIM_SLOT_INDEX, slotIndex);

        value.put(SubscriptionManager.CARRIER_NAME, "");

        value.put(SubscriptionManager.CARD_ID, uniqueId);
@@ -1571,7 +1571,7 @@ public class SubscriptionController extends ISub.Stub { 
        try {

            validateSubId(subId);

            ContentValues value = new ContentValues(1);

            value.put(SubscriptionManager.COLOR, tint);

            value.put(SubscriptionManager.HUE, tint);

            if (DBG) logd("[setIconTint]- tint:" + tint + " set");



            int result = mContext.getContentResolver().update(
@@ -1596,7 +1596,7 @@ public class SubscriptionController extends ISub.Stub { 
     */

    public static int getNameSourcePriority(@SimDisplayNameSource int nameSource) {

        int index = Arrays.asList(

                SubscriptionManager.NAME_SOURCE_DEFAULT,

                SubscriptionManager.NAME_SOURCE_CARRIER_ID,

                SubscriptionManager.NAME_SOURCE_SIM_PNN,

                SubscriptionManager.NAME_SOURCE_SIM_SPN,

                SubscriptionManager.NAME_SOURCE_CARRIER,
@@ -1657,7 +1657,7 @@ public class SubscriptionController extends ISub.Stub { 
            }

            ContentValues value = new ContentValues(1);

            value.put(SubscriptionManager.DISPLAY_NAME, nameToSet);

            if (nameSource >= SubscriptionManager.NAME_SOURCE_DEFAULT) {

            if (nameSource >= SubscriptionManager.NAME_SOURCE_CARRIER_ID) {

                if (DBG) logd("Set nameSource=" + nameSource);

                value.put(SubscriptionManager.NAME_SOURCE, nameSource);

            }

src/java/com/android/internal/telephony/SubscriptionInfoUpdater.java

+1 −1
Original line number Diff line number Diff line
@@ -829,7 +829,7 @@ public class SubscriptionInfoUpdater extends Handler { 
            int index =

                    findSubscriptionInfoForIccid(existingSubscriptions, embeddedProfile.getIccid());

            int prevCarrierId = TelephonyManager.UNKNOWN_CARRIER_ID;

            int nameSource = SubscriptionManager.NAME_SOURCE_DEFAULT;

            int nameSource = SubscriptionManager.NAME_SOURCE_CARRIER_ID;

            if (index < 0) {

                // No existing entry for this ICCID; create an empty one.

                SubscriptionController.getInstance().insertEmptySubInfoRecord(

src/java/com/android/internal/telephony/uicc/UiccProfile.java

+1 −1
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ public class UiccProfile extends IccCard { 
                    nameSource = SubscriptionManager.NAME_SOURCE_SIM_PNN;

                } else {

                    newCarrierName = phone.getCarrierName();    // Get the name from carrier id.

                    nameSource = SubscriptionManager.NAME_SOURCE_DEFAULT;

                    nameSource = SubscriptionManager.NAME_SOURCE_CARRIER_ID;

                }

            }

        }

tests/telephonytests/src/com/android/internal/telephony/FakeTelephonyProvider.java

+56 −56
Original line number Diff line number Diff line
@@ -52,68 +52,68 @@ public class FakeTelephonyProvider extends MockContentProvider { 
        // This should always be consistent with TelephonyProvider#getStringForSimInfoTableCreation.

        private String getStringForSimInfoTableCreation(String tableName) {

            return "CREATE TABLE " + tableName + "("

                    + Telephony.SimInfo.UNIQUE_KEY_SUBSCRIPTION_ID

                    + Telephony.SimInfo.COLUMN_UNIQUE_KEY_SUBSCRIPTION_ID

                    + " INTEGER PRIMARY KEY AUTOINCREMENT,"

                    + Telephony.SimInfo.ICC_ID + " TEXT NOT NULL,"

                    + Telephony.SimInfo.SIM_SLOT_INDEX

                    + Telephony.SimInfo.COLUMN_ICC_ID + " TEXT NOT NULL,"

                    + Telephony.SimInfo.COLUMN_SIM_SLOT_INDEX

                    + " INTEGER DEFAULT " + Telephony.SimInfo.SIM_NOT_INSERTED + ","

                    + Telephony.SimInfo.DISPLAY_NAME + " TEXT,"

                    + Telephony.SimInfo.CARRIER_NAME + " TEXT,"

                    + Telephony.SimInfo.NAME_SOURCE

                    + " INTEGER DEFAULT " + Telephony.SimInfo.NAME_SOURCE_DEFAULT + ","

                    + Telephony.SimInfo.COLOR + " INTEGER DEFAULT "

                    + Telephony.SimInfo.COLUMN_DISPLAY_NAME + " TEXT,"

                    + Telephony.SimInfo.COLUMN_CARRIER_NAME + " TEXT,"

                    + Telephony.SimInfo.COLUMN_NAME_SOURCE

                    + " INTEGER DEFAULT " + Telephony.SimInfo.NAME_SOURCE_CARRIER_ID + ","

                    + Telephony.SimInfo.COLUMN_COLOR + " INTEGER DEFAULT "

                    + Telephony.SimInfo.COLOR_DEFAULT + ","

                    + Telephony.SimInfo.NUMBER + " TEXT,"

                    + Telephony.SimInfo.DISPLAY_NUMBER_FORMAT

                    + Telephony.SimInfo.COLUMN_NUMBER + " TEXT,"

                    + Telephony.SimInfo.COLUMN_DISPLAY_NUMBER_FORMAT

                    + " INTEGER NOT NULL DEFAULT "

                    + Telephony.SimInfo.DISPLAY_NUMBER_DEFAULT + ","

                    + Telephony.SimInfo.DATA_ROAMING

                    + " INTEGER DEFAULT " + Telephony.SimInfo.DATA_ROAMING_DEFAULT + ","

                    + Telephony.SimInfo.MCC + " INTEGER DEFAULT 0,"

                    + Telephony.SimInfo.MNC + " INTEGER DEFAULT 0,"

                    + Telephony.SimInfo.MCC_STRING + " TEXT,"

                    + Telephony.SimInfo.MNC_STRING + " TEXT,"

                    + Telephony.SimInfo.EHPLMNS + " TEXT,"

                    + Telephony.SimInfo.HPLMNS + " TEXT,"

                    + Telephony.SimInfo.SIM_PROVISIONING_STATUS

                    + Telephony.SimInfo.COLUMN_DATA_ROAMING

                    + " INTEGER DEFAULT " + Telephony.SimInfo.DATA_ROAMING_DISABLE + ","

                    + Telephony.SimInfo.COLUMN_MCC + " INTEGER DEFAULT 0,"

                    + Telephony.SimInfo.COLUMN_MNC + " INTEGER DEFAULT 0,"

                    + Telephony.SimInfo.COLUMN_MCC_STRING + " TEXT,"

                    + Telephony.SimInfo.COLUMN_MNC_STRING + " TEXT,"

                    + Telephony.SimInfo.COLUMN_EHPLMNS + " TEXT,"

                    + Telephony.SimInfo.COLUMN_HPLMNS + " TEXT,"

                    + Telephony.SimInfo.COLUMN_SIM_PROVISIONING_STATUS

                    + " INTEGER DEFAULT " + Telephony.SimInfo.SIM_PROVISIONED + ","

                    + Telephony.SimInfo.IS_EMBEDDED + " INTEGER DEFAULT 0,"

                    + Telephony.SimInfo.CARD_ID + " TEXT NOT NULL,"

                    + Telephony.SimInfo.ACCESS_RULES + " BLOB,"

                    + Telephony.SimInfo.IS_REMOVABLE + " INTEGER DEFAULT 0,"

                    + Telephony.SimInfo.CB_EXTREME_THREAT_ALERT + " INTEGER DEFAULT 1,"

                    + Telephony.SimInfo.CB_SEVERE_THREAT_ALERT + " INTEGER DEFAULT 1,"

                    + Telephony.SimInfo.CB_AMBER_ALERT + " INTEGER DEFAULT 1,"

                    + Telephony.SimInfo.CB_EMERGENCY_ALERT + " INTEGER DEFAULT 1,"

                    + Telephony.SimInfo.CB_ALERT_SOUND_DURATION + " INTEGER DEFAULT 4,"

                    + Telephony.SimInfo.CB_ALERT_REMINDER_INTERVAL + " INTEGER DEFAULT 0,"

                    + Telephony.SimInfo.CB_ALERT_VIBRATE + " INTEGER DEFAULT 1,"

                    + Telephony.SimInfo.CB_ALERT_SPEECH + " INTEGER DEFAULT 1,"

                    + Telephony.SimInfo.CB_ETWS_TEST_ALERT + " INTEGER DEFAULT 0,"

                    + Telephony.SimInfo.CB_CHANNEL_50_ALERT + " INTEGER DEFAULT 1,"

                    + Telephony.SimInfo.CB_CMAS_TEST_ALERT + " INTEGER DEFAULT 0,"

                    + Telephony.SimInfo.CB_OPT_OUT_DIALOG + " INTEGER DEFAULT 1,"

                    + Telephony.SimInfo.ENHANCED_4G_MODE_ENABLED + " INTEGER DEFAULT -1,"

                    + Telephony.SimInfo.VT_IMS_ENABLED + " INTEGER DEFAULT -1,"

                    + Telephony.SimInfo.WFC_IMS_ENABLED + " INTEGER DEFAULT -1,"

                    + Telephony.SimInfo.WFC_IMS_MODE + " INTEGER DEFAULT -1,"

                    + Telephony.SimInfo.WFC_IMS_ROAMING_MODE + " INTEGER DEFAULT -1,"

                    + Telephony.SimInfo.WFC_IMS_ROAMING_ENABLED + " INTEGER DEFAULT -1,"

                    + Telephony.SimInfo.IS_OPPORTUNISTIC + " INTEGER DEFAULT 0,"

                    + Telephony.SimInfo.GROUP_UUID + " TEXT,"

                    + Telephony.SimInfo.IS_METERED + " INTEGER DEFAULT 1,"

                    + Telephony.SimInfo.ISO_COUNTRY_CODE + " TEXT,"

                    + Telephony.SimInfo.CARRIER_ID + " INTEGER DEFAULT -1,"

                    + Telephony.SimInfo.PROFILE_CLASS

                    + " INTEGER DEFAULT " + Telephony.SimInfo.PROFILE_CLASS_DEFAULT + ","

                    + Telephony.SimInfo.SUBSCRIPTION_TYPE + " INTEGER DEFAULT 0,"

                    + Telephony.SimInfo.GROUP_OWNER + " TEXT,"

                    + Telephony.SimInfo.DATA_ENABLED_OVERRIDE_RULES + " TEXT,"

                    + Telephony.SimInfo.IMSI + " TEXT,"

                    + Telephony.SimInfo.ACCESS_RULES_FROM_CARRIER_CONFIGS + " BLOB,"

                    + Telephony.SimInfo.UICC_APPLICATIONS_ENABLED + " INTEGER DEFAULT 1,"

                    + Telephony.SimInfo.ALLOWED_NETWORK_TYPES + " BIGINT DEFAULT -1, "

                    + Telephony.SimInfo.IMS_RCS_UCE_ENABLED + " INTEGER DEFAULT 0"

                    + Telephony.SimInfo.COLUMN_IS_EMBEDDED + " INTEGER DEFAULT 0,"

                    + Telephony.SimInfo.COLUMN_CARD_ID + " TEXT NOT NULL,"

                    + Telephony.SimInfo.COLUMN_ACCESS_RULES + " BLOB,"

                    + Telephony.SimInfo.COLUMN_IS_REMOVABLE + " INTEGER DEFAULT 0,"

                    + Telephony.SimInfo.COLUMN_CB_EXTREME_THREAT_ALERT + " INTEGER DEFAULT 1,"

                    + Telephony.SimInfo.COLUMN_CB_SEVERE_THREAT_ALERT + " INTEGER DEFAULT 1,"

                    + Telephony.SimInfo.COLUMN_CB_AMBER_ALERT + " INTEGER DEFAULT 1,"

                    + Telephony.SimInfo.COLUMN_CB_EMERGENCY_ALERT + " INTEGER DEFAULT 1,"

                    + Telephony.SimInfo.COLUMN_CB_ALERT_SOUND_DURATION + " INTEGER DEFAULT 4,"

                    + Telephony.SimInfo.COLUMN_CB_ALERT_REMINDER_INTERVAL + " INTEGER DEFAULT 0,"

                    + Telephony.SimInfo.COLUMN_CB_ALERT_VIBRATE + " INTEGER DEFAULT 1,"

                    + Telephony.SimInfo.COLUMN_CB_ALERT_SPEECH + " INTEGER DEFAULT 1,"

                    + Telephony.SimInfo.COLUMN_CB_ETWS_TEST_ALERT + " INTEGER DEFAULT 0,"

                    + Telephony.SimInfo.COLUMN_CB_CHANNEL_50_ALERT + " INTEGER DEFAULT 1,"

                    + Telephony.SimInfo.COLUMN_CB_CMAS_TEST_ALERT + " INTEGER DEFAULT 0,"

                    + Telephony.SimInfo.COLUMN_CB_OPT_OUT_DIALOG + " INTEGER DEFAULT 1,"

                    + Telephony.SimInfo.COLUMN_ENHANCED_4G_MODE_ENABLED + " INTEGER DEFAULT -1,"

                    + Telephony.SimInfo.COLUMN_VT_IMS_ENABLED + " INTEGER DEFAULT -1,"

                    + Telephony.SimInfo.COLUMN_WFC_IMS_ENABLED + " INTEGER DEFAULT -1,"

                    + Telephony.SimInfo.COLUMN_WFC_IMS_MODE + " INTEGER DEFAULT -1,"

                    + Telephony.SimInfo.COLUMN_WFC_IMS_ROAMING_MODE + " INTEGER DEFAULT -1,"

                    + Telephony.SimInfo.COLUMN_WFC_IMS_ROAMING_ENABLED + " INTEGER DEFAULT -1,"

                    + Telephony.SimInfo.COLUMN_IS_OPPORTUNISTIC + " INTEGER DEFAULT 0,"

                    + Telephony.SimInfo.COLUMN_GROUP_UUID + " TEXT,"

                    + Telephony.SimInfo.COLUMN_IS_METERED + " INTEGER DEFAULT 1,"

                    + Telephony.SimInfo.COLUMN_ISO_COUNTRY_CODE + " TEXT,"

                    + Telephony.SimInfo.COLUMN_CARRIER_ID + " INTEGER DEFAULT -1,"

                    + Telephony.SimInfo.COLUMN_PROFILE_CLASS

                    + " INTEGER DEFAULT " + Telephony.SimInfo.PROFILE_CLASS_UNSET + ","

                    + Telephony.SimInfo.COLUMN_SUBSCRIPTION_TYPE + " INTEGER DEFAULT 0,"

                    + Telephony.SimInfo.COLUMN_GROUP_OWNER + " TEXT,"

                    + Telephony.SimInfo.COLUMN_DATA_ENABLED_OVERRIDE_RULES + " TEXT,"

                    + Telephony.SimInfo.COLUMN_IMSI + " TEXT,"

                    + Telephony.SimInfo.COLUMN_ACCESS_RULES_FROM_CARRIER_CONFIGS + " BLOB,"

                    + Telephony.SimInfo.COLUMN_UICC_APPLICATIONS_ENABLED + " INTEGER DEFAULT 1,"

                    + Telephony.SimInfo.COLUMN_ALLOWED_NETWORK_TYPES + " BIGINT DEFAULT -1, "

                    + Telephony.SimInfo.COLUMN_IMS_RCS_UCE_ENABLED + " INTEGER DEFAULT 0"

                    + ");";

        }

tests/telephonytests/src/com/android/internal/telephony/SubscriptionControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -1304,7 +1304,7 @@ public class SubscriptionControllerTest extends TelephonyTest { 
        assertTrue(mSubscriptionControllerUT.getNameSourcePriority(

                SubscriptionManager.NAME_SOURCE_SIM_PNN)

                > mSubscriptionControllerUT.getNameSourcePriority(

                SubscriptionManager.NAME_SOURCE_DEFAULT));

                SubscriptionManager.NAME_SOURCE_CARRIER_ID));

    }