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

Renamed SUB_ID to SUBSCRIPTION_ID am: 087568092a

Browse Source 
Change-Id: I3c5f995f742ea861140e22ab43ff40d89ab462ad
This commit is contained in:
Automerger Merge Worker
2020-02-05 19:19:27 +00:00
parent 0fc353ce55 087568092a
commit 8a6bd20bdb
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/system-current.txt
View File

@@ -7221,7 +7221,7 @@ package android.provider {
field public static final String SERIAL_NUMBER = "serial_number"; field public static final String SERIAL_NUMBER = "serial_number";
field public static final String SERVICE_CATEGORY = "service_category"; field public static final String SERVICE_CATEGORY = "service_category";
field public static final String SLOT_INDEX = "slot_index"; 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 { public static final class Telephony.CellBroadcasts.Preference {

2
api/test-current.txt
View File

@@ -2580,7 +2580,7 @@ package android.provider {
field public static final String SERIAL_NUMBER = "serial_number"; field public static final String SERIAL_NUMBER = "serial_number";
field public static final String SERVICE_CATEGORY = "service_category"; field public static final String SERVICE_CATEGORY = "service_category";
field public static final String SLOT_INDEX = "slot_index"; 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 { public static final class Telephony.Sms.Intents {

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

@@ -4166,7 +4166,7 @@ public final class Telephony {
* The subscription which received this cell broadcast message. * The subscription which received this cell broadcast message.
* <P>Type: INTEGER</P> * <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. * The slot which received this cell broadcast message.
@@ -4447,7 +4447,7 @@ public final class Telephony {
public static final String[] QUERY_COLUMNS_FWK = { public static final String[] QUERY_COLUMNS_FWK = {
_ID, _ID,
SLOT_INDEX, SLOT_INDEX,
SUB_ID, SUBSCRIPTION_ID,
GEOGRAPHICAL_SCOPE, GEOGRAPHICAL_SCOPE,
PLMN, PLMN,
LAC, LAC,

4
telephony/java/android/telephony/SmsCbMessage.java
View File

@@ -572,7 +572,7 @@ public final class SmsCbMessage implements Parcelable {
public ContentValues getContentValues() { public ContentValues getContentValues() {
ContentValues cv = new ContentValues(16); ContentValues cv = new ContentValues(16);
cv.put(CellBroadcasts.SLOT_INDEX, mSlotIndex); cv.put(CellBroadcasts.SLOT_INDEX, mSlotIndex);
cv.put(CellBroadcasts.SUB_ID, mSubId); cv.put(CellBroadcasts.SUBSCRIPTION_ID, mSubId);
cv.put(CellBroadcasts.GEOGRAPHICAL_SCOPE, mGeographicalScope); cv.put(CellBroadcasts.GEOGRAPHICAL_SCOPE, mGeographicalScope);
if (mLocation.getPlmn() != null) { if (mLocation.getPlmn() != null) {
cv.put(CellBroadcasts.PLMN, mLocation.getPlmn()); cv.put(CellBroadcasts.PLMN, mLocation.getPlmn());
@@ -636,7 +636,7 @@ public final class SmsCbMessage implements Parcelable {
int format = cursor.getInt(cursor.getColumnIndexOrThrow(CellBroadcasts.MESSAGE_FORMAT)); int format = cursor.getInt(cursor.getColumnIndexOrThrow(CellBroadcasts.MESSAGE_FORMAT));
int priority = cursor.getInt(cursor.getColumnIndexOrThrow(CellBroadcasts.MESSAGE_PRIORITY)); int priority = cursor.getInt(cursor.getColumnIndexOrThrow(CellBroadcasts.MESSAGE_PRIORITY));
int slotIndex = cursor.getInt(cursor.getColumnIndexOrThrow(CellBroadcasts.SLOT_INDEX)); 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; String plmn;
int plmnColumn = cursor.getColumnIndex(CellBroadcasts.PLMN); int plmnColumn = cursor.getColumnIndex(CellBroadcasts.PLMN);