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

Commit b577f20c authored by Andrew Solovay's avatar Andrew Solovay Committed by Android (Google) Code Review
Browse files

Merge "cherry-pick from pi-dev docs: Replacing {#link with {@link"

parents a7ea740f 5c05dedd

core/java/android/app/Instrumentation.java

+1 −1
Original line number Diff line number Diff line
@@ -1760,7 +1760,7 @@ public class Instrumentation { 
    /**

     * Like {@link #execStartActivity(android.content.Context, android.os.IBinder,

     * android.os.IBinder, String, android.content.Intent, int, android.os.Bundle)},

     * but for calls from a {#link Fragment}.

     * but for calls from a {@link Fragment}.

     * 

     * @param who The Context from which the activity is being started.

     * @param contextThread The main thread of the Context from which the activity

core/java/android/bluetooth/BluetoothAdapter.java

+2 −2
Original line number Diff line number Diff line
@@ -2973,7 +2973,7 @@ public final class BluetoothAdapter { 
     * socket will be encrypted.

     * <p>Use {@link BluetoothServerSocket#accept} to retrieve incoming connections from a listening

     * {@link BluetoothServerSocket}.

     * <p>The system will assign a dynamic PSM value. This PSM value can be read from the {#link

     * <p>The system will assign a dynamic PSM value. This PSM value can be read from the {@link

     * BluetoothServerSocket#getPsm()} and this value will be released when this server socket is

     * closed, Bluetooth is turned off, or the application exits unexpectedly.

     * <p>The mechanism of disclosing the assigned dynamic PSM value to the initiating peer is
@@ -3031,7 +3031,7 @@ public final class BluetoothAdapter { 
     * <p>Use {@link BluetoothServerSocket#accept} to retrieve incoming connections from a listening

     * {@link BluetoothServerSocket}.

     * <p>The system will assign a dynamic protocol/service multiplexer (PSM) value. This PSM value

     * can be read from the {#link BluetoothServerSocket#getPsm()} and this value will be released

     * can be read from the {@link BluetoothServerSocket#getPsm()} and this value will be released

     * when this server socket is closed, Bluetooth is turned off, or the application exits

     * unexpectedly.

     * <p>The mechanism of disclosing the assigned dynamic PSM value to the initiating peer is

core/java/android/bluetooth/BluetoothDevice.java

+4 −4
Original line number Diff line number Diff line
@@ -1596,7 +1596,7 @@ public final class BluetoothDevice implements Parcelable { 
     * For example, for Bluetooth 2.1 devices, if any of the devices does not

     * have an input and output capability or just has the ability to

     * display a numeric key, a secure socket connection is not possible.

     * In such a case, use {#link createInsecureRfcommSocket}.

     * In such a case, use {@link createInsecureRfcommSocket}.

     * For more details, refer to the Security Model section 5.2 (vol 3) of

     * Bluetooth Core Specification version 2.1 + EDR.

     * <p>Use {@link BluetoothSocket#connect} to initiate the outgoing
@@ -1631,7 +1631,7 @@ public final class BluetoothDevice implements Parcelable { 
     * For example, for Bluetooth 2.1 devices, if any of the devices does not

     * have an input and output capability or just has the ability to

     * display a numeric key, a secure socket connection is not possible.

     * In such a case, use {#link createInsecureRfcommSocket}.

     * In such a case, use {@link createInsecureRfcommSocket}.

     * For more details, refer to the Security Model section 5.2 (vol 3) of

     * Bluetooth Core Specification version 2.1 + EDR.

     * <p>Use {@link BluetoothSocket#connect} to initiate the outgoing
@@ -1688,7 +1688,7 @@ public final class BluetoothDevice implements Parcelable { 
     * For example, for Bluetooth 2.1 devices, if any of the devices does not

     * have an input and output capability or just has the ability to

     * display a numeric key, a secure socket connection is not possible.

     * In such a case, use {#link createInsecureRfcommSocketToServiceRecord}.

     * In such a case, use {@link #createInsecureRfcommSocketToServiceRecord}.

     * For more details, refer to the Security Model section 5.2 (vol 3) of

     * Bluetooth Core Specification version 2.1 + EDR.

     * <p>Hint: If you are connecting to a Bluetooth serial board then try
@@ -1972,7 +1972,7 @@ public final class BluetoothDevice implements Parcelable { 
     * 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,

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

     * int)}.

     *

     * @param psm dynamic PSM value from remote device

core/java/android/bluetooth/BluetoothServerSocket.java

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ 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

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

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

     * method is called on non-L2CAP server sockets.

     *

core/java/android/inputmethodservice/InputMethodService.java

+2 −2
Original line number Diff line number Diff line
@@ -2095,7 +2095,7 @@ public class InputMethodService extends AbstractInputMethodService { 
     * Called when the application has reported a new location of its text

     * cursor.  This is only called if explicitly requested by the input method.

     * The default implementation does nothing.

     * @deprecated Use {#link onUpdateCursorAnchorInfo(CursorAnchorInfo)} instead.

     * @deprecated Use {@link #onUpdateCursorAnchorInfo(CursorAnchorInfo)} instead.

     */

    @Deprecated

    public void onUpdateCursor(Rect newCursor) {
@@ -2162,7 +2162,7 @@ public class InputMethodService extends AbstractInputMethodService { 
    }



    /**

     * @return {#link ExtractEditText} if it is considered to be visible and active. Otherwise

     * @return {@link ExtractEditText} if it is considered to be visible and active. Otherwise

     * {@code null} is returned.

     */

    private ExtractEditText getExtractEditTextIfVisible() {