Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0444f135 authored by Marie Janssen's avatar Marie Janssen Committed by android-build-merger
Browse files

Merge "Bluetooth: minor documentation fix to de-confuse" am: 5a568736 am: 3205ff13 

am: f71b0bed

Change-Id: I615f8f2d16d2dd17fcbd5df20378766096631eeb
parents 99a313e3 f71b0bed

core/java/android/bluetooth/BluetoothAdapter.java

+8 −7
Original line number Original line Diff line number Diff line
@@ -70,9 +70,10 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; 
 * devices, and start a scan for Bluetooth LE devices.

 * devices, and start a scan for Bluetooth LE devices.

 *

 *

 * <p>To get a {@link BluetoothAdapter} representing the local Bluetooth

 * <p>To get a {@link BluetoothAdapter} representing the local Bluetooth

 * adapter, when running on JELLY_BEAN_MR1 and below, call the

 * adapter, call the {@link BluetoothManager#getAdapter} function on {@link BluetoothManager}.

 * static {@link #getDefaultAdapter} method; when running on JELLY_BEAN_MR2 and

 * On JELLY_BEAN_MR1 and below you will need to use the static {@link #getDefaultAdapter}

 * higher, call {@link BluetoothManager#getAdapter}.

 * method instead.

 * </p><p>

 * Fundamentally, this is your starting point for all

 * Fundamentally, this is your starting point for all

 * Bluetooth actions. Once you have the local adapter, you can get a set of

 * Bluetooth actions. Once you have the local adapter, you can get a set of

 * {@link BluetoothDevice} objects representing all paired devices with

 * {@link BluetoothDevice} objects representing all paired devices with
@@ -81,14 +82,13 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; 
 * listen for incoming connection requests with

 * listen for incoming connection requests with

 * {@link #listenUsingRfcommWithServiceRecord(String,UUID)}; or start a scan for

 * {@link #listenUsingRfcommWithServiceRecord(String,UUID)}; or start a scan for

 * Bluetooth LE devices with {@link #startLeScan(LeScanCallback callback)}.

 * Bluetooth LE devices with {@link #startLeScan(LeScanCallback callback)}.

 *

 * </p>

 * <p>This class is thread safe.

 * <p>This class is thread safe.</p>

 *

 * <p class="note"><strong>Note:</strong>

 * <p class="note"><strong>Note:</strong>

 * Most methods require the {@link android.Manifest.permission#BLUETOOTH}

 * Most methods require the {@link android.Manifest.permission#BLUETOOTH}

 * permission and some also require the

 * permission and some also require the

 * {@link android.Manifest.permission#BLUETOOTH_ADMIN} permission.

 * {@link android.Manifest.permission#BLUETOOTH_ADMIN} permission.

 *

 * </p>

 * <div class="special reference">

 * <div class="special reference">

 * <h3>Developer Guides</h3>

 * <h3>Developer Guides</h3>

 * <p>

 * <p>
@@ -565,6 +565,7 @@ public final class BluetoothAdapter { 
     * <p>Currently Android only supports one Bluetooth adapter, but the API

     * <p>Currently Android only supports one Bluetooth adapter, but the API

     * could be extended to support more. This will always return the default

     * could be extended to support more. This will always return the default

     * adapter.

     * adapter.

     * </p>

     * @return the default local adapter, or null if Bluetooth is not supported

     * @return the default local adapter, or null if Bluetooth is not supported

     *         on this hardware platform

     *         on this hardware platform

     */

     */

core/java/android/bluetooth/BluetoothManager.java

+1 −4
Original line number Original line Diff line number Diff line
@@ -33,10 +33,7 @@ import java.util.List; 
 * Use {@link android.content.Context#getSystemService(java.lang.String)}

 * Use {@link android.content.Context#getSystemService(java.lang.String)}

 * with {@link Context#BLUETOOTH_SERVICE} to create an {@link BluetoothManager},

 * with {@link Context#BLUETOOTH_SERVICE} to create an {@link BluetoothManager},

 * then call {@link #getAdapter} to obtain the {@link BluetoothAdapter}.

 * then call {@link #getAdapter} to obtain the {@link BluetoothAdapter}.

 * <p>

 * </p>

 * Alternately, you can just call the static helper

 * {@link BluetoothAdapter#getDefaultAdapter()}.

 *

 * <div class="special reference">

 * <div class="special reference">

 * <h3>Developer Guides</h3>

 * <h3>Developer Guides</h3>

 * <p>

 * <p>