Update ImsRegistrationListener

1. Replace onImsConnected() with onImsConnected(int)
2. Replace onImsProgressing() with onImsProgressing(int)
3. Add registrationChangeFailed()

Bug: 33430556
Test: m
Merged-In: I14c171494bdcb0d82ed4be0caff8cb52d35421cc
Change-Id: I14c171494bdcb0d82ed4be0caff8cb52d35421cc

2 files changed, 7 insertions, 14 deletions

diff --git a/src/java/com/android/ims/ImsConnectionStateListener.java b/src/java/com/android/ims/ImsConnectionStateListener.java
index f281df1f..4425854b 100644
--- a/src/java/com/android/ims/ImsConnectionStateListener.java
+++ b/src/java/com/android/ims/ImsConnectionStateListener.java
@@ -27,13 +27,6 @@ import android.net.Uri;
  */
 public class ImsConnectionStateListener {
     /**
-     * Called when the device is connected to the IMS network.
-     */
-    public void onImsConnected() {
-        // no-op
-    }
-
-    /**
      * Called when the device is connected to the IMS network with {@param imsRadioTech}.
      */
     public void onImsConnected(int imsRadioTech) {
@@ -41,9 +34,9 @@ public class ImsConnectionStateListener {
     }
 
     /**
-     * Called when the device is trying to connect to the IMS network.
+     * Called when the device is trying to connect to the IMS network with {@param imsRadioTech}.
      */
-    public void onImsProgressing() {
+    public void onImsProgressing(int imsRadioTech) {
         // no-op
     }
 
diff --git a/src/java/com/android/ims/ImsManager.java b/src/java/com/android/ims/ImsManager.java
index 7c258291..82f2c68f 100644
--- a/src/java/com/android/ims/ImsManager.java
+++ b/src/java/com/android/ims/ImsManager.java
@@ -32,6 +32,7 @@ import android.provider.Settings;
 import android.telecom.TelecomManager;
 import android.telephony.CarrierConfigManager;
 import android.telephony.Rlog;
+import android.telephony.ServiceState;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.telephony.ims.ImsServiceProxy;
@@ -2233,7 +2234,7 @@ public class ImsManager {
             }
 
             if (mListener != null) {
-                mListener.onImsConnected();
+                mListener.onImsConnected(ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN);
             }
         }
 
@@ -2244,7 +2245,7 @@ public class ImsManager {
             }
 
             if (mListener != null) {
-                mListener.onImsProgressing();
+                mListener.onImsProgressing(ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN);
             }
         }
 
@@ -2257,7 +2258,6 @@ public class ImsManager {
             }
 
             if (mListener != null) {
-                mListener.onImsConnected();
                 mListener.onImsConnected(imsRadioTech);
             }
         }
@@ -2271,7 +2271,7 @@ public class ImsManager {
             }
 
             if (mListener != null) {
-                mListener.onImsProgressing();
+                mListener.onImsProgressing(imsRadioTech);
             }
         }
 
@@ -2316,7 +2316,7 @@ public class ImsManager {
                     serviceClass + ", event=" + event);
 
             if (mListener != null) {
-                mListener.onImsConnected();
+                mListener.onImsConnected(ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN);
             }
         }