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

Add new column enabled_mobile_data_policies to siminfo table

Browse Source 
Add new column enabled_mobile_data_policies and copy the legacy data_enabled_override_rules to the new column. Future
read/write will only apply to the new column, and the legacy column will not be synced.

Bug: 244064524
Test: atest TelephonyManagerTest + TelephonyDatabaseHelperTest + TelephonyProviderTest + manual upgrade and observe user setting is preserved
Merged-In: I460c24909fb1eae689d02cedc76e24e87674a891
Change-Id: I460c24909fb1eae689d02cedc76e24e87674a891
This commit is contained in:
Ling Ma
2022-09-16 14:03:52 -07:00
committed by Jack Yu
parent a24d4a80f7
commit ed98c84815
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/provider/Telephony.java
View File

@@ -4311,12 +4311,24 @@ public final class Telephony {
* subscription and while is in voice call. * subscription and while is in voice call.
* *
* Default value is empty string. * Default value is empty string.
* * @deprecated This column is no longer supported. Use
* {@link #COLUMN_ENABLED_MOBILE_DATA_POLICIES} instead.
* @hide * @hide
*/ */
@Deprecated
public static final String COLUMN_DATA_ENABLED_OVERRIDE_RULES = public static final String COLUMN_DATA_ENABLED_OVERRIDE_RULES =
"data_enabled_override_rules"; "data_enabled_override_rules";
/**
* TelephonyProvider column name enabled_mobile_data_policies.
* A list of mobile data policies, each of which represented by an integer and joint by ",".
*
* Default value is empty string.
* @hide
*/
public static final String COLUMN_ENABLED_MOBILE_DATA_POLICIES =
"enabled_mobile_data_policies";
/** /**
* TelephonyProvider column name for user displayed name. * TelephonyProvider column name for user displayed name.
* <P>Type: TEXT (String)</P> * <P>Type: TEXT (String)</P>

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

@@ -486,18 +486,14 @@ public class SubscriptionManager {
public static final String TP_MESSAGE_REF = SimInfo.COLUMN_TP_MESSAGE_REF; public static final String TP_MESSAGE_REF = SimInfo.COLUMN_TP_MESSAGE_REF;
/** /**
* TelephonyProvider column name data_enabled_override_rules. * TelephonyProvider column name enabled_mobile_data_policies.
* It's a list of rules for overriding data enabled settings. The syntax is * A list of mobile data policies, each of which represented by an integer and joint by ",".
* For example, "mms=nonDefault" indicates enabling data for mms in non-default subscription.
* "default=nonDefault&inVoiceCall" indicates enabling data for internet in non-default
* subscription and while is in voice call.
* *
* Default value is empty string. * Default value is empty string.
*
* @hide * @hide
*/ */
public static final String DATA_ENABLED_OVERRIDE_RULES = public static final String ENABLED_MOBILE_DATA_POLICIES =
SimInfo.COLUMN_DATA_ENABLED_OVERRIDE_RULES; SimInfo.COLUMN_ENABLED_MOBILE_DATA_POLICIES;
/** @hide */ /** @hide */
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)