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

Commit 2cc67382 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert "Unhide enable_apps carrier config key."" into pi-dev

parents ce61d118 d5e1af54

api/current.txt

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

    field public static final java.lang.String KEY_EDITABLE_ENHANCED_4G_LTE_BOOL = "editable_enhanced_4g_lte_bool";

    field public static final java.lang.String KEY_EDITABLE_VOICEMAIL_NUMBER_BOOL = "editable_voicemail_number_bool";

    field public static final java.lang.String KEY_EDITABLE_VOICEMAIL_NUMBER_BOOL = "editable_voicemail_number_bool";

    field public static final java.lang.String KEY_EDITABLE_VOICEMAIL_NUMBER_SETTING_BOOL = "editable_voicemail_number_setting_bool";

    field public static final java.lang.String KEY_EDITABLE_VOICEMAIL_NUMBER_SETTING_BOOL = "editable_voicemail_number_setting_bool";

    field public static final java.lang.String KEY_ENABLE_APPS_STRING_ARRAY = "enable_apps_string_array";

    field public static final java.lang.String KEY_ENABLE_DIALER_KEY_VIBRATION_BOOL = "enable_dialer_key_vibration_bool";

    field public static final java.lang.String KEY_ENABLE_DIALER_KEY_VIBRATION_BOOL = "enable_dialer_key_vibration_bool";

    field public static final java.lang.String KEY_FORCE_HOME_NETWORK_BOOL = "force_home_network_bool";

    field public static final java.lang.String KEY_FORCE_HOME_NETWORK_BOOL = "force_home_network_bool";

    field public static final java.lang.String KEY_GSM_DTMF_TONE_DELAY_INT = "gsm_dtmf_tone_delay_int";

    field public static final java.lang.String KEY_GSM_DTMF_TONE_DELAY_INT = "gsm_dtmf_tone_delay_int";

telephony/java/android/telephony/CarrierConfigManager.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -951,6 +951,8 @@ public class CarrierConfigManager { 
     * If user has explicitly disabled some packages in the list, won't re-enable.

     * If user has explicitly disabled some packages in the list, won't re-enable.

     * Other carrier specific apps which are not in this list may be disabled for current carrier,

     * Other carrier specific apps which are not in this list may be disabled for current carrier,

     * and only be re-enabled when this config for another carrier includes it.

     * and only be re-enabled when this config for another carrier includes it.

     *

     * @hide

     */

     */

    public static final String KEY_ENABLE_APPS_STRING_ARRAY = "enable_apps_string_array";

    public static final String KEY_ENABLE_APPS_STRING_ARRAY = "enable_apps_string_array";