diff options
21 files changed, 42 insertions, 34 deletions
diff --git a/core/java/android/companion/BluetoothDeviceFilterUtils.java b/core/java/android/companion/BluetoothDeviceFilterUtils.java index ef5f84c42a16..a30fd33072c5 100644 --- a/core/java/android/companion/BluetoothDeviceFilterUtils.java +++ b/core/java/android/companion/BluetoothDeviceFilterUtils.java @@ -43,7 +43,7 @@ public class BluetoothDeviceFilterUtils { private BluetoothDeviceFilterUtils() {} private static final boolean DEBUG = false; - private static final String LOG_TAG = "BluetoothDeviceFilterUtils"; + private static final String LOG_TAG = "CDM_BluetoothDeviceFilterUtils"; @Nullable static String patternToString(@Nullable Pattern p) { diff --git a/core/java/android/companion/BluetoothLeDeviceFilter.java b/core/java/android/companion/BluetoothLeDeviceFilter.java index 2934cd27da19..b178699eeef0 100644 --- a/core/java/android/companion/BluetoothLeDeviceFilter.java +++ b/core/java/android/companion/BluetoothLeDeviceFilter.java @@ -54,7 +54,7 @@ import java.util.regex.Pattern; public final class BluetoothLeDeviceFilter implements DeviceFilter<ScanResult> { private static final boolean DEBUG = false; - private static final String LOG_TAG = "BluetoothLeDeviceFilter"; + private static final String LOG_TAG = "CDM_BluetoothLeDeviceFilter"; private static final int RENAME_PREFIX_LENGTH_LIMIT = 10; diff --git a/core/java/android/companion/CompanionDeviceManager.java b/core/java/android/companion/CompanionDeviceManager.java index c1a3c1934dbb..357bf590f267 100644 --- a/core/java/android/companion/CompanionDeviceManager.java +++ b/core/java/android/companion/CompanionDeviceManager.java @@ -81,7 +81,7 @@ import java.util.function.Consumer; public final class CompanionDeviceManager { private static final boolean DEBUG = false; - private static final String LOG_TAG = "CompanionDeviceManager"; + private static final String LOG_TAG = "CDM_CompanionDeviceManager"; /** * The result code to propagate back to the originating activity, indicates the association @@ -709,27 +709,29 @@ public final class CompanionDeviceManager { /** * Register to receive callbacks whenever the associated device comes in and out of range. * - * The provided device must be {@link #associate associated} with the calling app before - * calling this method. + * <p>The provided device must be {@link #associate associated} with the calling app before + * calling this method.</p> * - * Caller must implement a single {@link CompanionDeviceService} which will be bound to and + * <p>Caller must implement a single {@link CompanionDeviceService} which will be bound to and * receive callbacks to {@link CompanionDeviceService#onDeviceAppeared} and * {@link CompanionDeviceService#onDeviceDisappeared}. - * The app doesn't need to remain running in order to receive its callbacks. + * The app doesn't need to remain running in order to receive its callbacks.</p> * - * Calling app must declare uses-permission - * {@link android.Manifest.permission#REQUEST_OBSERVE_COMPANION_DEVICE_PRESENCE}. + * <p>Calling app must declare uses-permission + * {@link android.Manifest.permission#REQUEST_OBSERVE_COMPANION_DEVICE_PRESENCE}.</p> * - * Calling app must check for feature presence of - * {@link PackageManager#FEATURE_COMPANION_DEVICE_SETUP} before calling this API. + * <p>Calling app must check for feature presence of + * {@link PackageManager#FEATURE_COMPANION_DEVICE_SETUP} before calling this API.</p> + * + * <p>For Bluetooth LE devices, this is based on scanning for device with the given address. + * The system will scan for the device when Bluetooth is ON or Bluetooth scanning is ON.</p> * - * For Bluetooth LE devices this is based on scanning for device with the given address. - * For Bluetooth classic devices this is triggered when the device connects/disconnects. - * WiFi devices are not supported. + * <p>For Bluetooth classic devices this is triggered when the device connects/disconnects. + * WiFi devices are not supported.</p> * - * If a Bluetooth LE device wants to use a rotating mac address, it is recommended to use + * <p>If a Bluetooth LE device wants to use a rotating mac address, it is recommended to use * Resolvable Private Address, and ensure the device is bonded to the phone so that android OS - * is able to resolve the address. + * is able to resolve the address.</p> * * @param deviceAddress a previously-associated companion device's address * diff --git a/core/java/android/companion/CompanionDeviceService.java b/core/java/android/companion/CompanionDeviceService.java index a79983a653f0..3a7dd8ed3bc0 100644 --- a/core/java/android/companion/CompanionDeviceService.java +++ b/core/java/android/companion/CompanionDeviceService.java @@ -99,7 +99,7 @@ import java.util.concurrent.Executor; */ public abstract class CompanionDeviceService extends Service { - private static final String LOG_TAG = "CompanionDeviceService"; + private static final String LOG_TAG = "CDM_CompanionDeviceService"; /** * An intent action for a service to be bound whenever this app's companion device(s) diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java index 10d46d6db454..4fb575b0ab09 100644 --- a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java +++ b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java @@ -84,7 +84,7 @@ import java.util.List; public class CompanionDeviceActivity extends FragmentActivity implements CompanionVendorHelperDialogFragment.CompanionVendorHelperDialogListener { private static final boolean DEBUG = false; - private static final String TAG = CompanionDeviceActivity.class.getSimpleName(); + private static final String TAG = "CDM_CompanionDeviceActivity"; // Keep the following constants in sync with // frameworks/base/services/companion/java/ diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceDataTransferActivity.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceDataTransferActivity.java index 93040b58d74b..e13e639cec85 100644 --- a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceDataTransferActivity.java +++ b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceDataTransferActivity.java @@ -39,7 +39,7 @@ import android.widget.TextView; */ public class CompanionDeviceDataTransferActivity extends Activity { - private static final String LOG_TAG = CompanionDeviceDataTransferActivity.class.getSimpleName(); + private static final String LOG_TAG = "CDM_CompanionDeviceDataTransferActivity"; // Intent data keys from SystemDataTransferProcessor private static final String EXTRA_PERMISSION_SYNC_REQUEST = "permission_sync_request"; diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceDiscoveryService.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceDiscoveryService.java index fc5ff085139c..732e7340cf5a 100644 --- a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceDiscoveryService.java +++ b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceDiscoveryService.java @@ -70,7 +70,7 @@ import java.util.Objects; */ public class CompanionDeviceDiscoveryService extends Service { private static final boolean DEBUG = false; - private static final String TAG = CompanionDeviceDiscoveryService.class.getSimpleName(); + private static final String TAG = "CDM_CompanionDeviceDiscoveryService"; private static final String SYS_PROP_DEBUG_TIMEOUT = "debug.cdm.discovery_timeout"; private static final long TIMEOUT_DEFAULT = 20_000L; // 20 seconds diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionVendorHelperDialogFragment.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionVendorHelperDialogFragment.java index f2f6cb0cda7d..804e7577366b 100644 --- a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionVendorHelperDialogFragment.java +++ b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionVendorHelperDialogFragment.java @@ -44,7 +44,7 @@ import androidx.fragment.app.DialogFragment; * A fragmentDialog shows additional information about selfManaged devices */ public class CompanionVendorHelperDialogFragment extends DialogFragment { - private static final String TAG = CompanionVendorHelperDialogFragment.class.getSimpleName(); + private static final String TAG = "CDM_CompanionVendorHelperDialogFragment"; private static final String ASSOCIATION_REQUEST_EXTRA = "association_request"; private CompanionVendorHelperDialogListener mListener; diff --git a/services/companion/java/com/android/server/companion/AssociationRequestsProcessor.java b/services/companion/java/com/android/server/companion/AssociationRequestsProcessor.java index b3314ede8e50..dc9144a68e4c 100644 --- a/services/companion/java/com/android/server/companion/AssociationRequestsProcessor.java +++ b/services/companion/java/com/android/server/companion/AssociationRequestsProcessor.java @@ -107,7 +107,7 @@ import java.util.Set; */ @SuppressLint("LongLogTag") class AssociationRequestsProcessor { - private static final String TAG = "CompanionDevice_AssociationRequestsProcessor"; + private static final String TAG = "CDM_AssociationRequestsProcessor"; private static final ComponentName ASSOCIATION_REQUEST_APPROVAL_ACTIVITY = createRelative(COMPANION_DEVICE_DISCOVERY_PACKAGE_NAME, ".CompanionDeviceActivity"); diff --git a/services/companion/java/com/android/server/companion/AssociationStoreImpl.java b/services/companion/java/com/android/server/companion/AssociationStoreImpl.java index d5991d3930a8..8c6ad3bad857 100644 --- a/services/companion/java/com/android/server/companion/AssociationStoreImpl.java +++ b/services/companion/java/com/android/server/companion/AssociationStoreImpl.java @@ -58,7 +58,7 @@ import java.util.StringJoiner; @SuppressLint("LongLogTag") class AssociationStoreImpl implements AssociationStore { private static final boolean DEBUG = false; - private static final String TAG = "CompanionDevice_AssociationStore"; + private static final String TAG = "CDM_AssociationStore"; private final Object mLock = new Object(); diff --git a/services/companion/java/com/android/server/companion/CompanionApplicationController.java b/services/companion/java/com/android/server/companion/CompanionApplicationController.java index 4f15691e7e3e..3814591dfce6 100644 --- a/services/companion/java/com/android/server/companion/CompanionApplicationController.java +++ b/services/companion/java/com/android/server/companion/CompanionApplicationController.java @@ -66,7 +66,7 @@ import java.util.Map; @SuppressLint("LongLogTag") public class CompanionApplicationController { static final boolean DEBUG = false; - private static final String TAG = "CompanionDevice_ApplicationController"; + private static final String TAG = "CDM_CompanionApplicationController"; private static final long REBIND_TIMEOUT = 10 * 1000; // 10 sec @@ -256,6 +256,9 @@ public class CompanionApplicationController { return; } + Log.i(TAG, "Calling onDeviceAppeared to userId=[" + userId + "] package=[" + + packageName + "] associationId=[" + association.getId() + "]"); + primaryServiceConnector.postOnDeviceAppeared(association); } @@ -278,6 +281,9 @@ public class CompanionApplicationController { return; } + Log.i(TAG, "Calling onDeviceDisappeared to userId=[" + userId + "] package=[" + + packageName + "] associationId=[" + association.getId() + "]"); + primaryServiceConnector.postOnDeviceDisappeared(association); } diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java index 1af2ca1eff2e..85d314042496 100644 --- a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java +++ b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java @@ -124,7 +124,7 @@ import java.util.Set; @SuppressLint("LongLogTag") public class CompanionDeviceManagerService extends SystemService { - static final String TAG = "CompanionDeviceManagerService"; + static final String TAG = "CDM_CompanionDeviceManagerService"; static final boolean DEBUG = false; /** Range of Association IDs allocated for a user.*/ diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceServiceConnector.java b/services/companion/java/com/android/server/companion/CompanionDeviceServiceConnector.java index fa1d107735a2..93cc611c803f 100644 --- a/services/companion/java/com/android/server/companion/CompanionDeviceServiceConnector.java +++ b/services/companion/java/com/android/server/companion/CompanionDeviceServiceConnector.java @@ -43,7 +43,7 @@ import com.android.server.ServiceThread; */ @SuppressLint("LongLogTag") class CompanionDeviceServiceConnector extends ServiceConnector.Impl<ICompanionDeviceService> { - private static final String TAG = "CompanionDevice_ServiceConnector"; + private static final String TAG = "CDM_CompanionServiceConnector"; private static final boolean DEBUG = false; /** Listener for changes to the state of the {@link CompanionDeviceServiceConnector} */ diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceShellCommand.java b/services/companion/java/com/android/server/companion/CompanionDeviceShellCommand.java index 322ad46e697a..d24f9e3df382 100644 --- a/services/companion/java/com/android/server/companion/CompanionDeviceShellCommand.java +++ b/services/companion/java/com/android/server/companion/CompanionDeviceShellCommand.java @@ -26,7 +26,7 @@ import java.io.PrintWriter; import java.util.List; class CompanionDeviceShellCommand extends ShellCommand { - private static final String TAG = "CompanionDevice_ShellCommand"; + private static final String TAG = "CDM_CompanionDeviceShellCommand"; private final CompanionDeviceManagerService mService; private final AssociationStore mAssociationStore; diff --git a/services/companion/java/com/android/server/companion/DataStoreUtils.java b/services/companion/java/com/android/server/companion/DataStoreUtils.java index 73e68ec0bf97..c1825296ca69 100644 --- a/services/companion/java/com/android/server/companion/DataStoreUtils.java +++ b/services/companion/java/com/android/server/companion/DataStoreUtils.java @@ -37,7 +37,7 @@ import java.io.FileOutputStream; * Util class for CDM data stores */ public final class DataStoreUtils { - private static final String TAG = "CompanionDevice_DataStoreUtils"; + private static final String TAG = "CDM_DataStoreUtils"; /** * Check if the parser pointer is at the start of the tag diff --git a/services/companion/java/com/android/server/companion/datatransfer/SystemDataTransferProcessor.java b/services/companion/java/com/android/server/companion/datatransfer/SystemDataTransferProcessor.java index be81b67a5c74..0bba3c9cba6b 100644 --- a/services/companion/java/com/android/server/companion/datatransfer/SystemDataTransferProcessor.java +++ b/services/companion/java/com/android/server/companion/datatransfer/SystemDataTransferProcessor.java @@ -63,7 +63,7 @@ import java.util.concurrent.TimeUnit; */ public class SystemDataTransferProcessor { - private static final String LOG_TAG = SystemDataTransferProcessor.class.getSimpleName(); + private static final String LOG_TAG = "CDM_SystemDataTransferProcessor"; // Values from UI to SystemDataTransferProcessor via ResultReceiver private static final int RESULT_CODE_SYSTEM_DATA_TRANSFER_ALLOWED = 0; diff --git a/services/companion/java/com/android/server/companion/datatransfer/SystemDataTransferRequestStore.java b/services/companion/java/com/android/server/companion/datatransfer/SystemDataTransferRequestStore.java index ab0a06260cfc..dbff62850b00 100644 --- a/services/companion/java/com/android/server/companion/datatransfer/SystemDataTransferRequestStore.java +++ b/services/companion/java/com/android/server/companion/datatransfer/SystemDataTransferRequestStore.java @@ -75,7 +75,7 @@ import java.util.concurrent.TimeoutException; */ public class SystemDataTransferRequestStore { - private static final String LOG_TAG = SystemDataTransferRequestStore.class.getSimpleName(); + private static final String LOG_TAG = "CDM_SystemDataTransferRequestStore"; private static final String FILE_NAME = "companion_device_system_data_transfer_requests.xml"; diff --git a/services/companion/java/com/android/server/companion/presence/BleCompanionDeviceScanner.java b/services/companion/java/com/android/server/companion/presence/BleCompanionDeviceScanner.java index ad09f7cd3dde..0aaa523164f0 100644 --- a/services/companion/java/com/android/server/companion/presence/BleCompanionDeviceScanner.java +++ b/services/companion/java/com/android/server/companion/presence/BleCompanionDeviceScanner.java @@ -71,7 +71,7 @@ import java.util.Set; @SuppressLint("LongLogTag") class BleCompanionDeviceScanner implements AssociationStore.OnChangeListener { - private static final String TAG = "CompanionDevice_PresenceMonitor_BLE"; + private static final String TAG = "CDM_BleCompanionDeviceScanner"; /** * When using {@link ScanSettings#SCAN_MODE_LOW_POWER}, it usually takes from 20 seconds to diff --git a/services/companion/java/com/android/server/companion/presence/BluetoothCompanionDeviceConnectionListener.java b/services/companion/java/com/android/server/companion/presence/BluetoothCompanionDeviceConnectionListener.java index 823743da7da6..f6b99b551ecb 100644 --- a/services/companion/java/com/android/server/companion/presence/BluetoothCompanionDeviceConnectionListener.java +++ b/services/companion/java/com/android/server/companion/presence/BluetoothCompanionDeviceConnectionListener.java @@ -40,7 +40,7 @@ import java.util.Map; class BluetoothCompanionDeviceConnectionListener extends BluetoothAdapter.BluetoothConnectionCallback implements AssociationStore.OnChangeListener { - private static final String TAG = "CompanionDevice_PresenceMonitor_BT"; + private static final String TAG = "CDM_BluetoothCompanionDeviceConnectionListener"; interface Callback { void onBluetoothCompanionDeviceConnected(int associationId); diff --git a/services/companion/java/com/android/server/companion/presence/CompanionDevicePresenceMonitor.java b/services/companion/java/com/android/server/companion/presence/CompanionDevicePresenceMonitor.java index 0e4870af9930..fb8c5b1a9397 100644 --- a/services/companion/java/com/android/server/companion/presence/CompanionDevicePresenceMonitor.java +++ b/services/companion/java/com/android/server/companion/presence/CompanionDevicePresenceMonitor.java @@ -57,7 +57,7 @@ import java.util.Set; public class CompanionDevicePresenceMonitor implements AssociationStore.OnChangeListener, BluetoothCompanionDeviceConnectionListener.Callback, BleCompanionDeviceScanner.Callback { static final boolean DEBUG = false; - private static final String TAG = "CompanionDevice_PresenceMonitor"; + private static final String TAG = "CDM_CompanionDevicePresenceMonitor"; /** Callback for notifying about changes to status of companion devices. */ public interface Callback { diff --git a/services/companion/java/com/android/server/companion/transport/CompanionTransportManager.java b/services/companion/java/com/android/server/companion/transport/CompanionTransportManager.java index 77d51ea9a5ac..6db99a0d0b73 100644 --- a/services/companion/java/com/android/server/companion/transport/CompanionTransportManager.java +++ b/services/companion/java/com/android/server/companion/transport/CompanionTransportManager.java @@ -49,7 +49,7 @@ import java.util.concurrent.atomic.AtomicInteger; @SuppressLint("LongLogTag") public class CompanionTransportManager { - private static final String TAG = "CompanionTransportManager"; + private static final String TAG = "CDM_CompanionTransportManager"; // TODO: flip to false private static final boolean DEBUG = true; |