Merge "[Handoff][9/N] Change lastUsedTimestampMs to Long" into main (d47841c5) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -3465,7 +3465,7 @@ package android.companion.datatransfer.continuity {
		method @Nullable public android.graphics.drawable.Icon getIcon();
		method public int getId();
		method @NonNull public String getLabel();
		method public int getLastUsedTimestampMillis();
		method public long getLastUsedTimestampMillis();
		method @NonNull public String getSourceDeviceName();
		method public boolean isHandoffEnabled();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		@@ -3479,7 +3479,7 @@ package android.companion.datatransfer.continuity {
		method @NonNull public android.companion.datatransfer.continuity.RemoteTask.Builder setHandoffEnabled(boolean);
		method @NonNull public android.companion.datatransfer.continuity.RemoteTask.Builder setIcon(@Nullable android.graphics.drawable.Icon);
		method @NonNull public android.companion.datatransfer.continuity.RemoteTask.Builder setLabel(@NonNull String);
		method @NonNull public android.companion.datatransfer.continuity.RemoteTask.Builder setLastUsedTimestampMillis(int);
		method @NonNull public android.companion.datatransfer.continuity.RemoteTask.Builder setLastUsedTimestampMillis(long);
		method @NonNull public android.companion.datatransfer.continuity.RemoteTask.Builder setSourceDeviceName(@NonNull String);
		}

core/java/android/companion/datatransfer/continuity/RemoteTask.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@ public final class RemoteTask implements Parcelable {
		@NonNull private final String mLabel;
		private final boolean mIsHandoffEnabled;
		@NonNull private final String mSourceDeviceName;
		private final int mLastUsedTimestampMillis;
		private final long mLastUsedTimestampMillis;
		@Nullable private final Icon mIcon;

		public static final @NonNull Parcelable.Creator<RemoteTask> CREATOR =
		@@ -77,7 +77,7 @@ public final class RemoteTask implements Parcelable {
		mLabel = in.readString();
		mIsHandoffEnabled = in.readBoolean();
		mSourceDeviceName = in.readString();
		mLastUsedTimestampMillis = in.readInt();
		mLastUsedTimestampMillis = in.readLong();
		if (in.readInt() != 0) {
		mIcon = in.readParcelable(Icon.class.getClassLoader(), Icon.class);
		} else {
		@@ -139,7 +139,7 @@ public final class RemoteTask implements Parcelable {
		/**
		* Returns the last used timestamp of the task.
		*/
		public int getLastUsedTimestampMillis() {
		public long getLastUsedTimestampMillis() {
		return mLastUsedTimestampMillis;
		}

		@@ -183,7 +183,7 @@ public final class RemoteTask implements Parcelable {
		dest.writeString(mLabel);
		dest.writeBoolean(mIsHandoffEnabled);
		dest.writeString(mSourceDeviceName);
		dest.writeInt(mLastUsedTimestampMillis);
		dest.writeLong(mLastUsedTimestampMillis);
		if (mIcon != null) {
		dest.writeInt(1);
		mIcon.writeToParcel(dest, flags);
		@@ -202,7 +202,7 @@ public final class RemoteTask implements Parcelable {
		@Nullable private Icon mIcon = null;
		private boolean mIsHandoffEnabled = false;
		@NonNull private String mSourceDeviceName = "";
		private int mLastUsedTimestampMillis = 0;
		private long mLastUsedTimestampMillis = 0;

		/**
		* Creates a new builder for a task with the given ID.
		@@ -276,7 +276,7 @@ public final class RemoteTask implements Parcelable {
		* @param lastUsedTimestampMillis The last used timestamp of the remote task.
		*/
		@NonNull
		public Builder setLastUsedTimestampMillis(int lastUsedTimestampMillis) {
		public Builder setLastUsedTimestampMillis(long lastUsedTimestampMillis) {
		mLastUsedTimestampMillis = lastUsedTimestampMillis;
		return this;
		}

services/companion/java/com/android/server/companion/datatransfer/continuity/messages/RemoteTaskInfo.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -99,7 +99,7 @@ public record RemoteTaskInfo(int id, String label, long lastUsedTimeMillis, byte
		return new RemoteTask.Builder(id())
		.setLabel(label())
		.setDeviceId(deviceId)
		.setLastUsedTimestampMillis((int) lastUsedTimeMillis())
		.setLastUsedTimestampMillis(lastUsedTimeMillis())
		.setSourceDeviceName(deviceName)
		.setIcon(taskIcon)
		.build();