Merge "Use TelephonyManager API to check if device is voice capable." am:...

Merge "Use TelephonyManager API to check if device is voice capable." am: ae675ff2 am: 9b636c7c am: c5075647

Change-Id: I0a4929d0568297df99db37a5477fb9d5519c9f2b

parents 554b5a59 c5075647

src/com/android/settings/CryptKeeper.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -964,7 +964,7 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
		}

		private boolean isEmergencyCallCapable() {
		return getResources().getBoolean(com.android.internal.R.bool.config_voice_capable);
		return getTelephonyManager().isVoiceCapable();
		}

		private void takeEmergencyCallAction() {