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

Commit a88d1990 authored by yinxu's avatar yinxu
Browse files

Adds error codes and maximum RAN/Bands/Channels 

Added error codes which are mapped from the RadioError which is returned
from RIL, also added some errors which will be generated at telephony.
Those errors will be returned to the user with the onError() callback.

Added the maximun number of RAN/Bands/Channels in 1 scan request.

Test: Telephony sanity tests
Bug: 30954762
Change-Id: Ie7865ed2101d9564e26870a8ebbb0ceb7bd9bd1b
parent aadb414f

telephony/java/android/telephony/NetworkScan.java

+19 −5
Original line number Diff line number Diff line
@@ -34,12 +34,26 @@ public class NetworkScan { 


    public static final String TAG = "NetworkScan";



    public static final int SUCCESS = 0;

    public static final int ERROR_INVALID_SCAN = 1;

    public static final int ERROR_UNSUPPORTED = 2;

    public static final int ERROR_INTERRUPTED = 3;

    public static final int ERROR_CANCELLED = 4;

    // Below errors are mapped from RadioError which is returned from RIL. We will consolidate

    // RadioErrors during the mapping if those RadioErrors mean no difference to the users.

    public static final int SUCCESS = 0;                    // RadioError:NONE

    public static final int ERROR_MODEM_ERROR = 1;          // RadioError:RADIO_NOT_AVAILABLE

                                                            // RadioError:NO_MEMORY

                                                            // RadioError:INTERNAL_ERR

                                                            // RadioError:MODEM_ERR

                                                            // RadioError:OPERATION_NOT_ALLOWED

    public static final int ERROR_INVALID_SCAN = 2;         // RadioError:INVALID_ARGUMENTS

    public static final int ERROR_MODEM_BUSY = 3;           // RadioError:DEVICE_IN_USE

    public static final int ERROR_UNSUPPORTED = 4;          // RadioError:REQUEST_NOT_SUPPORTED



    // Below errors are generated at the Telephony.

    public static final int ERROR_RIL_ERROR = 10000;        // Nothing or only exception is

                                                            // returned from RIL.

    public static final int ERROR_INVALID_SCANID = 10001;   // The scanId is invalid. The user is

                                                            // either trying to stop a scan which

                                                            // does not exist or started by others.

    public static final int ERROR_INTERRUPTED = 10002;      // Scan was interrupted by another scan

                                                            // with higher priority.

    private final int mScanId;

    private final int mSubId;

telephony/java/android/telephony/NetworkScanRequest.java

+8 −0
Original line number Diff line number Diff line
@@ -31,6 +31,14 @@ import java.util.Arrays; 
 */

public final class NetworkScanRequest implements Parcelable {



    // Below size limits for RAN/Band/Channel are for pre-treble modems and will be removed later.

    /** @hide */

    public static final int MAX_RADIO_ACCESS_NETWORKS = 8;

    /** @hide */

    public static final int MAX_BANDS = 8;

    /** @hide */

    public static final int MAX_CHANNELS = 32;



    /** Performs the scan only once */

    public static final int SCAN_TYPE_ONE_SHOT = 0;

    /**