summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorJack Nudelman <jacknudelman@google.com>2021-04-29 20:43:24 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-04-29 20:43:24 +0000
commit296cec5c587716145e2a51022e2fce35830dc7de (patch)
treee529ce7d93543f5cd1522d1077ef732f087599ba /core/java
parentf018ea3c3e153b4dfc753b2beaf78c38c996f4e0 (diff)
parentf99f7fce5de205e0db576ca4aadd73235756a301 (diff)
Merge changes from topics "VOIMS_OPT_IN", "d2d" am: f99f7fce5d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689571 Change-Id: Iaefd51c1ebe49a81739600c6ef56d5663e54a81d
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/provider/Telephony.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java
index e6bea508b685..9c230d5cf079 100644
--- a/core/java/android/provider/Telephony.java
+++ b/core/java/android/provider/Telephony.java
@@ -5334,5 +5334,13 @@ public final class Telephony {
* @hide
*/
public static final String COLUMN_D2D_STATUS_SHARING = "d2d_sharing_status";
+
+ /**
+ * TelephonyProvider column name for VoIMS provisioning. Default is 0.
+ * <P>Type: INTEGER </P>
+ *
+ * @hide
+ */
+ public static final String COLUMN_VOIMS_OPT_IN_STATUS = "voims_opt_in_status";
}
}