diff options
| author | Leo Hsu <leohsu@google.com> | 2018-10-05 01:06:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-10-05 01:06:42 +0000 |
| commit | 77c2e6736ada05dbb36a90bbd90a9b718febcf94 (patch) | |
| tree | ca82f029f66ae66a30474eac854b782a83458a97 /core/java | |
| parent | cce5e4f4a2c09ee11fa20ec1f8adf2a0f5b088db (diff) | |
| parent | 82e5908df04db95235aea76e58fa4bd5acb99afe (diff) | |
Merge changes from topics "remove_feature_flag_emergency", "faster_emergency_feature_flag" into pi-dev
* changes:
RESTRICT AUTOMERGE: Removes feature flag for faster emergency call.
Add new metrics in power menu
Add feature flag in Settings.
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/provider/Settings.java | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index de621e38a72b..501d7f1d97c9 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -11236,14 +11236,6 @@ public final class Settings { public static final String EMERGENCY_AFFORDANCE_NEEDED = "emergency_affordance_needed"; /** - * Enable faster emergency phone call feature. - * The value is a boolean (1 or 0). - * @hide - */ - public static final String FASTER_EMERGENCY_PHONE_CALL_ENABLED = - "faster_emergency_phone_call_enabled"; - - /** * See RIL_PreferredNetworkType in ril.h * @hide */ |