From eee09129530eb81f56a864e24c0d366bcea1ec04 Mon Sep 17 00:00:00 2001 From: Ling Ma Date: Fri, 16 Sep 2022 14:03:52 -0700 Subject: [PATCH] Add new column enabled_mobile_data_policies to siminfo table 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 --- core/java/android/provider/Telephony.java | 14 +++++++++++++- .../android/telephony/SubscriptionManager.java | 12 ++++-------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java index 0c9eaa41ade0c..001a25d8be8fb 100644 --- a/core/java/android/provider/Telephony.java +++ b/core/java/android/provider/Telephony.java @@ -4311,12 +4311,24 @@ public final class Telephony { * subscription and while is in voice call. * * Default value is empty string. - * + * @deprecated This column is no longer supported. Use + * {@link #COLUMN_ENABLED_MOBILE_DATA_POLICIES} instead. * @hide */ + @Deprecated public static final String COLUMN_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. *

Type: TEXT (String)

diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index ac148e7d05d78..8665858f49382 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -486,18 +486,14 @@ public class SubscriptionManager { public static final String TP_MESSAGE_REF = SimInfo.COLUMN_TP_MESSAGE_REF; /** - * TelephonyProvider column name data_enabled_override_rules. - * It's a list of rules for overriding data enabled settings. The syntax is - * 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. + * 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 DATA_ENABLED_OVERRIDE_RULES = - SimInfo.COLUMN_DATA_ENABLED_OVERRIDE_RULES; + public static final String ENABLED_MOBILE_DATA_POLICIES = + SimInfo.COLUMN_ENABLED_MOBILE_DATA_POLICIES; /** @hide */ @Retention(RetentionPolicy.SOURCE)