summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Xiangyu/Malcolm Chen <refuhoo@google.com> 2018-11-30 04:16:29 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2018-11-30 04:16:29 +0000
commit4dd4cf567994c60df24bd690037504b6b132868c (patch)
tree2837b4b1436575d101f818397e5232d2fe596c9e
parent98b78236d0a1e8921c40ba89f36d42b0fbaf81bc (diff)
parent52f6dffbb14584fc7b5114261a73756482a04e1c (diff)
Merge "Remove PARENT_SUB_ID since it's no longer needed."
-rw-r--r--telephony/java/android/telephony/SubscriptionManager.java10
1 files changed, 3 insertions, 7 deletions
diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java
index a7c6b84f3a53..f8ada9b3a624 100644
--- a/telephony/java/android/telephony/SubscriptionManager.java
+++ b/telephony/java/android/telephony/SubscriptionManager.java
@@ -567,13 +567,7 @@ public class SubscriptionManager {
* @hide
*/
public static final String IS_OPPORTUNISTIC = "is_opportunistic";
- /**
- * TelephonyProvider column name for subId of parent subscription of an opportunistic
- * subscription.
- * if the parent sub id is valid, then is_opportunistic should always to true.
- * @hide
- */
- public static final String PARENT_SUB_ID = "parent_sub_id";
+
/**
* TelephonyProvider column name for group ID. Subscriptions with same group ID
* are considered bundled together, and should behave as a single subscription at
@@ -582,12 +576,14 @@ public class SubscriptionManager {
* @hide
*/
public static final String GROUP_UUID = "group_uuid";
+
/**
* TelephonyProvider column name for whether a subscription is metered or not, that is, whether
* the network it connects to charges for subscription or not. For example, paid CBRS or unpaid.
* @hide
*/
public static final String IS_METERED = "is_metered";
+
/**
* Broadcast Action: The user has changed one of the default subs related to
* data, phone calls, or sms</p>