diff options
| author | Eugene Susla <eugenesusla@google.com> | 2020-06-30 00:57:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-30 00:57:14 +0000 |
| commit | f6d23eaaf2129b32d9bd9f9f8d6ebb0d3e0e8847 (patch) | |
| tree | 9ca4f54f82581b005d7152d284ffb970909c854c /core/java/android | |
| parent | 8fc813fefad7ad061a9a435cf8e92df531621949 (diff) | |
| parent | 436719f1b71459b3ceb1380e3914e0ef45206964 (diff) | |
Merge "Clarify type of EXTRA_DEVICE in javadoc" into rvc-dev am: 436719f1b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12037667
Change-Id: I30dffffe27141712e1a6bc498b08907a3d324d6a
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/companion/CompanionDeviceManager.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/companion/CompanionDeviceManager.java b/core/java/android/companion/CompanionDeviceManager.java index 4bd7b059dfaa..591a714bfb93 100644 --- a/core/java/android/companion/CompanionDeviceManager.java +++ b/core/java/android/companion/CompanionDeviceManager.java @@ -65,6 +65,13 @@ public final class CompanionDeviceManager { /** * A device, returned in the activity result of the {@link IntentSender} received in * {@link Callback#onDeviceFound} + * + * Type is: + * <ul> + * <li>for classic Bluetooth - {@link android.bluetooth.BluetoothDevice}</li> + * <li>for Bluetooth LE - {@link android.bluetooth.le.ScanResult}</li> + * <li>for WiFi - {@link android.net.wifi.ScanResult}</li> + * </ul> */ public static final String EXTRA_DEVICE = "android.companion.extra.DEVICE"; |