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

Commit 8a6bd20b authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Renamed SUB_ID to SUBSCRIPTION_ID am: 08756809 

Change-Id: I3c5f995f742ea861140e22ab43ff40d89ab462ad
parents 0fc353ce 08756809

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -7221,7 +7221,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








@@ -2580,7 +2580,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








@@ -4166,7 +4166,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.










@@ -4447,7 +4447,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








@@ -572,7 +572,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());










@@ -636,7 +636,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);