Merge "[Telephony Mainline] Expose APIs in SubscriptionManager" (141b5bf9) · Commits · e / os / android_frameworks_opt_telephony

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

+2 −5

Original line number	Diff line number	Diff line
		@@ -1544,7 +1544,7 @@ public class SubscriptionController extends ISub.Stub {
		*/
		public static int getNameSourcePriority(@SimDisplayNameSource int nameSource) {
		int index = Arrays.asList(
		SubscriptionManager.NAME_SOURCE_DEFAULT_SOURCE,
		SubscriptionManager.NAME_SOURCE_DEFAULT,
		SubscriptionManager.NAME_SOURCE_SIM_PNN,
		SubscriptionManager.NAME_SOURCE_SIM_SPN,
		SubscriptionManager.NAME_SOURCE_CARRIER,
		@@ -1605,7 +1605,7 @@ public class SubscriptionController extends ISub.Stub {
		}
		ContentValues value = new ContentValues(1);
		value.put(SubscriptionManager.DISPLAY_NAME, nameToSet);
		if (nameSource >= SubscriptionManager.NAME_SOURCE_DEFAULT_SOURCE) {
		if (nameSource >= SubscriptionManager.NAME_SOURCE_DEFAULT) {
		if (DBG) logd("Set nameSource=" + nameSource);
		value.put(SubscriptionManager.NAME_SOURCE, nameSource);
		}
		@@ -2738,9 +2738,6 @@ public class SubscriptionController extends ISub.Stub {
		case SubscriptionManager.WFC_IMS_ROAMING_ENABLED:
		case SubscriptionManager.IS_OPPORTUNISTIC:
		case SubscriptionManager.GROUP_UUID:
		case SubscriptionManager.WHITE_LISTED_APN_DATA:
		resultValue = cursor.getInt(0) + "";
		break;
		case SubscriptionManager.DATA_ENABLED_OVERRIDE_RULES:
		resultValue = cursor.getString(0);
		break;

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -838,7 +838,7 @@ public class SubscriptionInfoUpdater extends Handler {
		int index =
		findSubscriptionInfoForIccid(existingSubscriptions, embeddedProfile.getIccid());
		int prevCarrierId = TelephonyManager.UNKNOWN_CARRIER_ID;
		int nameSource = SubscriptionManager.NAME_SOURCE_DEFAULT_SOURCE;
		int nameSource = SubscriptionManager.NAME_SOURCE_DEFAULT;
		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_SOURCE;
		nameSource = SubscriptionManager.NAME_SOURCE_DEFAULT;
		}
		}
		}

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

+60 −61

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@ import android.database.sqlite.SQLiteOpenHelper;
		import android.net.Uri;
		import android.os.Bundle;
		import android.provider.BaseColumns;
		import android.telephony.SubscriptionManager;
		import android.provider.Telephony;
		import android.test.mock.MockContentProvider;
		import android.util.Log;

		@@ -52,67 +52,66 @@ public class FakeTelephonyProvider extends MockContentProvider {
		// This should always be consistent with TelephonyProvider#getStringForSimInfoTableCreation.
		private String getStringForSimInfoTableCreation(String tableName) {
		return "CREATE TABLE " + tableName + "("
		+ SubscriptionManager.UNIQUE_KEY_SUBSCRIPTION_ID
		+ Telephony.SimInfo.UNIQUE_KEY_SUBSCRIPTION_ID
		+ " INTEGER PRIMARY KEY AUTOINCREMENT,"
		+ SubscriptionManager.ICC_ID + " TEXT NOT NULL,"
		+ SubscriptionManager.SIM_SLOT_INDEX
		+ " INTEGER DEFAULT " + SubscriptionManager.SIM_NOT_INSERTED + ","
		+ SubscriptionManager.DISPLAY_NAME + " TEXT,"
		+ SubscriptionManager.CARRIER_NAME + " TEXT,"
		+ SubscriptionManager.NAME_SOURCE
		+ " INTEGER DEFAULT " + SubscriptionManager.NAME_SOURCE_DEFAULT_SOURCE + ","
		+ SubscriptionManager.COLOR + " INTEGER DEFAULT "
		+ SubscriptionManager.COLOR_DEFAULT + ","
		+ SubscriptionManager.NUMBER + " TEXT,"
		+ SubscriptionManager.DISPLAY_NUMBER_FORMAT
		+ Telephony.SimInfo.ICC_ID + " TEXT NOT NULL,"
		+ Telephony.SimInfo.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.COLOR_DEFAULT + ","
		+ Telephony.SimInfo.NUMBER + " TEXT,"
		+ Telephony.SimInfo.DISPLAY_NUMBER_FORMAT
		+ " INTEGER NOT NULL DEFAULT "
		+ SubscriptionManager.DISPLAY_NUMBER_DEFAULT + ","
		+ SubscriptionManager.DATA_ROAMING
		+ " INTEGER DEFAULT " + SubscriptionManager.DATA_ROAMING_DEFAULT + ","
		+ SubscriptionManager.MCC + " INTEGER DEFAULT 0,"
		+ SubscriptionManager.MNC + " INTEGER DEFAULT 0,"
		+ SubscriptionManager.MCC_STRING + " TEXT,"
		+ SubscriptionManager.MNC_STRING + " TEXT,"
		+ SubscriptionManager.EHPLMNS + " TEXT,"
		+ SubscriptionManager.HPLMNS + " TEXT,"
		+ SubscriptionManager.SIM_PROVISIONING_STATUS
		+ " INTEGER DEFAULT " + SubscriptionManager.SIM_PROVISIONED + ","
		+ SubscriptionManager.IS_EMBEDDED + " INTEGER DEFAULT 0,"
		+ SubscriptionManager.CARD_ID + " TEXT NOT NULL,"
		+ SubscriptionManager.ACCESS_RULES + " BLOB,"
		+ SubscriptionManager.IS_REMOVABLE + " INTEGER DEFAULT 0,"
		+ SubscriptionManager.CB_EXTREME_THREAT_ALERT + " INTEGER DEFAULT 1,"
		+ SubscriptionManager.CB_SEVERE_THREAT_ALERT + " INTEGER DEFAULT 1,"
		+ SubscriptionManager.CB_AMBER_ALERT + " INTEGER DEFAULT 1,"
		+ SubscriptionManager.CB_EMERGENCY_ALERT + " INTEGER DEFAULT 1,"
		+ SubscriptionManager.CB_ALERT_SOUND_DURATION + " INTEGER DEFAULT 4,"
		+ SubscriptionManager.CB_ALERT_REMINDER_INTERVAL + " INTEGER DEFAULT 0,"
		+ SubscriptionManager.CB_ALERT_VIBRATE + " INTEGER DEFAULT 1,"
		+ SubscriptionManager.CB_ALERT_SPEECH + " INTEGER DEFAULT 1,"
		+ SubscriptionManager.CB_ETWS_TEST_ALERT + " INTEGER DEFAULT 0,"
		+ SubscriptionManager.CB_CHANNEL_50_ALERT + " INTEGER DEFAULT 1,"
		+ SubscriptionManager.CB_CMAS_TEST_ALERT + " INTEGER DEFAULT 0,"
		+ SubscriptionManager.CB_OPT_OUT_DIALOG + " INTEGER DEFAULT 1,"
		+ SubscriptionManager.ENHANCED_4G_MODE_ENABLED + " INTEGER DEFAULT -1,"
		+ SubscriptionManager.VT_IMS_ENABLED + " INTEGER DEFAULT -1,"
		+ SubscriptionManager.WFC_IMS_ENABLED + " INTEGER DEFAULT -1,"
		+ SubscriptionManager.WFC_IMS_MODE + " INTEGER DEFAULT -1,"
		+ SubscriptionManager.WFC_IMS_ROAMING_MODE + " INTEGER DEFAULT -1,"
		+ SubscriptionManager.WFC_IMS_ROAMING_ENABLED + " INTEGER DEFAULT -1,"
		+ SubscriptionManager.IS_OPPORTUNISTIC + " INTEGER DEFAULT 0,"
		+ SubscriptionManager.GROUP_UUID + " TEXT,"
		+ SubscriptionManager.IS_METERED + " INTEGER DEFAULT 1,"
		+ SubscriptionManager.ISO_COUNTRY_CODE + " TEXT,"
		+ SubscriptionManager.CARRIER_ID + " INTEGER DEFAULT -1,"
		+ SubscriptionManager.PROFILE_CLASS
		+ " INTEGER DEFAULT " + SubscriptionManager.PROFILE_CLASS_DEFAULT + ","
		+ SubscriptionManager.SUBSCRIPTION_TYPE + " INTEGER DEFAULT 0,"
		+ SubscriptionManager.WHITE_LISTED_APN_DATA + " INTEGER DEFAULT 0,"
		+ SubscriptionManager.GROUP_OWNER + " TEXT,"
		+ SubscriptionManager.DATA_ENABLED_OVERRIDE_RULES + " TEXT,"
		+ SubscriptionManager.IMSI + " TEXT,"
		+ SubscriptionManager.ACCESS_RULES_FROM_CARRIER_CONFIGS + " BLOB,"
		+ SubscriptionManager.UICC_APPLICATIONS_ENABLED + " INTEGER DEFAULT 1"
		+ 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
		+ " 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"
		+ ");";
		}

		@@ -135,7 +134,7 @@ public class FakeTelephonyProvider extends MockContentProvider {
		public Uri insert(Uri uri, ContentValues values) {
		SQLiteDatabase db = mDbHelper.getWritableDatabase();
		long id = db.insert("siminfo", null, values);
		return ContentUris.withAppendedId(SubscriptionManager.CONTENT_URI, id);
		return ContentUris.withAppendedId(Telephony.SimInfo.CONTENT_URI, id);
		}

		@Override

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1102,6 +1102,6 @@ public class SubscriptionControllerTest extends TelephonyTest {
		assertTrue(mSubscriptionControllerUT.getNameSourcePriority(
		SubscriptionManager.NAME_SOURCE_SIM_PNN)
		> mSubscriptionControllerUT.getNameSourcePriority(
		SubscriptionManager.NAME_SOURCE_DEFAULT_SOURCE));
		SubscriptionManager.NAME_SOURCE_DEFAULT));
		}
		}