Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Adds error codes and maximum RAN/Bands/Channels"

Browse Source 
am: 70373f7928

Change-Id: I1c169772fb1335df4128b186e826f1bed1ca501d
This commit is contained in:
Ying Xu
2017-06-14 02:25:53 +00:00
committed by android-build-merger
parent d25acf1022 70373f7928
commit 707dc81da1
2 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
telephony/java/android/telephony/NetworkScan.java
View File

@@ -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;

8
telephony/java/android/telephony/NetworkScanRequest.java
View File

@@ -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;
/**