Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove PARENT_SUB_ID since it's no longer needed."

Browse Source
This commit is contained in:
Xiangyu/Malcolm Chen
2018-11-30 04:16:29 +00:00
committed by Gerrit Code Review
parent 98b78236d0 52f6dffbb1
commit 4dd4cf5679
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
telephony/java/android/telephony/SubscriptionManager.java
View File

@@ -567,13 +567,7 @@ public class SubscriptionManager {
* @hide * @hide
*/ */
public static final String IS_OPPORTUNISTIC = "is_opportunistic"; 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 * TelephonyProvider column name for group ID. Subscriptions with same group ID
* are considered bundled together, and should behave as a single subscription at * are considered bundled together, and should behave as a single subscription at
@@ -582,12 +576,14 @@ public class SubscriptionManager {
* @hide * @hide
*/ */
public static final String GROUP_UUID = "group_uuid"; public static final String GROUP_UUID = "group_uuid";
/** /**
* TelephonyProvider column name for whether a subscription is metered or not, that is, whether * 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. * the network it connects to charges for subscription or not. For example, paid CBRS or unpaid.
* @hide * @hide
*/ */
public static final String IS_METERED = "is_metered"; public static final String IS_METERED = "is_metered";
/** /**
* Broadcast Action: The user has changed one of the default subs related to * Broadcast Action: The user has changed one of the default subs related to
* data, phone calls, or sms</p> * data, phone calls, or sms</p>