Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "redo_ims_poll" am: ec6681c927 am: 58e629fd68 am: 82a16c7900

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1449280

Change-Id: I10e60023c1539abd8ac25ea8ed66ef53e06eee41
This commit is contained in:
Brad Ebinger
2020-10-07 19:59:03 +00:00
committed by Automerger Merge Worker
parent 182dd1f8aa 82a16c7900
commit 9893f1663d
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
telephony/java/android/telephony/ims/aidl/IImsRcsController.aidl
View File

@@ -22,6 +22,7 @@ import android.telephony.ims.aidl.IRcsUceControllerCallback;
import android.telephony.ims.aidl.IRcsUcePublishStateCallback; import android.telephony.ims.aidl.IRcsUcePublishStateCallback;
import android.telephony.ims.aidl.IImsRegistrationCallback; import android.telephony.ims.aidl.IImsRegistrationCallback;
import com.android.ims.ImsFeatureContainer;
import com.android.ims.internal.IImsServiceFeatureCallback; import com.android.ims.internal.IImsServiceFeatureCallback;
import com.android.internal.telephony.IIntegerConsumer; import com.android.internal.telephony.IIntegerConsumer;
@@ -53,7 +54,6 @@ interface IImsRcsController {
void unregisterUcePublishStateCallback(int subId, IRcsUcePublishStateCallback c); void unregisterUcePublishStateCallback(int subId, IRcsUcePublishStateCallback c);
// Internal commands that should not be made public // Internal commands that should not be made public
void registerRcsFeatureCallback(int slotId, in IImsServiceFeatureCallback callback, void registerRcsFeatureCallback(int slotId, in IImsServiceFeatureCallback callback);
boolean oneShot);
void unregisterImsFeatureCallback(in IImsServiceFeatureCallback callback); void unregisterImsFeatureCallback(in IImsServiceFeatureCallback callback);
} }

3
telephony/java/com/android/internal/telephony/ITelephony.aidl
View File

@@ -828,8 +828,7 @@ interface ITelephony {
* as well as registering the MmTelFeature for callbacks using the IImsServiceFeatureCallback * as well as registering the MmTelFeature for callbacks using the IImsServiceFeatureCallback
* interface. * interface.
*/ */
void registerMmTelFeatureCallback(int slotId, in IImsServiceFeatureCallback callback, void registerMmTelFeatureCallback(int slotId, in IImsServiceFeatureCallback callback);
boolean oneShot);
/** /**
* Unregister a callback that was previously registered through * Unregister a callback that was previously registered through