Merge "Mark Task Continuity Messages as Oneway" into main (d783b2db) · Commits · e / os / android_frameworks_base

core/java/android/companion/CompanionDeviceManager.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -266,7 +266,7 @@ public final class CompanionDeviceManager {
	*		*
	* @hide		* @hide
	*/		*/
	public static final int MESSAGE_TASK_CONTINUITY = 0x63678884; // ?TSK		public static final int MESSAGE_ONEWAY_TASK_CONTINUITY = 0x43678884; // +TSK
	/**		/**
	* Message header assigned to the permission restore request.		* Message header assigned to the permission restore request.
	*		*

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -16,7 +16,7 @@

	package com.android.server.companion.datatransfer.continuity;		package com.android.server.companion.datatransfer.continuity;

	import static android.companion.CompanionDeviceManager.MESSAGE_TASK_CONTINUITY;		import static android.companion.CompanionDeviceManager.MESSAGE_ONEWAY_TASK_CONTINUITY;

	import android.app.ActivityManager;		import android.app.ActivityManager;
	import android.app.ActivityTaskManager;		import android.app.ActivityTaskManager;
	@@ -171,7 +171,7 @@ class TaskBroadcaster
	.build();		.build();

	mCompanionDeviceManager.sendMessage(		mCompanionDeviceManager.sendMessage(
	CompanionDeviceManager.MESSAGE_TASK_CONTINUITY,		CompanionDeviceManager.MESSAGE_ONEWAY_TASK_CONTINUITY,
	message.toBytes(),		message.toBytes(),
	new int[] {associationId});		new int[] {associationId});
	}		}

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -16,7 +16,7 @@

	package com.android.server.companion.datatransfer.continuity;		package com.android.server.companion.datatransfer.continuity;

	import static android.companion.CompanionDeviceManager.MESSAGE_TASK_CONTINUITY;		import static android.companion.CompanionDeviceManager.MESSAGE_ONEWAY_TASK_CONTINUITY;

	import android.content.Context;		import android.content.Context;
	import android.companion.CompanionDeviceManager;		import android.companion.CompanionDeviceManager;
	@@ -65,7 +65,7 @@ class TaskContinuityMessageReceiver {
	mOnTaskContinuityMessageReceivedListener = onTaskContinuityMessageReceivedListener;		mOnTaskContinuityMessageReceivedListener = onTaskContinuityMessageReceivedListener;
	mCompanionDeviceManager.addOnMessageReceivedListener(		mCompanionDeviceManager.addOnMessageReceivedListener(
	mContext.getMainExecutor(),		mContext.getMainExecutor(),
	MESSAGE_TASK_CONTINUITY,		MESSAGE_ONEWAY_TASK_CONTINUITY,
	mOnMessageReceivedListener		mOnMessageReceivedListener
	);		);

	@@ -85,7 +85,7 @@ class TaskContinuityMessageReceiver {
	mOnTaskContinuityMessageReceivedListener = null;		mOnTaskContinuityMessageReceivedListener = null;

	mCompanionDeviceManager.removeOnMessageReceivedListener(		mCompanionDeviceManager.removeOnMessageReceivedListener(
	MESSAGE_TASK_CONTINUITY,		MESSAGE_ONEWAY_TASK_CONTINUITY,
	mOnMessageReceivedListener);		mOnMessageReceivedListener);

	mIsListening = false;		mIsListening = false;

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -23,6 +23,7 @@ import static android.companion.CompanionDeviceManager.MESSAGE_REQUEST_CONTEXT_S
	import static android.companion.CompanionDeviceManager.MESSAGE_REQUEST_PERMISSION_RESTORE;		import static android.companion.CompanionDeviceManager.MESSAGE_REQUEST_PERMISSION_RESTORE;
	import static android.companion.CompanionDeviceManager.MESSAGE_REQUEST_PING;		import static android.companion.CompanionDeviceManager.MESSAGE_REQUEST_PING;
	import static android.companion.CompanionDeviceManager.MESSAGE_REQUEST_REMOTE_AUTHENTICATION;		import static android.companion.CompanionDeviceManager.MESSAGE_REQUEST_REMOTE_AUTHENTICATION;
			import static android.companion.CompanionDeviceManager.MESSAGE_ONEWAY_TASK_CONTINUITY;

	import android.annotation.NonNull;		import android.annotation.NonNull;
	import android.companion.IOnMessageReceivedListener;		import android.companion.IOnMessageReceivedListener;
	@@ -243,7 +244,8 @@ public abstract class Transport {
	switch (message) {		switch (message) {
	case MESSAGE_ONEWAY_PING:		case MESSAGE_ONEWAY_PING:
	case MESSAGE_ONEWAY_FROM_WEARABLE:		case MESSAGE_ONEWAY_FROM_WEARABLE:
	case MESSAGE_ONEWAY_TO_WEARABLE: {		case MESSAGE_ONEWAY_TO_WEARABLE:
			case MESSAGE_ONEWAY_TASK_CONTINUITY: {
	callback(message, data);		callback(message, data);
	break;		break;
	}		}

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -160,7 +160,7 @@ public class TaskBroadcasterTest {
	ArgumentCaptor<byte[]> messageCaptor		ArgumentCaptor<byte[]> messageCaptor
	= ArgumentCaptor.forClass(byte[].class);		= ArgumentCaptor.forClass(byte[].class);
	verify(mMockCompanionDeviceManagerService, times(1)).sendMessage(		verify(mMockCompanionDeviceManagerService, times(1)).sendMessage(
	eq(CompanionDeviceManager.MESSAGE_TASK_CONTINUITY),		eq(CompanionDeviceManager.MESSAGE_ONEWAY_TASK_CONTINUITY),
	messageCaptor.capture(),		messageCaptor.capture(),
	eq(new int[] {1}));		eq(new int[] {1}));
	TaskContinuityMessage taskContinuityMessage = new TaskContinuityMessage(		TaskContinuityMessage taskContinuityMessage = new TaskContinuityMessage(
	@@ -202,7 +202,7 @@ public class TaskBroadcasterTest {
	// Verify sendMessage is called		// Verify sendMessage is called
	ArgumentCaptor<byte[]> messageCaptor = ArgumentCaptor.forClass(byte[].class);		ArgumentCaptor<byte[]> messageCaptor = ArgumentCaptor.forClass(byte[].class);
	verify(mMockCompanionDeviceManagerService, times(1)).sendMessage(		verify(mMockCompanionDeviceManagerService, times(1)).sendMessage(
	eq(CompanionDeviceManager.MESSAGE_TASK_CONTINUITY),		eq(CompanionDeviceManager.MESSAGE_ONEWAY_TASK_CONTINUITY),
	messageCaptor.capture(),		messageCaptor.capture(),
	any(int[].class));		any(int[].class));
	byte[] capturedMessage = messageCaptor.getValue();		byte[] capturedMessage = messageCaptor.getValue();