Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82a16c79 authored by Brad Ebinger's avatar Brad Ebinger Committed by Automerger Merge Worker
Browse files

Merge changes from topic "redo_ims_poll" am: ec6681c9 am: 58e629fd 

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

Change-Id: I74f5803c1bc875aa5b22de4e24e0b140d258cd70
parents 790aaee7 58e629fd

telephony/java/android/telephony/ims/aidl/IImsRcsController.aidl

+2 −2
Original line number Diff line number Diff line
@@ -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);

}

telephony/java/com/android/internal/telephony/ITelephony.aidl

+1 −2
Original line number Diff line number Diff line
@@ -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