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
This commit is contained in:
Brad Ebinger
2020-10-01 13:41:08 -07:00
parent 1e9cc7b2e5
commit a7df4c0be6
2 changed files with 3 additions and 4 deletions

View File

@@ -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);
}

View File

@@ -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