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

Commit 248b8391 authored by Nan Zhang's avatar Nan Zhang Committed by android-build-merger
Browse files

Merge "Fix the incorrect javadoc links" into pi-dev-plus-aosp 

am: 83fb35ad

Change-Id: I48248b92a2c9f3214c88c3045f67e153f21c826f
parents 91fe37b8 83fb35ad

core/java/android/bluetooth/BluetoothDevice.java

+1 −3
Original line number Diff line number Diff line
@@ -1971,9 +1971,7 @@ public final class BluetoothDevice implements Parcelable { 
     * <p>The remote device will be authenticated and communication on this socket will be

     * encrypted.

     * <p> Use this socket if an authenticated socket link is possible. Authentication refers

     * to the authentication of the link key to prevent man-in-the-middle type of attacks. When a

     * secure socket connection is not possible, use {@link createInsecureLeL2capCocSocket(int,

     * int)}.

     * to the authentication of the link key to prevent man-in-the-middle type of attacks.

     *

     * @param psm dynamic PSM value from remote device

     * @return a CoC #BluetoothSocket ready for an outgoing connection

core/java/android/bluetooth/BluetoothServerSocket.java

+2 −2
Original line number Diff line number Diff line
@@ -203,8 +203,8 @@ public final class BluetoothServerSocket implements Closeable { 
    /**

     * Returns the assigned dynamic protocol/service multiplexer (PSM) value for the listening L2CAP

     * Connection-oriented Channel (CoC) server socket. This server socket must be returned by the

     * {@link BluetoothAdapter.listenUsingL2capChannel()} or {@link

     * BluetoothAdapter.listenUsingInsecureL2capChannel()}. The returned value is undefined if this

     * {@link BluetoothAdapter#listenUsingL2capChannel()} or {@link

     * BluetoothAdapter#listenUsingInsecureL2capChannel()}. The returned value is undefined if this

     * method is called on non-L2CAP server sockets.

     *

     * @return the assigned PSM or LE_PSM value depending on transport