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

Commit 6c8cc662 authored by Ta-wei Yen's avatar Ta-wei Yen Committed by Android (Google) Code Review
Browse files

Merge "Add KEY_VVM_PREFETCH_BOOLEAN to CarrierConfigManager"

parents 518803fa 76193dc2

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -36022,6 +36022,7 @@ package android.telephony { 
    field public static final java.lang.String KEY_VVM_CELLULAR_DATA_REQUIRED_BOOLEAN = "vvm_cellular_data_required";

    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_BOOLEAN = "vvm_prefetch";

    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

+1 −0
Original line number Diff line number Diff line
@@ -38421,6 +38421,7 @@ package android.telephony { 
    field public static final java.lang.String KEY_VVM_CELLULAR_DATA_REQUIRED_BOOLEAN = "vvm_cellular_data_required";

    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_BOOLEAN = "vvm_prefetch";

    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

+1 −0
Original line number Diff line number Diff line
@@ -36036,6 +36036,7 @@ package android.telephony { 
    field public static final java.lang.String KEY_VVM_CELLULAR_DATA_REQUIRED_BOOLEAN = "vvm_cellular_data_required";

    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_BOOLEAN = "vvm_prefetch";

    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";

  }

telephony/java/android/telephony/CarrierConfigManager.java

+6 −0
Original line number Diff line number Diff line
@@ -408,6 +408,11 @@ public class CarrierConfigManager { 
     */

    public static final String KEY_VVM_CELLULAR_DATA_REQUIRED_BOOLEAN = "vvm_cellular_data_required";



    /**

     * Whether to prefetch audio data on new voicemail arrival, defaulted to true.

     */

    public static final String KEY_VVM_PREFETCH_BOOLEAN = "vvm_prefetch";



    /**

     * The package name of the carrier's visual voicemail app to ensure that dialer visual voicemail

     * and carrier visual voicemail are not active at the same time.
@@ -638,6 +643,7 @@ public class CarrierConfigManager { 
        sDefaults.putInt(KEY_VVM_PORT_NUMBER_INT, 0);

        sDefaults.putString(KEY_VVM_TYPE_STRING, "");

        sDefaults.putBoolean(KEY_VVM_CELLULAR_DATA_REQUIRED_BOOLEAN,false);

        sDefaults.putBoolean(KEY_VVM_PREFETCH_BOOLEAN,true);

        sDefaults.putString(KEY_CARRIER_VVM_PACKAGE_NAME_STRING, "");

        sDefaults.putBoolean(KEY_CI_ACTION_ON_SYS_UPDATE_BOOL, false);

        sDefaults.putString(KEY_CI_ACTION_ON_SYS_UPDATE_INTENT_STRING, "");