diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 7d1398b51ec80..6b498b5f86974 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -7329,6 +7329,29 @@ public class TelephonyManager { return null; } + /** + * Unregister a IImsServiceFeatureCallback previously associated with an ImsFeature through + * {@link #getImsMmTelFeatureAndListen(int, IImsServiceFeatureCallback)} or + * {@link #getImsRcsFeatureAndListen(int, IImsServiceFeatureCallback)}. + * @param slotIndex The SIM slot associated with the callback. + * @param featureType The {@link android.telephony.ims.feature.ImsFeature.FeatureType} + * associated with the callback. + * @param callback The callback to be unregistered. + * @hide + */ + public void unregisterImsFeatureCallback(int slotIndex, int featureType, + IImsServiceFeatureCallback callback) { + try { + ITelephony telephony = getITelephony(); + if (telephony != null) { + telephony.unregisterImsFeatureCallback(slotIndex, featureType, callback); + } + } catch (RemoteException e) { + Rlog.e(TAG, "unregisterImsFeatureCallback, RemoteException: " + + e.getMessage()); + } + } + /** * @return the {@IImsRegistration} interface that corresponds with the slot index and feature. * @param slotIndex The SIM slot corresponding to the ImsService ImsRegistration is active for. diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index 5293efa6bce7b..5a6b997f0723e 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -850,6 +850,14 @@ interface ITelephony { */ IImsRcsFeature getRcsFeatureAndListen(int slotId, in IImsServiceFeatureCallback callback); + /** + * Unregister a callback that was previously registered through + * {@link #getMmTelFeatureAndListen} or {@link #getRcsFeatureAndListen}. This should always be + * called when the callback is no longer being used. + */ + void unregisterImsFeatureCallback(int slotId, int featureType, + in IImsServiceFeatureCallback callback); + /** * Returns the IImsRegistration associated with the slot and feature specified. */