commit 90dc5475d81e0c9899e2bbf46852a5a23bca0a1e
author Pavel Zhamaitsiak <pavelz@google.com> Mon Mar 16 23:51:12 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 16 23:51:13 2015 +0000
tree ed86bff6a613cbbea1dfb4594716de5fe62633cf
parent c1e2c65191513555b6ecfb4830d57f83d375c13e
parent 6e501e7dd96ad52ce80479ed1f85dfd71e8d060b

Merge "Disable WFC in case of "permanent" registration failures." into lmp-mr1-wfc-dev

src/java/com/android/internal/telephony/Phone.java

diff --git a/src/java/com/android/internal/telephony/Phone.java b/src/java/com/android/internal/telephony/Phone.java
index 1c6a0c2..59e932b 100644
--- a/src/java/com/android/internal/telephony/Phone.java
+++ b/src/java/com/android/internal/telephony/Phone.java
@@ -1979,4 +1979,16 @@
      * @return true if IMS is Registered
      */
     public boolean isImsRegistered();
+
+    /**
+     * Returns the Status of Wi-Fi Calling
+     *@hide
+     */
+    public boolean isWifiCallingEnabled();
+
+     /**
+     * Returns the Status of Volte
+     *@hide
+     */
+    public boolean isVolteEnabled();
 }

src/java/com/android/internal/telephony/PhoneBase.java

diff --git a/src/java/com/android/internal/telephony/PhoneBase.java b/src/java/com/android/internal/telephony/PhoneBase.java
index 35ee313..0148891 100644
--- a/src/java/com/android/internal/telephony/PhoneBase.java
+++ b/src/java/com/android/internal/telephony/PhoneBase.java
@@ -2086,6 +2086,34 @@
         return isImsRegistered;
     }
 
+    /**
+     * Get Wifi Calling Feature Availability
+     */
+    @Override
+    public boolean isWifiCallingEnabled() {
+        ImsPhone imsPhone = mImsPhone;
+        boolean isWifiCallingEnabled = false;
+        if (imsPhone != null) {
+            isWifiCallingEnabled = imsPhone.isVowifiEnabled();
+        }
+        Rlog.d(LOG_TAG, "isWifiCallingEnabled =" + isWifiCallingEnabled);
+        return isWifiCallingEnabled;
+    }
+
+    /**
+     * Get Volte Feature Availability
+     */
+    @Override
+    public boolean isVolteEnabled() {
+        ImsPhone imsPhone = mImsPhone;
+        boolean isVolteEnabled = false;
+        if (imsPhone != null) {
+            isVolteEnabled = imsPhone.isVolteEnabled();
+        }
+        Rlog.d(LOG_TAG, "isImsRegistered =" + isVolteEnabled);
+        return isVolteEnabled;
+    }
+
     private boolean getRoamingOverrideHelper(String prefix, String key) {
         String iccId = getIccSerialNumber();
         if (TextUtils.isEmpty(iccId) || TextUtils.isEmpty(key)) {

src/java/com/android/internal/telephony/PhoneProxy.java

diff --git a/src/java/com/android/internal/telephony/PhoneProxy.java b/src/java/com/android/internal/telephony/PhoneProxy.java
index 152df18..70ee3db 100644
--- a/src/java/com/android/internal/telephony/PhoneProxy.java
+++ b/src/java/com/android/internal/telephony/PhoneProxy.java
@@ -1512,6 +1512,14 @@
         return mActivePhone.isImsRegistered();
     }
 
+    public boolean isVolteEnabled() {
+        return mActivePhone.isVolteEnabled();
+    }
+
+    public boolean isWifiCallingEnabled() {
+        return mActivePhone.isWifiCallingEnabled();
+    }
+
     public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
         try {
             ((PhoneBase)mActivePhone).dump(fd, pw, args);