Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clarify type of EXTRA_DEVICE in javadoc" into rvc-dev am: 436719f1b7 am: 5754630afd

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12037667

Change-Id: I6a1c06fe3ea3e28ba60c7b4aaf2aa1e46e15cf63
This commit is contained in:
Eugene Susla
2020-06-30 01:09:21 +00:00
committed by Automerger Merge Worker
parent 4fd4b906e0 5754630afd
commit ec7bc4e13f
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/companion/CompanionDeviceManager.java
View File

@@ -65,6 +65,13 @@ public final class CompanionDeviceManager {
/** /**
* A device, returned in the activity result of the {@link IntentSender} received in * A device, returned in the activity result of the {@link IntentSender} received in
* {@link Callback#onDeviceFound} * {@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"; public static final String EXTRA_DEVICE = "android.companion.extra.DEVICE";