Merge "Add ims registration status" into stage-aosp-master

telephony/java/android/telephony/CarrierConfigManager.java

@@ -1539,6 +1539,14 @@ public class CarrierConfigManager {
      */
     public static final String KEY_CONVERT_CDMA_CALLER_ID_MMI_CODES_WHILE_ROAMING_ON_3GPP_BOOL =
             "convert_cdma_caller_id_mmi_codes_while_roaming_on_3gpp_bool";
+    
+    /**
+     * Flag specifying whether IMS registration state menu is shown in Status Info setting,
+     * default to false.
+     * @hide
+     */
+    public static final String KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL =
+            "show_ims_registration_status_bool";
 
     /** The default value for every variable. */
     private final static PersistableBundle sDefaults;
@@ -1805,6 +1813,7 @@ public class CarrierConfigManager {
                 false);
         sDefaults.putStringArray(KEY_NON_ROAMING_OPERATOR_STRING_ARRAY, null);
         sDefaults.putStringArray(KEY_ROAMING_OPERATOR_STRING_ARRAY, null);
+        sDefaults.putBoolean(KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL, false);
     }
 
     /**

telephony/java/android/telephony/TelephonyManager.java

@@ -5815,6 +5815,25 @@ public class TelephonyManager {
        }
    }
 
+    /**
+     * Returns the IMS Registration Status for a particular Subscription ID
+     *
+     * @param subId Subscription ID
+     * @return true if IMS status is registered, false if the IMS status is not registered or a
+     * RemoteException occurred.
+     *
+     * @hide
+     */
+    public boolean isImsRegistered(int subId) {
+       try {
+           return getITelephony().isImsRegisteredForSubscriber(subId);
+       } catch (RemoteException ex) {
+           return false;
+       } catch (NullPointerException ex) {
+           return false;
+       }
+    }
+
     /**
      * Returns the Status of Volte
      * @hide

telephony/java/com/android/internal/telephony/ITelephony.aidl

@@ -1088,6 +1088,15 @@ interface ITelephony {
      */
     boolean isImsRegistered();
 
+    /**
+     * Get IMS Registration Status on a particular subid.
+     *
+     * @param subId user preferred subId.
+     *
+     * @return {@code true} if the IMS status is registered.
+     */
+    boolean isImsRegisteredForSubscriber(int subId);
+
     /**
      * Returns the Status of Wi-Fi Calling
      */