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

Commit 3a4603eb authored by Leland Miller's avatar Leland Miller
Browse files

Use correct participant ID column for events 

Test: Tested manually with future changes to CtsRcsTestCases
Change-Id: I59edd32406be5448c77509a407066ee4cc21fbc7
parent e398c449

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

+1 −2
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import static android.provider.Telephony.RcsColumns.RcsEventTypes.PARTICIPANT_AL 
import static android.provider.Telephony.RcsColumns.RcsEventTypes.PARTICIPANT_JOINED_EVENT_TYPE;

import static android.provider.Telephony.RcsColumns.RcsEventTypes.PARTICIPANT_LEFT_EVENT_TYPE;

import static android.provider.Telephony.RcsColumns.RcsGroupThreadColumns.RCS_GROUP_THREAD_URI;

import static android.provider.Telephony.RcsColumns.RcsParticipantColumns.RCS_PARTICIPANT_ID_COLUMN;

import static android.provider.Telephony.RcsColumns.RcsParticipantColumns.RCS_PARTICIPANT_URI;

import static android.provider.Telephony.RcsColumns.RcsParticipantEventColumns.ALIAS_CHANGE_EVENT_URI_PART;

import static android.provider.Telephony.RcsColumns.RcsParticipantEventColumns.NEW_ALIAS_COLUMN;
@@ -188,7 +187,7 @@ class RcsEventQueryHelper { 
    private RcsParticipantAliasChangedEvent createNewParticipantAliasChangedEvent(Cursor cursor) {

        return new RcsParticipantAliasChangedEvent(

                cursor.getLong(cursor.getColumnIndex(TIMESTAMP_COLUMN)),

                cursor.getInt(cursor.getColumnIndex(RCS_PARTICIPANT_ID_COLUMN)),

                cursor.getInt(cursor.getColumnIndex(SOURCE_PARTICIPANT_ID_COLUMN)),

                cursor.getString(cursor.getColumnIndex(NEW_ALIAS_COLUMN)));

    }

}

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

+4 −3
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ import static android.provider.Telephony.RcsColumns.RcsThreadColumns.RCS_THREAD_ 
import static android.provider.Telephony.RcsColumns.RcsThreadEventColumns.DESTINATION_PARTICIPANT_ID_COLUMN;

import static android.provider.Telephony.RcsColumns.RcsThreadEventColumns.NEW_ICON_URI_COLUMN;

import static android.provider.Telephony.RcsColumns.RcsThreadEventColumns.NEW_NAME_COLUMN;

import static android.provider.Telephony.RcsColumns.RcsThreadEventColumns.SOURCE_PARTICIPANT_ID_COLUMN;

import static android.provider.Telephony.RcsColumns.RcsThreadEventColumns.TIMESTAMP_COLUMN;

import static android.provider.Telephony.RcsColumns.RcsUnifiedThreadColumns.THREAD_TYPE_GROUP;

import static android.provider.Telephony.RcsColumns.TRANSACTION_FAILED;
@@ -210,10 +211,10 @@ public class RcsMessageStoreController extends IRcs.Stub { 
    }



    @Override

    public RcsMessageQueryResult getMessages(RcsMessageQueryParams queryParameters)

    public RcsMessageQueryResult getMessages(RcsMessageQueryParams queryParams)

            throws RemoteException {

        Bundle bundle = new Bundle();

        bundle.putParcelable(MESSAGE_QUERY_PARAMETERS_KEY, queryParameters);

        bundle.putParcelable(MESSAGE_QUERY_PARAMETERS_KEY, queryParams);

        return mMessageQueryHelper.performMessageQuery(bundle);

    }
@@ -910,7 +911,7 @@ public class RcsMessageStoreController extends IRcs.Stub { 
            String newAlias) throws RemoteException {

        ContentValues contentValues = new ContentValues(4);

        contentValues.put(TIMESTAMP_COLUMN, timestamp);

        contentValues.put(RCS_PARTICIPANT_ID_COLUMN, participantId);

        contentValues.put(SOURCE_PARTICIPANT_ID_COLUMN, participantId);

        contentValues.put(NEW_ALIAS_COLUMN, newAlias);



        Uri uri = mContentResolver.insert(