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

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

Merge "[RCS] Add method to send the capability request to RcsService" am: 567fbce3 

Change-Id: I10fda5ad78761e79d8724546ecfe632795f3b7f2
parents 3357480c 567fbce3

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

+9 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.ims; 


import android.annotation.NonNull;

import android.content.Context;

import android.net.Uri;

import android.os.IBinder;

import android.os.RemoteException;

import android.telephony.TelephonyManager;
@@ -32,6 +33,7 @@ import android.telephony.ims.feature.ImsFeature; 


import com.android.internal.annotations.VisibleForTesting;

import com.android.telephony.Rlog;

import java.util.List;



/**

 * A container of the IImsServiceController binder, which implements all of the RcsFeatures that
@@ -299,6 +301,13 @@ public class RcsFeatureConnection extends FeatureConnection { 
        }

    }



    public void requestCapabilities(List<Uri> uris, int taskId) throws RemoteException {

        synchronized (mLock) {

            checkServiceIsReady();

            getServiceInterface(mBinder).requestCapabilities(uris, taskId);

        }

    }



    @Override

    @VisibleForTesting

    public Integer retrieveFeatureState() {

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

+4 −0
Original line number Diff line number Diff line
@@ -436,6 +436,10 @@ public class RcsFeatureManager implements IFeatureConnector { 
        mRcsFeatureConnection.requestPublication(capabilities, taskId);

    }



    public void requestCapabilities(List<Uri> uris, int taskId) throws RemoteException {

        mRcsFeatureConnection.requestCapabilities(uris, taskId);

    }



    /**

     * Disable all of the UCE capabilities.

     */