Merge "Make RCS Message Store APIs ready to unhide" (b4cd2e41) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/ims/Rcs1To1Thread.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ import android.annotation.WorkerThread;
		* {@link RcsParticipant}s. Please see Section 5 (1-to-1 Messaging) - GSMA RCC.71 (RCS Universal
		* Profile Service Definition Document)
		*
		* @hide - TODO(109759350) make this public
		* @hide - TODO: make public
		*/
		public class Rcs1To1Thread extends RcsThread {
		private int mThreadId;

telephony/java/android/telephony/ims/RcsEvent.java

+13 −10

Original line number	Diff line number	Diff line
		@@ -16,14 +16,17 @@
		package android.telephony.ims;

		import android.os.Parcel;
		import android.os.Parcelable;

		/**
		* The base class for events that can happen on {@link RcsParticipant}s and {@link RcsThread}s.
		* @hide - TODO(109759350) make this public
		*
		* @hide - TODO: make public
		*/
		public abstract class RcsEvent {
		/**
		* @hide
		*/
		public abstract class RcsEvent implements Parcelable {
		protected long mTimestamp;
		protected final long mTimestamp;

		protected RcsEvent(long timestamp) {
		mTimestamp = timestamp;
		@@ -44,17 +47,17 @@ public abstract class RcsEvent implements Parcelable {
		*/
		abstract void persist() throws RcsMessageStoreException;

		/**
		* @hide
		*/
		RcsEvent(Parcel in) {
		mTimestamp = in.readLong();
		}

		@Override
		/**
		* @hide
		*/
		public void writeToParcel(Parcel dest, int flags) {
		dest.writeLong(mTimestamp);
		}

		@Override
		public int describeContents() {
		return 0;
		}
		}

telephony/java/android/telephony/ims/RcsEventQueryParameters.aidl→telephony/java/android/telephony/ims/RcsEventQueryParams.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -17,4 +17,4 @@

		package android.telephony.ims;

		parcelable RcsEventQueryParameters;
		parcelable RcsEventQueryParams;

telephony/java/android/telephony/ims/RcsEventQueryParameters.java→telephony/java/android/telephony/ims/RcsEventQueryParams.java

+29 −30

Original line number	Diff line number	Diff line
		@@ -35,29 +35,29 @@ import java.security.InvalidParameterException;

		/**
		* The parameters to pass into
		* {@link RcsMessageStore#getRcsEvents(RcsEventQueryParameters)} in order to select a
		* {@link RcsMessageStore#getRcsEvents(RcsEventQueryParams)} in order to select a
		* subset of {@link RcsEvent}s present in the message store.
		*
		* @hide TODO - make the Builder and builder() public. The rest should stay internal only.
		* @hide - TODO: make public
		*/
		public class RcsEventQueryParameters implements Parcelable {
		public final class RcsEventQueryParams implements Parcelable {
		/**
		* Flag to be used with {@link Builder#setEventType(int)} to make
		* {@link RcsMessageStore#getRcsEvents(RcsEventQueryParameters)} return all types of
		* {@link RcsMessageStore#getRcsEvents(RcsEventQueryParams)} return all types of
		* {@link RcsEvent}s
		*/
		public static final int ALL_EVENTS = -1;

		/**
		* Flag to be used with {@link Builder#setEventType(int)} to make
		* {@link RcsMessageStore#getRcsEvents(RcsEventQueryParameters)} return sub-types of
		* {@link RcsMessageStore#getRcsEvents(RcsEventQueryParams)} return sub-types of
		* {@link RcsGroupThreadEvent}s
		*/
		public static final int ALL_GROUP_THREAD_EVENTS = 0;

		/**
		* Flag to be used with {@link Builder#setEventType(int)} to make
		* {@link RcsMessageStore#getRcsEvents(RcsEventQueryParameters)} return only
		* {@link RcsMessageStore#getRcsEvents(RcsEventQueryParams)} return only
		* {@link RcsParticipantAliasChangedEvent}s
		*/
		public static final int PARTICIPANT_ALIAS_CHANGED_EVENT =
		@@ -65,7 +65,7 @@ public class RcsEventQueryParameters implements Parcelable {

		/**
		* Flag to be used with {@link Builder#setEventType(int)} to make
		* {@link RcsMessageStore#getRcsEvents(RcsEventQueryParameters)} return only
		* {@link RcsMessageStore#getRcsEvents(RcsEventQueryParams)} return only
		* {@link RcsGroupThreadParticipantJoinedEvent}s
		*/
		public static final int GROUP_THREAD_PARTICIPANT_JOINED_EVENT =
		@@ -73,7 +73,7 @@ public class RcsEventQueryParameters implements Parcelable {

		/**
		* Flag to be used with {@link Builder#setEventType(int)} to make
		* {@link RcsMessageStore#getRcsEvents(RcsEventQueryParameters)} return only
		* {@link RcsMessageStore#getRcsEvents(RcsEventQueryParams)} return only
		* {@link RcsGroupThreadParticipantLeftEvent}s
		*/
		public static final int GROUP_THREAD_PARTICIPANT_LEFT_EVENT =
		@@ -81,14 +81,14 @@ public class RcsEventQueryParameters implements Parcelable {

		/**
		* Flag to be used with {@link Builder#setEventType(int)} to make
		* {@link RcsMessageStore#getRcsEvents(RcsEventQueryParameters)} return only
		* {@link RcsMessageStore#getRcsEvents(RcsEventQueryParams)} return only
		* {@link RcsGroupThreadNameChangedEvent}s
		*/
		public static final int GROUP_THREAD_NAME_CHANGED_EVENT = NAME_CHANGED_EVENT_TYPE;

		/**
		* Flag to be used with {@link Builder#setEventType(int)} to make
		* {@link RcsMessageStore#getRcsEvents(RcsEventQueryParameters)} return only
		* {@link RcsMessageStore#getRcsEvents(RcsEventQueryParams)} return only
		* {@link RcsGroupThreadIconChangedEvent}s
		*/
		public static final int GROUP_THREAD_ICON_CHANGED_EVENT = ICON_CHANGED_EVENT_TYPE;
		@@ -134,7 +134,7 @@ public class RcsEventQueryParameters implements Parcelable {
		// The thread that the results are limited to
		private int mThreadId;

		RcsEventQueryParameters(@EventType int eventType, int threadId,
		RcsEventQueryParams(@EventType int eventType, int threadId,
		@SortingProperty int sortingProperty, boolean isAscending, int limit) {
		mEventType = eventType;
		mSortingProperty = sortingProperty;
		@@ -144,7 +144,7 @@ public class RcsEventQueryParameters implements Parcelable {
		}

		/**
		* @return Returns the type of {@link RcsEvent}s that this {@link RcsEventQueryParameters} is
		* @return Returns the type of {@link RcsEvent}s that this {@link RcsEventQueryParams} is
		* set to query for.
		*/
		public @EventType int getEventType() {
		@@ -152,7 +152,7 @@ public class RcsEventQueryParameters implements Parcelable {
		}

		/**
		* @return Returns the type of {@link RcsEvent}s that this {@link RcsEventQueryParameters} is
		* @return Returns the type of {@link RcsEvent}s that this {@link RcsEventQueryParams} is
		* set to query for.
		*/
		public int getLimit() {
		@@ -186,7 +186,7 @@ public class RcsEventQueryParameters implements Parcelable {
		}

		/**
		* A helper class to build the {@link RcsEventQueryParameters}.
		* A helper class to build the {@link RcsEventQueryParams}.
		*/
		public static class Builder {
		private @EventType int mEventType;
		@@ -196,8 +196,8 @@ public class RcsEventQueryParameters implements Parcelable {
		private int mThreadId;

		/**
		* Creates a new builder for {@link RcsEventQueryParameters} to be used in
		* {@link RcsMessageStore#getRcsEvents(RcsEventQueryParameters)}
		* Creates a new builder for {@link RcsEventQueryParams} to be used in
		* {@link RcsMessageStore#getRcsEvents(RcsEventQueryParams)}
		*/
		public Builder() {
		// empty implementation
		@@ -236,7 +236,7 @@ public class RcsEventQueryParameters implements Parcelable {

		/**
		* Sets the property where the results should be sorted against. Defaults to
		* {@link RcsEventQueryParameters.SortingProperty#SORT_BY_CREATION_ORDER}
		* {@link RcsEventQueryParams.SortingProperty#SORT_BY_CREATION_ORDER}
		*
		* @param sortingProperty against which property the results should be sorted
		* @return The same instance of the builder to chain parameters.
		@@ -273,18 +273,18 @@ public class RcsEventQueryParameters implements Parcelable {
		}

		/**
		* Builds the {@link RcsEventQueryParameters} to use in
		* {@link RcsMessageStore#getRcsEvents(RcsEventQueryParameters)}
		* Builds the {@link RcsEventQueryParams} to use in
		* {@link RcsMessageStore#getRcsEvents(RcsEventQueryParams)}
		*
		* @return An instance of {@link RcsEventQueryParameters} to use with the event query.
		* @return An instance of {@link RcsEventQueryParams} to use with the event query.
		*/
		public RcsEventQueryParameters build() {
		return new RcsEventQueryParameters(mEventType, mThreadId, mSortingProperty,
		public RcsEventQueryParams build() {
		return new RcsEventQueryParams(mEventType, mThreadId, mSortingProperty,
		mIsAscending, mLimit);
		}
		}

		protected RcsEventQueryParameters(Parcel in) {
		private RcsEventQueryParams(Parcel in) {
		mEventType = in.readInt();
		mThreadId = in.readInt();
		mSortingProperty = in.readInt();
		@@ -292,20 +292,19 @@ public class RcsEventQueryParameters implements Parcelable {
		mLimit = in.readInt();
		}

		public static final Creator<RcsEventQueryParameters> CREATOR =
		new Creator<RcsEventQueryParameters>() {
		public static final Creator<RcsEventQueryParams> CREATOR =
		new Creator<RcsEventQueryParams>() {
		@Override
		public RcsEventQueryParameters createFromParcel(Parcel in) {
		return new RcsEventQueryParameters(in);
		public RcsEventQueryParams createFromParcel(Parcel in) {
		return new RcsEventQueryParams(in);
		}

		@Override
		public RcsEventQueryParameters[] newArray(int size) {
		return new RcsEventQueryParameters[size];
		public RcsEventQueryParams[] newArray(int size) {
		return new RcsEventQueryParams[size];
		}
		};


		@Override
		public int describeContents() {
		return 0;

telephony/java/android/telephony/ims/RcsEventQueryResult.java

+5 −4

Original line number	Diff line number	Diff line
		@@ -22,13 +22,13 @@ import android.os.Parcelable;
		import java.util.List;

		/**
		* The result of a {@link RcsMessageStore#getRcsEvents(RcsEventQueryParameters)}
		* The result of a {@link RcsMessageStore#getRcsEvents(RcsEventQueryParams)}
		* call. This class allows getting the token for querying the next batch of events in order to
		* prevent handling large amounts of data at once.
		*
		* @hide
		* @hide - TODO: make public
		*/
		public class RcsEventQueryResult implements Parcelable {
		public final class RcsEventQueryResult implements Parcelable {
		private RcsQueryContinuationToken mContinuationToken;
		private List<RcsEvent> mEvents;

		@@ -63,7 +63,8 @@ public class RcsEventQueryResult implements Parcelable {
		return mEvents;
		}

		protected RcsEventQueryResult(Parcel in) {
		private RcsEventQueryResult(Parcel in) {
		mContinuationToken = in.readParcelable(RcsQueryContinuationToken.class.getClassLoader());
		}

		public static final Creator<RcsEventQueryResult> CREATOR = new Creator<RcsEventQueryResult>() {