commit fe2679db066e0d966f96e71831d12cc2e76008a9
author Yuanjia Hsu <yuanjiahsu@google.com> Mon Sep 17 13:43:08 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 17 13:43:08 2018 +0000
tree d54e58e24950d615f44167d90ce17802a6ed8fc6
parent fa47390a8fd34c19eb81656ff7694d0f4129a6b0
parent ce5a28c63b7fa3871e763e9af6927bfe55d12aff

Merge "Use feature flag in Settings."

src/com/android/phone/EmergencyDialer.java

diff --git a/src/com/android/phone/EmergencyDialer.java b/src/com/android/phone/EmergencyDialer.java
index 84c2d65..66701d5 100644
--- a/src/com/android/phone/EmergencyDialer.java
+++ b/src/com/android/phone/EmergencyDialer.java
@@ -62,6 +62,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;
@@ -350,8 +351,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);