commit ce5a28c63b7fa3871e763e9af6927bfe55d12aff
author yuanjiahsu <yuanjiahsu@google.com> Thu Sep 06 19:54:15 2018 +0800
committer yuanjiahsu <yuanjiahsu@google.com> Tue Sep 11 15:15:28 2018 +0800
tree 96921770d9265e46be3c811ddac5a8af25cb2bb6
parent f9dd100b1b19f7ad2b09d4ad2f7ab0d0b10f4405

Use feature flag in Settings.

User can enable/disable faster emergency phone call feature by switching
feature flag from Settings, and the old flag switched by adb command was
replaced by this feature flag.

Test: Manually
Bug: 113539598
Change-Id: Iaa2389845301d387da5924daa368169a8e6768c1

src/com/android/phone/EmergencyDialer.java

diff --git a/src/com/android/phone/EmergencyDialer.java b/src/com/android/phone/EmergencyDialer.java
index a89b52d..facf9d5 100644
--- a/src/com/android/phone/EmergencyDialer.java
+++ b/src/com/android/phone/EmergencyDialer.java
@@ -54,6 +54,7 @@
 import android.text.TextWatcher;
 import android.text.method.DialerKeyListener;
 import android.text.style.TtsSpan;
+import android.util.FeatureFlagUtils;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.HapticFeedbackConstants;
@@ -223,8 +224,8 @@
         // Allow turning screen on
         setTurnScreenOn(true);
 
-        mAreEmergencyDialerShortcutsEnabled = Settings.Global.getInt(getContentResolver(),
-                Settings.Global.FASTER_EMERGENCY_PHONE_CALL_ENABLED, 0) != 0;
+        mAreEmergencyDialerShortcutsEnabled = FeatureFlagUtils
+                .isEnabled(this, FeatureFlagUtils.EMERGENCY_DIAL_SHORTCUTS);
         Log.d(LOG_TAG, "Enable emergency dialer shortcut: "
                 + mAreEmergencyDialerShortcutsEnabled);