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

Commit 7c6f8328 authored by Leland Miller's avatar Leland Miller Committed by Android (Google) Code Review
Browse files

Merge changes from topic "permissions" into qt-dev 

* changes:
  Check permissions in RcsMessageStoreController
  Use RcsMessageQueryResultParcelable
  Use RcsParticipantQueryResultParcelable
  Use RcsThreadQueryResultParcelable
parents f18a7b3a 336de534

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,