diff options
| author | 2018-04-12 21:13:34 +0000 | |
|---|---|---|
| committer | 2018-04-12 21:13:34 +0000 | |
| commit | 36efb71088c2ab0de2c8d69aa3b80e27fbb24433 (patch) | |
| tree | baf4b247531b8166cee7e6bdbd9e8eaff1fc4b5a | |
| parent | e0a25acf08702a201e0721d85a5d19c4d5c6c6ce (diff) | |
| parent | 1df7ee57578adad1c1a7404c69f91f326d8e8712 (diff) | |
Merge "Remove poorly defined notification APIs." into pi-dev
| -rw-r--r-- | api/current.txt | 3 | ||||
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt index eac216815aaf..dc0802d27fd4 100644 --- a/api/current.txt +++ b/api/current.txt @@ -41685,10 +41685,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"; diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index e2441316c7e1..024f242a9eba 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -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"; |