From 153fcd7ba14b2eba5cf1b1d17437540e2a68322f Mon Sep 17 00:00:00 2001 From: Ta-wei Yen Date: Tue, 17 May 2016 15:57:20 -0700 Subject: [PATCH] Rename visual voicemail sync intent value Rename value of KEY_VVM_CELLULAR_DATA_REQUIRED_BOOL KEY_VVM_PREFETCH_BOOL Change-Id: I13718333a8ddc38e8d2131b478562b76cf9aab64 Fixes:28819765 Fixes:28822093 --- api/current.txt | 6 +++--- api/system-current.txt | 14 +++++++------- api/test-current.txt | 6 +++--- core/java/android/provider/VoicemailContract.java | 2 +- .../android/telephony/CarrierConfigManager.java | 5 +++-- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/api/current.txt b/api/current.txt index c808e04ff3c25..b0eb44639162e 100644 --- a/api/current.txt +++ b/api/current.txt @@ -32931,7 +32931,7 @@ package android.provider { public class VoicemailContract { field public static final java.lang.String ACTION_FETCH_VOICEMAIL = "android.intent.action.FETCH_VOICEMAIL"; field public static final java.lang.String ACTION_NEW_VOICEMAIL = "android.intent.action.NEW_VOICEMAIL"; - field public static final java.lang.String ACTION_SYNC_VOICEMAIL = "android.intent.action.SYNC_VOICEMAIL"; + field public static final java.lang.String ACTION_SYNC_VOICEMAIL = "android.provider.action.SYNC_VOICEMAIL"; field public static final java.lang.String AUTHORITY = "com.android.voicemail"; field public static final java.lang.String EXTRA_SELF_CHANGE = "com.android.voicemail.extra.SELF_CHANGE"; field public static final java.lang.String PARAM_KEY_SOURCE_PACKAGE = "source_package"; @@ -36695,10 +36695,10 @@ package android.telephony { field public static final java.lang.String KEY_VOICEMAIL_NOTIFICATION_PERSISTENT_BOOL = "voicemail_notification_persistent_bool"; field public static final java.lang.String KEY_VOICE_PRIVACY_DISABLE_UI_BOOL = "voice_privacy_disable_ui_bool"; field public static final java.lang.String KEY_VOLTE_REPLACEMENT_RAT_INT = "volte_replacement_rat_int"; - field public static final java.lang.String KEY_VVM_CELLULAR_DATA_REQUIRED_BOOL = "vvm_cellular_data_required"; + field public static final java.lang.String KEY_VVM_CELLULAR_DATA_REQUIRED_BOOL = "vvm_cellular_data_required_bool"; field public static final java.lang.String KEY_VVM_DESTINATION_NUMBER_STRING = "vvm_destination_number_string"; field public static final java.lang.String KEY_VVM_PORT_NUMBER_INT = "vvm_port_number_int"; - field public static final java.lang.String KEY_VVM_PREFETCH_BOOL = "vvm_prefetch"; + field public static final java.lang.String KEY_VVM_PREFETCH_BOOL = "vvm_prefetch_bool"; field public static final java.lang.String KEY_VVM_TYPE_STRING = "vvm_type_string"; field public static final java.lang.String KEY_WORLD_PHONE_BOOL = "world_phone_bool"; } diff --git a/api/system-current.txt b/api/system-current.txt index fa9bdb881aa29..335c197250fc6 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -31762,6 +31762,7 @@ package android.os { method public android.os.UserHandle getUserForSerialNumber(long); method public java.lang.String getUserName(); method public java.util.List getUserProfiles(); + method public int getUserRestrictionSource(java.lang.String, android.os.UserHandle); method public android.os.Bundle getUserRestrictions(); method public android.os.Bundle getUserRestrictions(android.os.UserHandle); method public boolean hasUserRestriction(java.lang.String); @@ -31779,7 +31780,6 @@ package android.os { method public deprecated void setUserRestrictions(android.os.Bundle); method public deprecated void setUserRestrictions(android.os.Bundle, android.os.UserHandle); method public static boolean supportsMultipleUsers(); - method public int getUserRestrictionSource(java.lang.String, android.os.UserHandle); field public static final java.lang.String ALLOW_PARENT_PROFILE_APP_LINKING = "allow_parent_profile_app_linking"; field public static final java.lang.String DISALLOW_ADD_USER = "no_add_user"; field public static final java.lang.String DISALLOW_ADJUST_VOLUME = "no_adjust_volume"; @@ -31815,12 +31815,12 @@ package android.os { field public static final java.lang.String DISALLOW_USB_FILE_TRANSFER = "no_usb_file_transfer"; field public static final java.lang.String ENSURE_VERIFY_APPS = "ensure_verify_apps"; field public static final java.lang.String KEY_RESTRICTIONS_PENDING = "restrictions_pending"; - field public static final int USER_CREATION_FAILED_NOT_PERMITTED = 1; // 0x1 - field public static final int USER_CREATION_FAILED_NO_MORE_USERS = 2; // 0x2 field public static final int RESTRICTION_NOT_SET = 0; // 0x0 - field public static final int RESTRICTION_SOURCE_SYSTEM = 1; // 0x1 field public static final int RESTRICTION_SOURCE_DEVICE_OWNER = 2; // 0x2 field public static final int RESTRICTION_SOURCE_PROFILE_OWNER = 4; // 0x4 + field public static final int RESTRICTION_SOURCE_SYSTEM = 1; // 0x1 + field public static final int USER_CREATION_FAILED_NOT_PERMITTED = 1; // 0x1 + field public static final int USER_CREATION_FAILED_NO_MORE_USERS = 2; // 0x2 } public static abstract class UserManager.UserRestrictionSource implements java.lang.annotation.Annotation { @@ -35641,7 +35641,7 @@ package android.provider { public class VoicemailContract { field public static final java.lang.String ACTION_FETCH_VOICEMAIL = "android.intent.action.FETCH_VOICEMAIL"; field public static final java.lang.String ACTION_NEW_VOICEMAIL = "android.intent.action.NEW_VOICEMAIL"; - field public static final java.lang.String ACTION_SYNC_VOICEMAIL = "android.intent.action.SYNC_VOICEMAIL"; + field public static final java.lang.String ACTION_SYNC_VOICEMAIL = "android.provider.action.SYNC_VOICEMAIL"; field public static final java.lang.String AUTHORITY = "com.android.voicemail"; field public static final java.lang.String EXTRA_SELF_CHANGE = "com.android.voicemail.extra.SELF_CHANGE"; field public static final java.lang.String PARAM_KEY_SOURCE_PACKAGE = "source_package"; @@ -39632,10 +39632,10 @@ package android.telephony { field public static final java.lang.String KEY_VOICEMAIL_NOTIFICATION_PERSISTENT_BOOL = "voicemail_notification_persistent_bool"; field public static final java.lang.String KEY_VOICE_PRIVACY_DISABLE_UI_BOOL = "voice_privacy_disable_ui_bool"; field public static final java.lang.String KEY_VOLTE_REPLACEMENT_RAT_INT = "volte_replacement_rat_int"; - field public static final java.lang.String KEY_VVM_CELLULAR_DATA_REQUIRED_BOOL = "vvm_cellular_data_required"; + field public static final java.lang.String KEY_VVM_CELLULAR_DATA_REQUIRED_BOOL = "vvm_cellular_data_required_bool"; field public static final java.lang.String KEY_VVM_DESTINATION_NUMBER_STRING = "vvm_destination_number_string"; field public static final java.lang.String KEY_VVM_PORT_NUMBER_INT = "vvm_port_number_int"; - field public static final java.lang.String KEY_VVM_PREFETCH_BOOL = "vvm_prefetch"; + field public static final java.lang.String KEY_VVM_PREFETCH_BOOL = "vvm_prefetch_bool"; field public static final java.lang.String KEY_VVM_TYPE_STRING = "vvm_type_string"; field public static final java.lang.String KEY_WORLD_PHONE_BOOL = "world_phone_bool"; } diff --git a/api/test-current.txt b/api/test-current.txt index d572c8dc1422e..c6abadac4d822 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -33007,7 +33007,7 @@ package android.provider { public class VoicemailContract { field public static final java.lang.String ACTION_FETCH_VOICEMAIL = "android.intent.action.FETCH_VOICEMAIL"; field public static final java.lang.String ACTION_NEW_VOICEMAIL = "android.intent.action.NEW_VOICEMAIL"; - field public static final java.lang.String ACTION_SYNC_VOICEMAIL = "android.intent.action.SYNC_VOICEMAIL"; + field public static final java.lang.String ACTION_SYNC_VOICEMAIL = "android.provider.action.SYNC_VOICEMAIL"; field public static final java.lang.String AUTHORITY = "com.android.voicemail"; field public static final java.lang.String EXTRA_SELF_CHANGE = "com.android.voicemail.extra.SELF_CHANGE"; field public static final java.lang.String PARAM_KEY_SOURCE_PACKAGE = "source_package"; @@ -36772,10 +36772,10 @@ package android.telephony { field public static final java.lang.String KEY_VOICEMAIL_NOTIFICATION_PERSISTENT_BOOL = "voicemail_notification_persistent_bool"; field public static final java.lang.String KEY_VOICE_PRIVACY_DISABLE_UI_BOOL = "voice_privacy_disable_ui_bool"; field public static final java.lang.String KEY_VOLTE_REPLACEMENT_RAT_INT = "volte_replacement_rat_int"; - field public static final java.lang.String KEY_VVM_CELLULAR_DATA_REQUIRED_BOOL = "vvm_cellular_data_required"; + field public static final java.lang.String KEY_VVM_CELLULAR_DATA_REQUIRED_BOOL = "vvm_cellular_data_required_bool"; field public static final java.lang.String KEY_VVM_DESTINATION_NUMBER_STRING = "vvm_destination_number_string"; field public static final java.lang.String KEY_VVM_PORT_NUMBER_INT = "vvm_port_number_int"; - field public static final java.lang.String KEY_VVM_PREFETCH_BOOL = "vvm_prefetch"; + field public static final java.lang.String KEY_VVM_PREFETCH_BOOL = "vvm_prefetch_bool"; field public static final java.lang.String KEY_VVM_TYPE_STRING = "vvm_type_string"; field public static final java.lang.String KEY_WORLD_PHONE_BOOL = "world_phone_bool"; } diff --git a/core/java/android/provider/VoicemailContract.java b/core/java/android/provider/VoicemailContract.java index 8ee9d1eaf9149..16f50ef4e6ddb 100644 --- a/core/java/android/provider/VoicemailContract.java +++ b/core/java/android/provider/VoicemailContract.java @@ -104,7 +104,7 @@ public class VoicemailContract { * Broadcast intent to request all voicemail sources to perform a sync with the remote server. */ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) - public static final String ACTION_SYNC_VOICEMAIL = "android.intent.action.SYNC_VOICEMAIL"; + public static final String ACTION_SYNC_VOICEMAIL = "android.provider.action.SYNC_VOICEMAIL"; /** * Extra included in {@link Intent#ACTION_PROVIDER_CHANGED} broadcast intents to indicate if the diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 33e6cea7c77f6..78efd055aa6db 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -459,12 +459,13 @@ public class CarrierConfigManager { /** * Whether cellular data is required to access visual voicemail. */ - public static final String KEY_VVM_CELLULAR_DATA_REQUIRED_BOOL = "vvm_cellular_data_required"; + public static final String KEY_VVM_CELLULAR_DATA_REQUIRED_BOOL = + "vvm_cellular_data_required_bool"; /** * Whether to prefetch audio data on new voicemail arrival, defaulted to true. */ - public static final String KEY_VVM_PREFETCH_BOOL = "vvm_prefetch"; + public static final String KEY_VVM_PREFETCH_BOOL = "vvm_prefetch_bool"; /** * The package name of the carrier's visual voicemail app to ensure that dialer visual voicemail