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

Commit d9dbaa7f authored by James Lin's avatar James Lin Committed by Gerrit Code Review
Browse files

Merge "[RCS] Implement the interfaces PresencePublisher and SubscribePublisher... 

Merge "[RCS] Implement the interfaces PresencePublisher and SubscribePublisher in RcsFeatureConnection"
parents e4b4098e 03febe4a

Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ java_library { 
    name: "ims-common",

    installable: true,



    static_libs: [

        "ucepresencelib",

    ],



    aidl: {

        local_include_dirs: ["src/java"],

    },

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

+42 −1
Original line number Diff line number Diff line
@@ -24,18 +24,22 @@ import android.telephony.ims.aidl.IImsCapabilityCallback; 
import android.telephony.ims.aidl.IRcsFeatureListener;

import android.telephony.ims.feature.CapabilityChangeRequest;

import android.telephony.ims.feature.ImsFeature;

import android.telephony.ims.RcsContactUceCapability;

import com.android.telephony.Rlog;

import android.telephony.TelephonyManager;

import android.telephony.ims.aidl.IImsRcsFeature;

import android.util.Log;



import com.android.internal.annotations.VisibleForTesting;

import com.android.service.ims.presence.PresencePublisher;

import com.android.service.ims.presence.SubscribePublisher;



/**

 * A container of the IImsServiceController binder, which implements all of the RcsFeatures that

 * the platform currently supports: RCS

 */

public class RcsFeatureConnection extends FeatureConnection {

public class RcsFeatureConnection extends FeatureConnection implements PresencePublisher,

        SubscribePublisher {

    private static final String TAG = "RcsFeatureConnection";



    public interface IRcsFeatureUpdate extends IFeatureUpdate {
@@ -203,6 +207,43 @@ public class RcsFeatureConnection extends FeatureConnection { 
        }

    }



    @Override

    public int getPublisherState() {

        // Need to implement this api

        throw new UnsupportedOperationException();

    }



    @Override

    public int requestPublication(RcsContactUceCapability capabilities, String contactUri,

            int taskId) {

        // Need to implement this api

        throw new UnsupportedOperationException();

    }



    @Override

    public void updatePublisherState(int publishState) {

        // Need to implement this api

        throw new UnsupportedOperationException();

    }



    @Override

    public int requestCapability(String[] formattedContacts, int taskId) {

        // Need to implement this api

        throw new UnsupportedOperationException();

    }



    @Override

    public int requestAvailability(String formattedContact, int taskId) {

        // Need to implement this api

        throw new UnsupportedOperationException();

    }



    @Override

    public int getStackStatusForCapabilityRequest() {

        // Need to implement this api

        throw new UnsupportedOperationException();

    }



    @Override

    @VisibleForTesting

    public Integer retrieveFeatureState() {

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

+4 −0
Original line number Diff line number Diff line
@@ -144,6 +144,10 @@ public class RcsFeatureManager implements IFeatureConnector { 
        }

    }



    public RcsFeatureConnection getRcsFeatureConnection() {

        return mRcsFeatureConnection;

    }



    /**

     * The callback to receive updated from RcsFeature

     */