Merge "Use feature flag in Settings." into master
Merge commit 'd76261e04cce4245a3ea3f7b0e6d903d39631c49' into faster_emergency_feature_flag
Manually merge this commit from pi-dev-plus-aosp to goog/master to
resolve a merge conflict.
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I9b226742c5eaf8b933e273688bf4e22c650dec46
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);