summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorJack Nudelman <jacknudelman@google.com>2021-04-29 18:31:39 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2021-04-29 18:31:39 +0000
commitf99f7fce5de205e0db576ca4aadd73235756a301 (patch)
treee56d38b2c38ea5d382576d091391bdb46cd84cfa /core/java/android
parent2a2aa6d3c5c3b3175c07d05b83194e625cf09ee8 (diff)
parent1fe2aa14c40cfe64d46f08099bbed4b64d139e64 (diff)
Merge changes from topics "VOIMS_OPT_IN", "d2d"
* changes: Add new provisioning flag for VOIMS opt-in Add D2D sharing level setting APIs.
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/provider/Telephony.java15
1 files changed, 15 insertions, 0 deletions
diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java
index a3a910acae63..9c230d5cf079 100644
--- a/core/java/android/provider/Telephony.java
+++ b/core/java/android/provider/Telephony.java
@@ -5327,5 +5327,20 @@ public final class Telephony {
* @hide
*/
public static final String COLUMN_RCS_CONFIG = "rcs_config";
+
+ /**
+ * TelephonyProvider column name for device to device sharing status.
+ *
+ * @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";
}
}