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

Commit f38cb360 authored by Andrew Sapperstein's avatar Andrew Sapperstein Committed by Gerrit Code Review
Browse files

Merge "Fix last broken @see links in aosp."

parents 6abe4fb0 50dd1eaa

core/java/android/app/job/JobScheduler.java

+2 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ import java.util.List; 
 * system will execute this job on your application's {@link android.app.job.JobService}.

 * You identify the service component that implements the logic for your job when you

 * construct the JobInfo using

 * {@link android.app.job.JobInfo.Builder#JobInfo.Builder(int,android.content.ComponentName)}.

 * {@link android.app.job.JobInfo.Builder#Builder(int,android.content.ComponentName)}.

 * </p>

 * <p>

 * The framework will be intelligent about when it executes jobs, and attempt to batch
@@ -147,7 +147,7 @@ public abstract class JobScheduler { 
     * method is ignored.

     *

     * @param jobId unique identifier for the job to be canceled, as supplied to

     *     {@link JobInfo.Builder#JobInfo.Builder(int, android.content.ComponentName)

     *     {@link JobInfo.Builder#Builder(int, android.content.ComponentName)

     *     JobInfo.Builder(int, android.content.ComponentName)}.

     */

    public abstract void cancel(int jobId);

telephony/java/android/telephony/euicc/EuiccManager.java

+34 −34
Original line number Diff line number Diff line
@@ -269,10 +269,10 @@ public class EuiccManager { 
     * only contains {@link #OPERATION_DOWNLOAD} and ErrorCode is 0 implies this is an unknown

     * Download error.

     *

     * @see {@link #EXTRA_EMBEDDED_SUBSCRIPTION_OPERATION_CODE}

     * @see {@link #EXTRA_EMBEDDED_SUBSCRIPTION_ERROR_CODE}

     * @see {@link #EXTRA_EMBEDDED_SUBSCRIPTION_SMDX_SUBJECT_CODE}

     * @see {@link #EXTRA_EMBEDDED_SUBSCRIPTION_SMDX_REASON_CODE}

     * @see #EXTRA_EMBEDDED_SUBSCRIPTION_OPERATION_CODE

     * @see #EXTRA_EMBEDDED_SUBSCRIPTION_ERROR_CODE

     * @see #EXTRA_EMBEDDED_SUBSCRIPTION_SMDX_SUBJECT_CODE

     * @see #EXTRA_EMBEDDED_SUBSCRIPTION_SMDX_REASON_CODE

     */

    public static final String EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE =

            "android.telephony.euicc.extra.EMBEDDED_SUBSCRIPTION_DETAILED_CODE";
@@ -552,7 +552,7 @@ public class EuiccManager { 


    /**

     * List of OperationCode corresponding to {@link #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE}'s

     * value, an integer. @see {@link #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE} for details

     * value, an integer. @see #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE

     *

     * @hide

     */
@@ -575,44 +575,44 @@ public class EuiccManager { 


    /**

     * Internal system error.

     * @see {@link #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE} for details

     * @see #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE

     */

    public static final int OPERATION_SYSTEM = 1;



    /**

     * SIM slot error. Failed to switch slot, failed to access the physical slot etc.

     * @see {@link #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE} for details

     * @see #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE

     */

    public static final int OPERATION_SIM_SLOT = 2;



    /**

     * eUICC card error.

     * @see {@link #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE} for details

     * @see #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE

     */

    public static final int OPERATION_EUICC_CARD = 3;



    /**

     * Generic switching profile error

     * @see {@link #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE} for details

     * @see #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE

     */

    public static final int OPERATION_SWITCH = 4;



    /**

     * Download profile error.

     * @see {@link #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE} for details

     * @see #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE

     */

    public static final int OPERATION_DOWNLOAD = 5;



    /**

     * Subscription's metadata error

     * @see {@link #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE} for details

     * @see #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE

     */

    public static final int OPERATION_METADATA = 6;



    /**

     * eUICC returned an error defined in GSMA (SGP.22 v2.2) while running one of the ES10x

     * functions.

     * @see {@link #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE} for details

     * @see #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE

     */

    public static final int OPERATION_EUICC_GSMA = 7;
@@ -620,13 +620,13 @@ public class EuiccManager { 
     * The exception of failing to execute an APDU command. It can be caused by an error

     * happening on opening the basic or logical channel, or the response of the APDU command is

     * not success (0x9000).

     * @see {@link #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE} for details

     * @see #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE

     */

    public static final int OPERATION_APDU = 8;



    /**

     * SMDX(SMDP/SMDS) error

     * @see {@link #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE} for details

     * @see #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE

     */

    public static final int OPERATION_SMDX = 9;
@@ -655,19 +655,19 @@ public class EuiccManager { 
     * Thus the integer stored in {@link #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE} is

     * 0xA8B1051(176885841)

     *

     * @see {@link #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE} for details

     * @see #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE

     */

    public static final int OPERATION_SMDX_SUBJECT_REASON_CODE = 10;



    /**

     * HTTP error

     * @see {@link #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE} for details

     * @see #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE

     */

    public static final int OPERATION_HTTP = 11;



    /**

     * List of ErrorCode corresponding to {@link #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE}

     * @see {@link #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE} for details

     * @see #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE

     * @hide

     */

    @Retention(RetentionPolicy.SOURCE)
@@ -695,56 +695,56 @@ public class EuiccManager { 
    /**

     * Operation such as downloading/switching to another profile failed due to device being

     * carrier locked.

     * @see {@link #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE} for details

     * @see #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE

     */

    public static final int ERROR_CARRIER_LOCKED = 10000;



    /**

     * The activation code(SGP.22 v2.2 section[4.1]) is invalid.

     * @see {@link #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE} for details

     * @see #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE

     */

    public static final int ERROR_INVALID_ACTIVATION_CODE = 10001;



    /**

     * The confirmation code(SGP.22 v2.2 section[4.7]) is invalid.

     * @see {@link #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE} for details

     * @see #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE

     */

    public static final int ERROR_INVALID_CONFIRMATION_CODE = 10002;



    /**

     * The profile's carrier is incompatible with the LPA.

     * @see {@link #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE} for details

     * @see #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE

     */

    public static final int ERROR_INCOMPATIBLE_CARRIER = 10003;



    /**

     * There is no more space available on the eUICC for new profiles.

     * @see {@link #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE} for details

     * @see #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE

     */

    public static final int ERROR_EUICC_INSUFFICIENT_MEMORY = 10004;



    /**

     * Timed out while waiting for an operation to complete. i.e restart, disable,

     * switch reset etc.

     * @see {@link #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE} for details

     * @see #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE

     */

    public static final int ERROR_TIME_OUT = 10005;



    /**

     * eUICC is missing or defective on the device.

     * @see {@link #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE} for details

     * @see #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE

     */

    public static final int ERROR_EUICC_MISSING = 10006;



    /**

     * The eUICC card(hardware) version is incompatible with the software

     * @see {@link #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE} for details

     * @see #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE

     */

    public static final int ERROR_UNSUPPORTED_VERSION = 10007;



    /**

     * No SIM card is available in the device.

     * @see {@link #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE} for details

     * @see #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE

     */

    public static final int ERROR_SIM_MISSING = 10008;
@@ -754,52 +754,52 @@ public class EuiccManager { 
     * 2. GSMA(.22 v2.2) Profile Install Result - installFailedDueToDataMismatch

     * 3. operation was interrupted

     * 4. SIMalliance error in PEStatus(SGP.22 v2.2 section 2.5.6.1)

     * @see {@link #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE} for details

     * @see #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE

     */

    public static final int ERROR_INSTALL_PROFILE = 10009;



    /**

     * Failed to load profile onto eUICC due to Profile Poicly Rules.

     * @see {@link #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE} for details

     * @see #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE

     */

    public static final int ERROR_DISALLOWED_BY_PPR = 10010;





    /**

     * Address is missing e.g SMDS/SMDP address is missing.

     * @see {@link #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE} for details

     * @see #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE

     */

    public static final int ERROR_ADDRESS_MISSING = 10011;



    /**

     * Certificate needed for authentication is not valid or missing. E.g  SMDP/SMDS authentication

     * failed.

     * @see {@link #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE} for details

     * @see #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE

     */

    public static final int ERROR_CERTIFICATE_ERROR = 10012;





    /**

     * No profiles available.

     * @see {@link #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE} for details

     * @see #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE

     */

    public static final int ERROR_NO_PROFILES_AVAILABLE = 10013;



    /**

     * Failure to create a connection.

     * @see {@link #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE} for details

     * @see #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE

     */

    public static final int ERROR_CONNECTION_ERROR = 10014;



    /**

     * Response format is invalid. e.g SMDP/SMDS response contains invalid json, header or/and ASN1.

     * @see {@link #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE} for details

     * @see #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE

     */

    public static final int ERROR_INVALID_RESPONSE = 10015;



    /**

     * The operation is currently busy, try again later.

     * @see {@link #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE} for details

     * @see #EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE

     */

    public static final int ERROR_OPERATION_BUSY = 10016;

wifi/java/android/net/wifi/WifiManager.java

+1 −1
Original line number Diff line number Diff line
@@ -892,7 +892,7 @@ public class WifiManager { 
     * The RSSI (signal strength) has changed.

     *

     * Receiver Required Permission: android.Manifest.permission.ACCESS_WIFI_STATE

     * @see {@link #EXTRA_NEW_RSSI}

     * @see #EXTRA_NEW_RSSI

     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String RSSI_CHANGED_ACTION = "android.net.wifi.RSSI_CHANGED";