From a7df4c0be6772bcd42483535397934545294881b Mon Sep 17 00:00:00 2001 From: Brad Ebinger Date: Thu, 1 Oct 2020 13:41:08 -0700 Subject: [PATCH] Remove "one shot" type of FeatureCallback Instead of having a special case for ImsManager#getInstance, implement it properly. Test: atest CtsTelephonyTestCases Merged-In: I2e986fb2a1086043a25b11c71c005481cea74196 Change-Id: I2e986fb2a1086043a25b11c71c005481cea74196 --- .../java/android/telephony/ims/aidl/IImsRcsController.aidl | 4 ++-- telephony/java/com/android/internal/telephony/ITelephony.aidl | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/telephony/java/android/telephony/ims/aidl/IImsRcsController.aidl b/telephony/java/android/telephony/ims/aidl/IImsRcsController.aidl index d012703b7510e..e01ea9179452b 100644 --- a/telephony/java/android/telephony/ims/aidl/IImsRcsController.aidl +++ b/telephony/java/android/telephony/ims/aidl/IImsRcsController.aidl @@ -22,6 +22,7 @@ import android.telephony.ims.aidl.IRcsUceControllerCallback; import android.telephony.ims.aidl.IRcsUcePublishStateCallback; import android.telephony.ims.aidl.IImsRegistrationCallback; +import com.android.ims.ImsFeatureContainer; import com.android.ims.internal.IImsServiceFeatureCallback; import com.android.internal.telephony.IIntegerConsumer; @@ -53,7 +54,6 @@ interface IImsRcsController { void unregisterUcePublishStateCallback(int subId, IRcsUcePublishStateCallback c); // Internal commands that should not be made public - void registerRcsFeatureCallback(int slotId, in IImsServiceFeatureCallback callback, - boolean oneShot); + void registerRcsFeatureCallback(int slotId, in IImsServiceFeatureCallback callback); void unregisterImsFeatureCallback(in IImsServiceFeatureCallback callback); } diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index 815ec68b2c4d4..3e20e46e4b17d 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -828,8 +828,7 @@ interface ITelephony { * as well as registering the MmTelFeature for callbacks using the IImsServiceFeatureCallback * interface. */ - void registerMmTelFeatureCallback(int slotId, in IImsServiceFeatureCallback callback, - boolean oneShot); + void registerMmTelFeatureCallback(int slotId, in IImsServiceFeatureCallback callback); /** * Unregister a callback that was previously registered through