summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-05 19:27:32 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-05 19:27:32 +0000
commita18c5c0266e96b4fb451d49c945a0a646f1d46d9 (patch)
treecec348fdda1cb645b07ec9b45f37a92864bdae45 /core/java/android
parent7896578eb872d603e3ea122fb23101f97ae04a59 (diff)
parent8a6bd20bdb886b53296452835cccd3626368fe92 (diff)
Renamed SUB_ID to SUBSCRIPTION_ID am: 087568092a am: 8a6bd20bdb
Change-Id: I5ad401812d99944597f54b5d9647e7976eb5aa8c
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/provider/Telephony.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java
index c2b0ace7019a..a897a8e4994a 100644
--- a/core/java/android/provider/Telephony.java
+++ b/core/java/android/provider/Telephony.java
@@ -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,