resolve merge conflicts of c55097a to m-wireless-dev.
Change-Id: Iff22d29465331e4e0d6a5c0876936c0e60813b7c
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 246c376..9369b6a 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -2266,4 +2266,20 @@
public int getSubIdForPhoneAccount(PhoneAccount phoneAccount) {
return PhoneUtils.getSubIdForPhoneAccount(phoneAccount);
}
+
+ /*
+ * {@hide}
+ * Returns the IMS Registration Status
+ */
+ public boolean isWifiCallingEnabled() {
+ return mPhone.isWifiCallingEnabled();
+ }
+
+ /*
+ * {@hide}
+ * Returns the IMS Registration Status
+ */
+ public boolean isVolteEnabled() {
+ return mPhone.isVolteEnabled();
+ }
}