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

Commit d2a25e66 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Remove poorly defined notification APIs." into pi-dev am: 36efb710 

am: d6e49bef

Change-Id: I6689556635b2ee8e56aca7325596e32efdc7311b
parents c5ae11b0 d6e49bef

api/current.txt

+0 −3
Original line number Diff line number Diff line
@@ -41687,10 +41687,7 @@ package android.telephony { 
    field public static final java.lang.String KEY_CONFIG_PLANS_PACKAGE_OVERRIDE_STRING = "config_plans_package_override_string";

    field public static final java.lang.String KEY_CONFIG_TELEPHONY_USE_OWN_NUMBER_FOR_VOICEMAIL_BOOL = "config_telephony_use_own_number_for_voicemail_bool";

    field public static final java.lang.String KEY_CSP_ENABLED_BOOL = "csp_enabled_bool";

    field public static final java.lang.String KEY_DATA_LIMIT_NOTIFICATION_BOOL = "data_limit_notification_bool";

    field public static final java.lang.String KEY_DATA_LIMIT_THRESHOLD_BYTES_LONG = "data_limit_threshold_bytes_long";

    field public static final java.lang.String KEY_DATA_RAPID_NOTIFICATION_BOOL = "data_rapid_notification_bool";

    field public static final java.lang.String KEY_DATA_WARNING_NOTIFICATION_BOOL = "data_warning_notification_bool";

    field public static final java.lang.String KEY_DATA_WARNING_THRESHOLD_BYTES_LONG = "data_warning_threshold_bytes_long";

    field public static final java.lang.String KEY_DEFAULT_SIM_CALL_MANAGER_STRING = "default_sim_call_manager_string";

    field public static final java.lang.String KEY_DEFAULT_VM_NUMBER_STRING = "default_vm_number_string";

telephony/java/android/telephony/CarrierConfigManager.java

+3 −0
Original line number Diff line number Diff line
@@ -1687,6 +1687,7 @@ public class CarrierConfigManager { 
     * Controls if the device should automatically notify the user as they reach

     * their cellular data warning. When set to {@code false} the carrier is

     * expected to have implemented their own notification mechanism.

     * @hide

     */

    public static final String KEY_DATA_WARNING_NOTIFICATION_BOOL =

            "data_warning_notification_bool";
@@ -1709,6 +1710,7 @@ public class CarrierConfigManager { 
     * Controls if the device should automatically notify the user as they reach

     * their cellular data limit. When set to {@code false} the carrier is

     * expected to have implemented their own notification mechanism.

     * @hide

     */

    public static final String KEY_DATA_LIMIT_NOTIFICATION_BOOL =

            "data_limit_notification_bool";
@@ -1717,6 +1719,7 @@ public class CarrierConfigManager { 
     * Controls if the device should automatically notify the user when rapid

     * cellular data usage is observed. When set to {@code false} the carrier is

     * expected to have implemented their own notification mechanism.

     * @hide

     */

    public static final String KEY_DATA_RAPID_NOTIFICATION_BOOL =

            "data_rapid_notification_bool";