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

Commit ed4b4c6d authored by Brad Ebinger's avatar Brad Ebinger Committed by Gerrit Code Review
Browse files

Merge "Rename RcsMessageStore->RcsMessageManager and rename interfaces"

parents aff096a5 68f5fe84

src/java/com/android/internal/telephony/ProxyController.java

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import android.telephony.Rlog; 
import android.telephony.TelephonyManager;

import android.util.Log;



import com.android.internal.telephony.ims.RcsMessageStoreController;

import com.android.internal.telephony.ims.RcsMessageController;

import com.android.internal.telephony.uicc.UiccController;



import java.util.ArrayList;
@@ -132,7 +132,7 @@ public class ProxyController { 
        mCi = ci;

        mPhoneSwitcher = phoneSwitcher;



        RcsMessageStoreController.init(context);

        RcsMessageController.init(context);



        mUiccPhoneBookController = new UiccPhoneBookController(mPhones);

        mPhoneSubInfoController = new PhoneSubInfoController(mContext, mPhones);

src/java/com/android/internal/telephony/ims/RcsEventQueryHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ class RcsEventQueryHelper { 
                        eventList.add(createNewGroupIconChangedEvent(cursor));

                        break;

                    default:

                        Rlog.e(RcsMessageStoreController.TAG,

                        Rlog.e(RcsMessageController.TAG,

                                "RcsEventQueryHelper: invalid event type: " + eventType);

                }

            }

src/java/com/android/internal/telephony/ims/RcsMessageStoreController.java→src/java/com/android/internal/telephony/ims/RcsMessageController.java

+11 −11
Original line number Diff line number Diff line
@@ -93,31 +93,31 @@ import android.telephony.ims.RcsEventQueryParams; 
import android.telephony.ims.RcsEventQueryResultDescriptor;

import android.telephony.ims.RcsFileTransferCreationParams;

import android.telephony.ims.RcsIncomingMessageCreationParams;

import android.telephony.ims.RcsMessageManager;

import android.telephony.ims.RcsMessageQueryParams;

import android.telephony.ims.RcsMessageQueryResultParcelable;

import android.telephony.ims.RcsMessageSnippet;

import android.telephony.ims.RcsMessageStore;

import android.telephony.ims.RcsOutgoingMessageCreationParams;

import android.telephony.ims.RcsParticipantQueryParams;

import android.telephony.ims.RcsParticipantQueryResultParcelable;

import android.telephony.ims.RcsQueryContinuationToken;

import android.telephony.ims.RcsThreadQueryParams;

import android.telephony.ims.RcsThreadQueryResultParcelable;

import android.telephony.ims.aidl.IRcs;

import android.telephony.ims.aidl.IRcsMessage;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.FunctionalUtils.ThrowingRunnable;

import com.android.internal.util.FunctionalUtils.ThrowingSupplier;



/**

 * Backing implementation of {@link RcsMessageStore}.

 * Backing implementation of {@link RcsMessageManager}.

 */

public class RcsMessageStoreController extends IRcs.Stub {

public class RcsMessageController extends IRcsMessage.Stub {



    static final String TAG = "RcsMsgStoreController";

    private static final String RCS_SERVICE_NAME = "ircs";

    static final String TAG = "RcsMsgController";

    private static final String RCS_SERVICE_NAME = Context.TELEPHONY_RCS_MESSAGE_SERVICE;



    private static RcsMessageStoreController sInstance;

    private static RcsMessageController sInstance;



    private final Context mContext;

    private final ContentResolver mContentResolver;
@@ -130,10 +130,10 @@ public class RcsMessageStoreController extends IRcs.Stub { 
    /**

     * Initialize the instance. Should only be called once.

     */

    public static RcsMessageStoreController init(Context context) {

        synchronized (RcsMessageStoreController.class) {

    public static RcsMessageController init(Context context) {

        synchronized (RcsMessageController.class) {

            if (sInstance == null) {

                sInstance = new RcsMessageStoreController(context);

                sInstance = new RcsMessageController(context);

                if (ServiceManager.getService(RCS_SERVICE_NAME) == null) {

                    ServiceManager.addService(RCS_SERVICE_NAME, sInstance);

                }
@@ -177,7 +177,7 @@ public class RcsMessageStoreController extends IRcs.Stub { 
    }



    @VisibleForTesting

    public RcsMessageStoreController(Context context) {

    public RcsMessageController(Context context) {

        mContext = context;

        mContentResolver = context.getContentResolver();

        mParticipantQueryHelper = new RcsParticipantQueryHelper(mContentResolver);

src/java/com/android/internal/telephony/ims/RcsMessageStoreUtil.java

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ import android.os.RemoteException; 
import android.text.TextUtils;



/**

 * Utility functions for {@link RcsMessageStoreController}

 * Utility functions for {@link RcsMessageController}

 *

 * @hide

 */

tests/telephonytests/src/com/android/internal/telephony/ims/RcsMessageStoreControllerTest.java

+9 −9
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ import org.mockito.MockitoAnnotations; 


public class RcsMessageStoreControllerTest extends TelephonyTest {



    private RcsMessageStoreController mRcsMessageStoreController;

    private RcsMessageController mRcsMessageController;

    private MockContentResolver mContentResolver;

    private FakeProviderWithAsserts mFakeRcsProvider;
@@ -64,7 +64,7 @@ public class RcsMessageStoreControllerTest extends TelephonyTest { 
        mContentResolver = (MockContentResolver) mContext.getContentResolver();

        mContentResolver.addProvider("rcs", mFakeRcsProvider);



        mRcsMessageStoreController = new RcsMessageStoreController(mContext);

        mRcsMessageController = new RcsMessageController(mContext);

    }



    @After
@@ -84,7 +84,7 @@ public class RcsMessageStoreControllerTest extends TelephonyTest { 
                Uri.parse("content://rcs/thread"), null, null, null, null, null));



        try {

            mRcsMessageStoreController.getRcsThreads(queryParameters, getPackageName());

            mRcsMessageController.getRcsThreads(queryParameters, getPackageName());

        } catch (RuntimeException e) {

            // eat the exception as there is no provider - we care about the expected update assert

        }
@@ -117,7 +117,7 @@ public class RcsMessageStoreControllerTest extends TelephonyTest { 
                Uri.parse("content://rcs/participant/1001")));



        int participantId =

                mRcsMessageStoreController.createRcsParticipant(canonicalAddress, "alias",

                mRcsMessageController.createRcsParticipant(canonicalAddress, "alias",

                        getPackageName());



        assertThat(participantId).isEqualTo(1001);
@@ -131,7 +131,7 @@ public class RcsMessageStoreControllerTest extends TelephonyTest { 
                Uri.parse("content://rcs/participant/551"), null, null, contentValues, 0));



        try {

            mRcsMessageStoreController.setRcsParticipantAlias(551, "New Alias", getPackageName());

            mRcsMessageController.setRcsParticipantAlias(551, "New Alias", getPackageName());

        } catch (RuntimeException e) {

            // eat the exception as there is no provider - we care about the expected update assert

        }
@@ -144,7 +144,7 @@ public class RcsMessageStoreControllerTest extends TelephonyTest { 
        mFakeRcsProvider.addExpectedOperation(new ExpectedUpdate(

                Uri.parse("content://rcs/p2p_thread/123"), null, null, contentValues, 0));

        try {

            mRcsMessageStoreController.set1To1ThreadFallbackThreadId(123, 456L, getPackageName());

            mRcsMessageController.set1To1ThreadFallbackThreadId(123, 456L, getPackageName());

        } catch (RuntimeException e) {

            // eat the exception as there is no provider - we care about the expected update assert

        }
@@ -158,7 +158,7 @@ public class RcsMessageStoreControllerTest extends TelephonyTest { 
                Uri.parse("content://rcs/group_thread/345"), null, null, contentValues, 0));



        try {

            mRcsMessageStoreController.setGroupThreadName(345, "new name", getPackageName());

            mRcsMessageController.setGroupThreadName(345, "new name", getPackageName());

        } catch (RuntimeException e) {

            // eat the exception as there is no provider - we care about the expected update assert

        }
@@ -172,7 +172,7 @@ public class RcsMessageStoreControllerTest extends TelephonyTest { 
                Uri.parse("content://rcs/group_thread/345"), null, null, contentValues, 0));



        try {

            mRcsMessageStoreController.setGroupThreadIcon(345, Uri.parse("newIcon"),

            mRcsMessageController.setGroupThreadIcon(345, Uri.parse("newIcon"),

                    getPackageName());

        } catch (RuntimeException e) {

            // eat the exception as there is no provider - we care about the expected update assert
@@ -187,7 +187,7 @@ public class RcsMessageStoreControllerTest extends TelephonyTest { 
                Uri.parse("content://rcs/group_thread/454"), null, null, contentValues, 0));



        try {

            mRcsMessageStoreController.setGroupThreadOwner(454, 9, getPackageName());

            mRcsMessageController.setGroupThreadOwner(454, 9, getPackageName());

        } catch (RuntimeException e) {

            // eat the exception as there is no provider - we care about the expected update assert

        }