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

Commit ed539353 authored by James Lin's avatar James Lin Committed by Automerger Merge Worker
Browse files

Merge "[RCS] Add API requestPublication to update capabilities" am: 0ea3fd16 

Change-Id: I9282cec712b67112e90cefb46d6ca86ea3993b28
parents 2e8293a5 0ea3fd16

src/java/com/android/ims/RcsFeatureConnection.java

+9 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.content.Context; 
import android.os.IBinder;

import android.os.RemoteException;

import android.telephony.TelephonyManager;

import android.telephony.ims.RcsContactUceCapability;

import android.telephony.ims.aidl.IImsCapabilityCallback;

import android.telephony.ims.aidl.IImsRcsFeature;

import android.telephony.ims.aidl.IImsRegistration;
@@ -290,6 +291,14 @@ public class RcsFeatureConnection extends FeatureConnection { 
        }

    }



    public void requestPublication(RcsContactUceCapability capabilities, int taskId)

            throws RemoteException {

        synchronized (mLock) {

            checkServiceIsReady();

            getServiceInterface(mBinder).updateCapabilities(capabilities, taskId);

        }

    }



    @Override

    @VisibleForTesting

    public Integer retrieveFeatureState() {

src/java/com/android/ims/RcsFeatureManager.java

+7 −1
Original line number Diff line number Diff line
@@ -66,7 +66,8 @@ public class RcsFeatureManager implements IFeatureConnector { 
     */

    public static class RcsFeatureCallbacks {

        /** See {@link RcsCapabilityExchange#onCommandUpdate(int, int)} */

        void onCommandUpdate(int commandCode, int operationToken) {}

        @VisibleForTesting

        public void onCommandUpdate(int commandCode, int operationToken) {}



        /** See {@link RcsPresenceExchangeImplBase#onNetworkResponse(int, String, int)} */

        public void onNetworkResponse(int code, String reason, int operationToken) {}
@@ -430,6 +431,11 @@ public class RcsFeatureManager implements IFeatureConnector { 
                ImsRegistrationImplBase.REGISTRATION_TECH_IWLAN);

    }



    public void requestPublication(RcsContactUceCapability capabilities, int taskId)

            throws RemoteException {

        mRcsFeatureConnection.requestPublication(capabilities, taskId);

    }



    /**

     * Disable all of the UCE capabilities.

     */