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

Commit e94a7a4f authored Dec 19, 2019 by Jack Yu

Renamed SUB_ID to SUBSCRIPTION_ID

In order to be consistent with other existing APIs.

Test: Build
Bug: 146563563
Change-Id: Iac8d9abe3b011485ffe8220d94f25f99d022014b

parent 0447bc35

api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -7807,7 +7807,7 @@ package android.provider {
		field public static final String SERIAL_NUMBER = "serial_number";
		field public static final String SERVICE_CATEGORY = "service_category";
		field public static final String SLOT_INDEX = "slot_index";
		field public static final String SUB_ID = "sub_id";
		field public static final String SUBSCRIPTION_ID = "sub_id";
		}

		public static final class Telephony.CellBroadcasts.Preference {

api/test-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -2610,7 +2610,7 @@ package android.provider {
		field public static final String SERIAL_NUMBER = "serial_number";
		field public static final String SERVICE_CATEGORY = "service_category";
		field public static final String SLOT_INDEX = "slot_index";
		field public static final String SUB_ID = "sub_id";
		field public static final String SUBSCRIPTION_ID = "sub_id";
		}

		public static final class Telephony.Sms.Intents {

core/java/android/provider/Telephony.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -4216,7 +4216,7 @@ public final class Telephony {
		* The subscription which received this cell broadcast message.
		* <P>Type: INTEGER</P>
		*/
		public static final String SUB_ID = "sub_id";
		public static final String SUBSCRIPTION_ID = "sub_id";

		/**
		* The slot which received this cell broadcast message.
		@@ -4474,7 +4474,7 @@ public final class Telephony {
		public static final String[] QUERY_COLUMNS_FWK = {
		_ID,
		SLOT_INDEX,
		SUB_ID,
		SUBSCRIPTION_ID,
		GEOGRAPHICAL_SCOPE,
		PLMN,
		LAC,

telephony/java/android/telephony/SmsCbMessage.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -557,7 +557,7 @@ public final class SmsCbMessage implements Parcelable {
		public ContentValues getContentValues() {
		ContentValues cv = new ContentValues(16);
		cv.put(CellBroadcasts.SLOT_INDEX, mSlotIndex);
		cv.put(CellBroadcasts.SUB_ID, mSubId);
		cv.put(CellBroadcasts.SUBSCRIPTION_ID, mSubId);
		cv.put(CellBroadcasts.GEOGRAPHICAL_SCOPE, mGeographicalScope);
		if (mLocation.getPlmn() != null) {
		cv.put(CellBroadcasts.PLMN, mLocation.getPlmn());
		@@ -621,7 +621,7 @@ public final class SmsCbMessage implements Parcelable {
		int format = cursor.getInt(cursor.getColumnIndexOrThrow(CellBroadcasts.MESSAGE_FORMAT));
		int priority = cursor.getInt(cursor.getColumnIndexOrThrow(CellBroadcasts.MESSAGE_PRIORITY));
		int slotIndex = cursor.getInt(cursor.getColumnIndexOrThrow(CellBroadcasts.SLOT_INDEX));
		int subId = cursor.getInt(cursor.getColumnIndexOrThrow(CellBroadcasts.SUB_ID));
		int subId = cursor.getInt(cursor.getColumnIndexOrThrow(CellBroadcasts.SUBSCRIPTION_ID));

		String plmn;
		int plmnColumn = cursor.getColumnIndex(CellBroadcasts.PLMN);