Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d7c21fd authored by Ta-wei Yen's avatar Ta-wei Yen Committed by android-build-merger
Browse files

Merge "Rename visual voicemail sync intent value" into nyc-dev am: 0f712b16 am: 621b68a2 

am: f652b1ec

* commit 'f652b1ec':
  Rename visual voicemail sync intent value

Change-Id: I3769f7a4958eae52047dc276b96939a73418d1ac
parents 6ede1177 f652b1ec

api/current.txt

+3 −3
Original line number Diff line number Diff line
@@ -33057,7 +33057,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";
@@ -36859,10 +36859,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";

  }

api/system-current.txt

+3 −3
Original line number Diff line number Diff line
@@ -35763,7 +35763,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";
@@ -39792,10 +39792,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";

  }

api/test-current.txt

+3 −3
Original line number Diff line number Diff line
@@ -33134,7 +33134,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";
@@ -36937,10 +36937,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";

  }

core/java/android/provider/VoicemailContract.java

+1 −1
Original line number Diff line number Diff line
@@ -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";



    /**

     * Broadcast intent to inform a new visual voicemail SMS has been received. This intent will

telephony/java/android/telephony/CarrierConfigManager.java

+3 −2
Original line number Diff line number Diff line
@@ -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