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

Commit 6fad39d5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Use RcsMessageQueryResultParcelable"

parents 5cbc3d91 c80e4589

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

+3 −3
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ import android.os.Bundle; 
import android.os.RemoteException;

import android.telephony.ims.RcsFileTransferCreationParams;

import android.telephony.ims.RcsMessageCreationParams;

import android.telephony.ims.RcsMessageQueryResult;

import android.telephony.ims.RcsMessageQueryResultParcelable;

import android.telephony.ims.RcsQueryContinuationToken;



import com.android.ims.RcsTypeIdPair;
@@ -77,7 +77,7 @@ class RcsMessageQueryHelper { 
        mContentResolver = contentResolver;

    }



    RcsMessageQueryResult performMessageQuery(Bundle bundle) throws RemoteException {

    RcsMessageQueryResultParcelable performMessageQuery(Bundle bundle) throws RemoteException {

        RcsQueryContinuationToken continuationToken = null;

        List<RcsTypeIdPair> messageTypeIdPairs = new ArrayList<>();
@@ -104,7 +104,7 @@ class RcsMessageQueryHelper { 
            }

        }



        return new RcsMessageQueryResult(continuationToken, messageTypeIdPairs);

        return new RcsMessageQueryResultParcelable(continuationToken, messageTypeIdPairs);

    }



    void createContentValuesForGenericMessage(ContentValues contentValues, int threadId,

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

+3 −3
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ import android.telephony.ims.RcsEventQueryResultDescriptor; 
import android.telephony.ims.RcsFileTransferCreationParams;

import android.telephony.ims.RcsIncomingMessageCreationParams;

import android.telephony.ims.RcsMessageQueryParams;

import android.telephony.ims.RcsMessageQueryResult;

import android.telephony.ims.RcsMessageQueryResultParcelable;

import android.telephony.ims.RcsMessageSnippet;

import android.telephony.ims.RcsMessageStore;

import android.telephony.ims.RcsOutgoingMessageCreationParams;
@@ -200,7 +200,7 @@ public class RcsMessageStoreController extends IRcs.Stub { 
    }



    @Override

    public RcsMessageQueryResult getMessages(RcsMessageQueryParams queryParams)

    public RcsMessageQueryResultParcelable getMessages(RcsMessageQueryParams queryParams)

            throws RemoteException {

        Bundle bundle = new Bundle();

        bundle.putParcelable(MESSAGE_QUERY_PARAMETERS_KEY, queryParams);
@@ -208,7 +208,7 @@ public class RcsMessageStoreController extends IRcs.Stub { 
    }



    @Override

    public RcsMessageQueryResult getMessagesWithToken(

    public RcsMessageQueryResultParcelable getMessagesWithToken(

            RcsQueryContinuationToken continuationToken) throws RemoteException {

        Bundle bundle = new Bundle();

        bundle.putParcelable(QUERY_CONTINUATION_TOKEN, continuationToken);