Merge "Remove deprecated/unused APIs from IRadio AIDL"

This commit is contained in:
Sarah Chin
2021-11-12 23:53:09 +00:00
committed by Gerrit Code Review
61 changed files with 88 additions and 1040 deletions

View File

@@ -37,7 +37,7 @@ parcelable SliceInfo {
byte sliceServiceType;
int sliceDifferentiator;
byte mappedHplmnSst;
int mappedHplmnSD;
int mappedHplmnSd;
byte status;
const byte SERVICE_TYPE_NONE = 0;
const byte SERVICE_TYPE_EMBB = 1;

View File

@@ -39,5 +39,5 @@ parcelable CellIdentityCdma {
int baseStationId;
int longitude;
int latitude;
android.hardware.radio.network.CellIdentityOperatorNames operatorNames;
android.hardware.radio.network.OperatorInfo operatorNames;
}

View File

@@ -40,6 +40,6 @@ parcelable CellIdentityGsm {
int cid;
int arfcn;
byte bsic;
android.hardware.radio.network.CellIdentityOperatorNames operatorNames;
android.hardware.radio.network.OperatorInfo operatorNames;
String[] additionalPlmns;
}

View File

@@ -40,7 +40,7 @@ parcelable CellIdentityLte {
int pci;
int tac;
int earfcn;
android.hardware.radio.network.CellIdentityOperatorNames operatorNames;
android.hardware.radio.network.OperatorInfo operatorNames;
int bandwidth;
String[] additionalPlmns;
@nullable android.hardware.radio.network.ClosedSubscriberGroupInfo csgInfo;

View File

@@ -40,7 +40,7 @@ parcelable CellIdentityNr {
int pci;
int tac;
int nrarfcn;
android.hardware.radio.network.CellIdentityOperatorNames operatorNames;
android.hardware.radio.network.OperatorInfo operatorNames;
String[] additionalPlmns;
android.hardware.radio.network.NgranBands[] bands;
}

View File

@@ -1,39 +0,0 @@
/*
* Copyright (C) 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
///////////////////////////////////////////////////////////////////////////////
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. //
///////////////////////////////////////////////////////////////////////////////
// This file is a snapshot of an AIDL file. Do not edit it manually. There are
// two cases:
// 1). this is a frozen version file - do not edit this in any case.
// 2). this is a 'current' file. If you make a backwards compatible change to
// the interface (from the latest frozen version), the build system will
// prompt you to update this file with `m <name>-update-api`.
//
// You must not make a backward incompatible change to any AIDL file built
// with the aidl_interface module type with versions property set. The module
// type is used to build AIDL files in a way that they can be used across
// independently updatable components of the system. If a device is shipped
// with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.radio.network;
@VintfStability
parcelable CellIdentityOperatorNames {
String alphaLong;
String alphaShort;
}

View File

@@ -40,7 +40,7 @@ parcelable CellIdentityTdscdma {
int cid;
int cpid;
int uarfcn;
android.hardware.radio.network.CellIdentityOperatorNames operatorNames;
android.hardware.radio.network.OperatorInfo operatorNames;
String[] additionalPlmns;
@nullable android.hardware.radio.network.ClosedSubscriberGroupInfo csgInfo;
}

View File

@@ -40,7 +40,7 @@ parcelable CellIdentityWcdma {
int cid;
int psc;
int uarfcn;
android.hardware.radio.network.CellIdentityOperatorNames operatorNames;
android.hardware.radio.network.OperatorInfo operatorNames;
String[] additionalPlmns;
@nullable android.hardware.radio.network.ClosedSubscriberGroupInfo csgInfo;
}

View File

@@ -42,7 +42,6 @@ interface IRadioNetwork {
oneway void getCellInfoList(in int serial);
oneway void getDataRegistrationState(in int serial);
oneway void getImsRegistrationState(in int serial);
oneway void getNeighboringCids(in int serial);
oneway void getNetworkSelectionMode(in int serial);
oneway void getOperator(in int serial);
oneway void getSignalStrength(in int serial);
@@ -50,7 +49,6 @@ interface IRadioNetwork {
oneway void getVoiceRadioTechnology(in int serial);
oneway void getVoiceRegistrationState(in int serial);
oneway void isNrDualConnectivityEnabled(in int serial);
oneway void pullLceData(in int serial);
oneway void responseAcknowledgement();
oneway void setAllowedNetworkTypesBitmap(in int serial, in android.hardware.radio.RadioAccessFamily networkTypeBitmap);
oneway void setBandMode(in int serial, in android.hardware.radio.network.RadioBandMode mode);

View File

@@ -43,7 +43,6 @@ interface IRadioNetworkResponse {
oneway void getCellInfoListResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.network.CellInfo[] cellInfo);
oneway void getDataRegistrationStateResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.network.RegStateResult dataRegResponse);
oneway void getImsRegistrationStateResponse(in android.hardware.radio.RadioResponseInfo info, in boolean isRegistered, in android.hardware.radio.RadioTechnologyFamily ratFamily);
oneway void getNeighboringCidsResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.network.NeighboringCell[] cells);
oneway void getNetworkSelectionModeResponse(in android.hardware.radio.RadioResponseInfo info, in boolean manual);
oneway void getOperatorResponse(in android.hardware.radio.RadioResponseInfo info, in String longName, in String shortName, in String numeric);
oneway void getSignalStrengthResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.network.SignalStrength signalStrength);
@@ -51,7 +50,6 @@ interface IRadioNetworkResponse {
oneway void getVoiceRadioTechnologyResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.RadioTechnology rat);
oneway void getVoiceRegistrationStateResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.network.RegStateResult voiceRegResponse);
oneway void isNrDualConnectivityEnabledResponse(in android.hardware.radio.RadioResponseInfo info, in boolean isEnabled);
oneway void pullLceDataResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.network.LceDataInfo lceInfo);
oneway void setAllowedNetworkTypesBitmapResponse(in android.hardware.radio.RadioResponseInfo info);
oneway void setBandModeResponse(in android.hardware.radio.RadioResponseInfo info);
oneway void setBarringPasswordResponse(in android.hardware.radio.RadioResponseInfo info);

View File

@@ -41,6 +41,7 @@ parcelable NetworkScanRequest {
boolean incrementalResults;
int incrementalResultsPeriodicity;
String[] mccMncs;
const int RADIO_ACCESS_SPECIFIER_MAX_SIZE = 8;
const int INCREMENTAL_RESULTS_PREIODICITY_RANGE_MIN = 1;
const int INCREMENTAL_RESULTS_PREIODICITY_RANGE_MAX = 10;
const int MAX_SEARCH_TIME_RANGE_MIN = 60;

View File

@@ -53,11 +53,10 @@ interface IRadioSim {
oneway void iccTransmitApduLogicalChannel(in int serial, in android.hardware.radio.sim.SimApdu message);
oneway void reportStkServiceIsRunning(in int serial);
oneway void requestIccSimAuthentication(in int serial, in int authContext, in String authData, in String aid);
oneway void requestIsimAuthentication(in int serial, in String challenge);
oneway void responseAcknowledgement();
oneway void sendEnvelope(in int serial, in String command);
oneway void sendEnvelope(in int serial, in String contents);
oneway void sendEnvelopeWithStatus(in int serial, in String contents);
oneway void sendTerminalResponseToSim(in int serial, in String commandResponse);
oneway void sendTerminalResponseToSim(in int serial, in String contents);
oneway void setAllowedCarriers(in int serial, in android.hardware.radio.sim.CarrierRestrictions carriers, in android.hardware.radio.sim.SimLockMultiSimPolicy multiSimPolicy);
oneway void setCarrierInfoForImsiEncryption(in int serial, in android.hardware.radio.sim.ImsiEncryptionInfo imsiEncryptionInfo);
oneway void setCdmaSubscriptionSource(in int serial, in android.hardware.radio.sim.CdmaSubscriptionSource cdmaSub);

View File

@@ -54,7 +54,6 @@ interface IRadioSimResponse {
oneway void iccTransmitApduLogicalChannelResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.sim.IccIoResult result);
oneway void reportStkServiceIsRunningResponse(in android.hardware.radio.RadioResponseInfo info);
oneway void requestIccSimAuthenticationResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.sim.IccIoResult result);
oneway void requestIsimAuthenticationResponse(in android.hardware.radio.RadioResponseInfo info, in String response);
oneway void sendEnvelopeResponse(in android.hardware.radio.RadioResponseInfo info, in String commandResponse);
oneway void sendEnvelopeWithStatusResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.sim.IccIoResult iccIo);
oneway void sendTerminalResponseToSimResponse(in android.hardware.radio.RadioResponseInfo info);

View File

@@ -35,4 +35,5 @@ package android.hardware.radio.voice;
@VintfStability
parcelable CdmaDisplayInfoRecord {
String alphaBuf;
const int CDMA_ALPHA_INFO_BUFFER_LENGTH = 64;
}

View File

@@ -42,6 +42,7 @@ parcelable CdmaInformationRecord {
android.hardware.radio.voice.CdmaLineControlInfoRecord[] lineCtrl;
android.hardware.radio.voice.CdmaT53ClirInfoRecord[] clir;
android.hardware.radio.voice.CdmaT53AudioControlInfoRecord[] audioCtrl;
const int CDMA_MAX_NUMBER_OF_INFO_RECS = 10;
const int NAME_DISPLAY = 0;
const int NAME_CALLED_PARTY_NUMBER = 1;
const int NAME_CALLING_PARTY_NUMBER = 2;

View File

@@ -1,38 +0,0 @@
/*
* Copyright (C) 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
///////////////////////////////////////////////////////////////////////////////
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. //
///////////////////////////////////////////////////////////////////////////////
// This file is a snapshot of an AIDL file. Do not edit it manually. There are
// two cases:
// 1). this is a frozen version file - do not edit this in any case.
// 2). this is a 'current' file. If you make a backwards compatible change to
// the interface (from the latest frozen version), the build system will
// prompt you to update this file with `m <name>-update-api`.
//
// You must not make a backward incompatible change to any AIDL file built
// with the aidl_interface module type with versions property set. The module
// type is used to build AIDL files in a way that they can be used across
// independently updatable components of the system. If a device is shipped
// with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.radio.voice;
@VintfStability
parcelable CdmaInformationRecords {
android.hardware.radio.voice.CdmaInformationRecord[] infoRec;
}

View File

@@ -39,4 +39,5 @@ parcelable CdmaNumberInfoRecord {
byte numberPlan;
byte pi;
byte si;
const int CDMA_NUMBER_INFO_BUFFER_LENGTH = 81;
}

View File

@@ -35,4 +35,5 @@ package android.hardware.radio.voice;
@VintfStability
parcelable CfData {
android.hardware.radio.voice.CallForwardInfo[] cfInfo;
const int NUM_SERVICE_CLASSES = 7;
}

View File

@@ -37,7 +37,7 @@ interface IRadioVoiceIndication {
oneway void callRing(in android.hardware.radio.RadioIndicationType type, in boolean isGsm, in android.hardware.radio.voice.CdmaSignalInfoRecord record);
oneway void callStateChanged(in android.hardware.radio.RadioIndicationType type);
oneway void cdmaCallWaiting(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.voice.CdmaCallWaiting callWaitingRecord);
oneway void cdmaInfoRec(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.voice.CdmaInformationRecords records);
oneway void cdmaInfoRec(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.voice.CdmaInformationRecord[] records);
oneway void cdmaOtaProvisionStatus(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.voice.CdmaOtaProvisionStatus status);
oneway void currentEmergencyNumberList(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.voice.EmergencyNumber[] emergencyNumberList);
oneway void enterEmergencyCallbackMode(in android.hardware.radio.RadioIndicationType type);

View File

@@ -35,4 +35,5 @@ package android.hardware.radio.voice;
@VintfStability
parcelable SsInfoData {
int[] ssInfo;
const int SS_INFO_MAX = 4;
}

View File

@@ -1,46 +0,0 @@
/*
* Copyright (C) 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
///////////////////////////////////////////////////////////////////////////////
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. //
///////////////////////////////////////////////////////////////////////////////
// This file is a snapshot of an AIDL file. Do not edit it manually. There are
// two cases:
// 1). this is a frozen version file - do not edit this in any case.
// 2). this is a 'current' file. If you make a backwards compatible change to
// the interface (from the latest frozen version), the build system will
// prompt you to update this file with `m <name>-update-api`.
//
// You must not make a backward incompatible change to any AIDL file built
// with the aidl_interface module type with versions property set. The module
// type is used to build AIDL files in a way that they can be used across
// independently updatable components of the system. If a device is shipped
// with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.radio;
@VintfStability
interface ISap {
oneway void apduReq(in int token, in android.hardware.radio.SapApduType type, in byte[] command);
oneway void connectReq(in int token, in int maxMsgSize);
oneway void disconnectReq(in int token);
oneway void powerReq(in int token, in boolean state);
oneway void resetSimReq(in int token);
oneway void setCallback(in android.hardware.radio.ISapCallback sapCallback);
oneway void setTransferProtocolReq(in int token, in android.hardware.radio.SapTransferProtocol transferProtocol);
oneway void transferAtrReq(in int token);
oneway void transferCardReaderStatusReq(in int token);
}

View File

@@ -1,48 +0,0 @@
/*
* Copyright (C) 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
///////////////////////////////////////////////////////////////////////////////
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. //
///////////////////////////////////////////////////////////////////////////////
// This file is a snapshot of an AIDL file. Do not edit it manually. There are
// two cases:
// 1). this is a frozen version file - do not edit this in any case.
// 2). this is a 'current' file. If you make a backwards compatible change to
// the interface (from the latest frozen version), the build system will
// prompt you to update this file with `m <name>-update-api`.
//
// You must not make a backward incompatible change to any AIDL file built
// with the aidl_interface module type with versions property set. The module
// type is used to build AIDL files in a way that they can be used across
// independently updatable components of the system. If a device is shipped
// with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.radio;
@VintfStability
interface ISapCallback {
oneway void apduResponse(in int token, in android.hardware.radio.SapResultCode resultCode, in byte[] apduRsp);
oneway void connectResponse(in int token, in android.hardware.radio.SapConnectRsp sapConnectRsp, in int maxMsgSize);
oneway void disconnectIndication(in int token, in android.hardware.radio.SapDisconnectType disconnectType);
oneway void disconnectResponse(in int token);
oneway void errorResponse(in int token);
oneway void powerResponse(in int token, in android.hardware.radio.SapResultCode resultCode);
oneway void resetSimResponse(in int token, in android.hardware.radio.SapResultCode resultCode);
oneway void statusIndication(in int token, in android.hardware.radio.SapStatus status);
oneway void transferAtrResponse(in int token, in android.hardware.radio.SapResultCode resultCode, in byte[] atr);
oneway void transferCardReaderStatusResponse(in int token, in android.hardware.radio.SapResultCode resultCode, in int cardReaderStatus);
oneway void transferProtocolResponse(in int token, in android.hardware.radio.SapResultCode resultCode);
}

View File

@@ -52,6 +52,7 @@ enum RadioAccessFamily {
HSPAP = 32768,
GSM = 65536,
TD_SCDMA = 131072,
IWLAN = 262144,
LTE_CA = 524288,
NR = 1048576,
}

View File

@@ -32,21 +32,10 @@
// later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.radio;
@Backing(type="int") @VintfStability
enum RadioConst {
CDMA_ALPHA_INFO_BUFFER_LENGTH = 64,
CDMA_NUMBER_INFO_BUFFER_LENGTH = 81,
MAX_RILDS = 3,
MAX_SOCKET_NAME_LENGTH = 6,
MAX_CLIENT_ID_LENGTH = 2,
MAX_DEBUG_SOCKET_NAME_LENGTH = 12,
MAX_QEMU_PIPE_NAME_LENGTH = 11,
MAX_UUID_LENGTH = 64,
CARD_MAX_APPS = 8,
CDMA_MAX_NUMBER_OF_INFO_RECS = 10,
SS_INFO_MAX = 4,
NUM_SERVICE_CLASSES = 7,
NUM_TX_POWER_LEVELS = 5,
RADIO_ACCESS_SPECIFIER_MAX_SIZE = 8,
P2_CONSTANT_NO_P2 = -1,
@VintfStability
parcelable RadioConst {
const int MAX_RILDS = 3;
const int MAX_UUID_LENGTH = 64;
const int CARD_MAX_APPS = 8;
const int P2_CONSTANT_NO_P2 = -1;
}

View File

@@ -1,39 +0,0 @@
/*
* Copyright (C) 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
///////////////////////////////////////////////////////////////////////////////
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. //
///////////////////////////////////////////////////////////////////////////////
// This file is a snapshot of an AIDL file. Do not edit it manually. There are
// two cases:
// 1). this is a frozen version file - do not edit this in any case.
// 2). this is a 'current' file. If you make a backwards compatible change to
// the interface (from the latest frozen version), the build system will
// prompt you to update this file with `m <name>-update-api`.
//
// You must not make a backward incompatible change to any AIDL file built
// with the aidl_interface module type with versions property set. The module
// type is used to build AIDL files in a way that they can be used across
// independently updatable components of the system. If a device is shipped
// with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.radio;
@Backing(type="int") @VintfStability
enum SapApduType {
APDU = 0,
APDU7816 = 1,
}

View File

@@ -1,42 +0,0 @@
/*
* Copyright (C) 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
///////////////////////////////////////////////////////////////////////////////
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. //
///////////////////////////////////////////////////////////////////////////////
// This file is a snapshot of an AIDL file. Do not edit it manually. There are
// two cases:
// 1). this is a frozen version file - do not edit this in any case.
// 2). this is a 'current' file. If you make a backwards compatible change to
// the interface (from the latest frozen version), the build system will
// prompt you to update this file with `m <name>-update-api`.
//
// You must not make a backward incompatible change to any AIDL file built
// with the aidl_interface module type with versions property set. The module
// type is used to build AIDL files in a way that they can be used across
// independently updatable components of the system. If a device is shipped
// with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.radio;
@Backing(type="int") @VintfStability
enum SapConnectRsp {
SUCCESS = 0,
CONNECT_FAILURE = 1,
MSG_SIZE_TOO_LARGE = 2,
MSG_SIZE_TOO_SMALL = 3,
CONNECT_OK_CALL_ONGOING = 4,
}

View File

@@ -1,39 +0,0 @@
/*
* Copyright (C) 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
///////////////////////////////////////////////////////////////////////////////
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. //
///////////////////////////////////////////////////////////////////////////////
// This file is a snapshot of an AIDL file. Do not edit it manually. There are
// two cases:
// 1). this is a frozen version file - do not edit this in any case.
// 2). this is a 'current' file. If you make a backwards compatible change to
// the interface (from the latest frozen version), the build system will
// prompt you to update this file with `m <name>-update-api`.
//
// You must not make a backward incompatible change to any AIDL file built
// with the aidl_interface module type with versions property set. The module
// type is used to build AIDL files in a way that they can be used across
// independently updatable components of the system. If a device is shipped
// with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.radio;
@Backing(type="int") @VintfStability
enum SapDisconnectType {
GRACEFUL = 0,
IMMEDIATE = 1,
}

View File

@@ -1,45 +0,0 @@
/*
* Copyright (C) 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
///////////////////////////////////////////////////////////////////////////////
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. //
///////////////////////////////////////////////////////////////////////////////
// This file is a snapshot of an AIDL file. Do not edit it manually. There are
// two cases:
// 1). this is a frozen version file - do not edit this in any case.
// 2). this is a 'current' file. If you make a backwards compatible change to
// the interface (from the latest frozen version), the build system will
// prompt you to update this file with `m <name>-update-api`.
//
// You must not make a backward incompatible change to any AIDL file built
// with the aidl_interface module type with versions property set. The module
// type is used to build AIDL files in a way that they can be used across
// independently updatable components of the system. If a device is shipped
// with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.radio;
@Backing(type="int") @VintfStability
enum SapResultCode {
SUCCESS = 0,
GENERIC_FAILURE = 1,
CARD_NOT_ACCESSSIBLE = 2,
CARD_ALREADY_POWERED_OFF = 3,
CARD_REMOVED = 4,
CARD_ALREADY_POWERED_ON = 5,
DATA_NOT_AVAILABLE = 6,
NOT_SUPPORTED = 7,
}

View File

@@ -1,43 +0,0 @@
/*
* Copyright (C) 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
///////////////////////////////////////////////////////////////////////////////
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. //
///////////////////////////////////////////////////////////////////////////////
// This file is a snapshot of an AIDL file. Do not edit it manually. There are
// two cases:
// 1). this is a frozen version file - do not edit this in any case.
// 2). this is a 'current' file. If you make a backwards compatible change to
// the interface (from the latest frozen version), the build system will
// prompt you to update this file with `m <name>-update-api`.
//
// You must not make a backward incompatible change to any AIDL file built
// with the aidl_interface module type with versions property set. The module
// type is used to build AIDL files in a way that they can be used across
// independently updatable components of the system. If a device is shipped
// with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.radio;
@Backing(type="int") @VintfStability
enum SapStatus {
UNKNOWN_ERROR = 0,
CARD_RESET = 1,
CARD_NOT_ACCESSIBLE = 2,
CARD_REMOVED = 3,
CARD_INSERTED = 4,
RECOVERED = 5,
}

View File

@@ -1,39 +0,0 @@
/*
* Copyright (C) 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
///////////////////////////////////////////////////////////////////////////////
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. //
///////////////////////////////////////////////////////////////////////////////
// This file is a snapshot of an AIDL file. Do not edit it manually. There are
// two cases:
// 1). this is a frozen version file - do not edit this in any case.
// 2). this is a 'current' file. If you make a backwards compatible change to
// the interface (from the latest frozen version), the build system will
// prompt you to update this file with `m <name>-update-api`.
//
// You must not make a backward incompatible change to any AIDL file built
// with the aidl_interface module type with versions property set. The module
// type is used to build AIDL files in a way that they can be used across
// independently updatable components of the system. If a device is shipped
// with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.radio;
@Backing(type="int") @VintfStability
enum SapTransferProtocol {
T0 = 0,
T1 = 1,
}

View File

@@ -1,95 +0,0 @@
/*
* Copyright (C) 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.hardware.radio;
import android.hardware.radio.ISapCallback;
import android.hardware.radio.SapApduType;
import android.hardware.radio.SapTransferProtocol;
/**
* Empty top level interface.
*/
@VintfStability
oneway interface ISap {
/**
* TRANSFER_APDU_REQ from SAP 1.1 spec 5.1.6
*
* @param token Id to match req-resp. Resp must include same token.
* @param type APDU command type
* @param command CommandAPDU/CommandAPDU7816 parameter depending on type
*/
void apduReq(in int token, in SapApduType type, in byte[] command);
/**
* CONNECT_REQ from SAP 1.1 spec 5.1.1
*
* @param token Id to match req-resp. Resp must include same token.
* @param maxMsgSize MaxMsgSize to be used for SIM Access Profile connection
*/
void connectReq(in int token, in int maxMsgSize);
/**
* DISCONNECT_REQ from SAP 1.1 spec 5.1.3
*
* @param token Id to match req-resp. Resp must include same token.
*/
void disconnectReq(in int token);
/**
* POWER_SIM_OFF_REQ and POWER_SIM_ON_REQ from SAP 1.1 spec 5.1.10 + 5.1.12
*
* @param token Id to match req-resp. Resp must include same token.
* @param state true for on, false for off
*/
void powerReq(in int token, in boolean state);
/**
* RESET_SIM_REQ from SAP 1.1 spec 5.1.14
*
* @param token Id to match req-resp. Resp must include same token.
*/
void resetSimReq(in int token);
/**
* Set callback that has response and unsolicited indication functions
*
* @param sapCallback Object containing response and unosolicited indication callbacks
*/
void setCallback(in ISapCallback sapCallback);
/**
* SET_TRANSPORT_PROTOCOL_REQ from SAP 1.1 spec 5.1.20
*
* @param token Id to match req-resp. Resp must include same token.
* @param transferProtocol Transport Protocol
*/
void setTransferProtocolReq(in int token, in SapTransferProtocol transferProtocol);
/**
* TRANSFER_ATR_REQ from SAP 1.1 spec 5.1.8
*
* @param token Id to match req-resp. Resp must include same token.
*/
void transferAtrReq(in int token);
/**
* TRANSFER_CARD_READER_STATUS_REQ from SAP 1.1 spec 5.1.17
*
* @param token Id to match req-resp. Resp must include same token.
*/
void transferCardReaderStatusReq(in int token);
}

View File

@@ -1,152 +0,0 @@
/*
* Copyright (C) 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.hardware.radio;
import android.hardware.radio.SapConnectRsp;
import android.hardware.radio.SapDisconnectType;
import android.hardware.radio.SapResultCode;
import android.hardware.radio.SapStatus;
@VintfStability
oneway interface ISapCallback {
/**
* TRANSFER_APDU_RESP from SAP 1.1 spec 5.1.7
*
* @param token Id to match req-resp. Value must match the one in req.
* @param resultCode ResultCode to indicate if command was processed correctly
* Possible values:
* SapResultCode:SUCCESS,
* SapResultCode:GENERIC_FAILURE,
* SapResultCode:CARD_NOT_ACCESSSIBLE,
* SapResultCode:CARD_ALREADY_POWERED_OFF,
* SapResultCode:CARD_REMOVED
* @param apduRsp APDU Response. Valid only if command was processed correctly and no error
* occurred.
*/
void apduResponse(in int token, in SapResultCode resultCode, in byte[] apduRsp);
/**
* CONNECT_RESP from SAP 1.1 spec 5.1.2
*
* @param token Id to match req-resp. Value must match the one in req.
* @param sapConnectRsp Connection Status
* @param maxMsgSize MaxMsgSize supported by server if request cannot be fulfilled.
* Valid only if connectResponse is SapConnectResponse:MSG_SIZE_TOO_LARGE.
*/
void connectResponse(in int token, in SapConnectRsp sapConnectRsp, in int maxMsgSize);
/**
* DISCONNECT_IND from SAP 1.1 spec 5.1.5
*
* @param token Id to match req-resp. Value must match the one in req.
* @param disconnectType Disconnect Type to indicate if shutdown is graceful or immediate
*/
void disconnectIndication(in int token, in SapDisconnectType disconnectType);
/**
* DISCONNECT_RESP from SAP 1.1 spec 5.1.4
*
* @param token Id to match req-resp. Value must match the one in req.
*/
void disconnectResponse(in int token);
/**
* ERROR_RESP from SAP 1.1 spec 5.1.19
*
* @param token Id to match req-resp. Value must match the one in req.
*/
void errorResponse(in int token);
/**
* POWER_SIM_OFF_RESP and POWER_SIM_ON_RESP from SAP 1.1 spec 5.1.11 + 5.1.13
*
* @param token Id to match req-resp. Value must match the one in req.
* @param resultCode ResultCode to indicate if command was processed correctly
* Possible values:
* SapResultCode:SUCCESS,
* SapResultCode:GENERIC_FAILURE,
* SapResultCode:CARD_NOT_ACCESSSIBLE, (possible only for power on req)
* SapResultCode:CARD_ALREADY_POWERED_OFF, (possible only for power off req)
* SapResultCode:CARD_REMOVED,
* SapResultCode:CARD_ALREADY_POWERED_ON (possible only for power on req)
*/
void powerResponse(in int token, in SapResultCode resultCode);
/**
* RESET_SIM_RESP from SAP 1.1 spec 5.1.15
*
* @param token Id to match req-resp. Value must match the one in req.
* @param resultCode ResultCode to indicate if command was processed correctly
* Possible values:
* SapResultCode:SUCCESS,
* SapResultCode:GENERIC_FAILURE,
* SapResultCode:CARD_NOT_ACCESSSIBLE,
* SapResultCode:CARD_ALREADY_POWERED_OFF,
* SapResultCode:CARD_REMOVED
*/
void resetSimResponse(in int token, in SapResultCode resultCode);
/**
* STATUS_IND from SAP 1.1 spec 5.1.16
*
* @param token Id to match req-resp. Value must match the one in req.
* @param status Parameter to indicate reason for the status change.
*/
void statusIndication(in int token, in SapStatus status);
/**
* TRANSFER_ATR_RESP from SAP 1.1 spec 5.1.9
*
* @param token Id to match req-resp. Value must match the one in req.
* @param resultCode ResultCode to indicate if command was processed correctly
* Possible values:
* SapResultCode:SUCCESS,
* SapResultCode:GENERIC_FAILURE,
* SapResultCode:CARD_ALREADY_POWERED_OFF,
* SapResultCode:CARD_REMOVED,
* SapResultCode:DATA_NOT_AVAILABLE
* @param atr Answer to Reset from the subscription module. Included only if no error occurred,
* otherwise empty.
*/
void transferAtrResponse(in int token, in SapResultCode resultCode, in byte[] atr);
/**
* TRANSFER_CARD_READER_STATUS_REQ from SAP 1.1 spec 5.1.18
*
* @param token Id to match req-resp. Value must match the one in req.
* @param resultCode ResultCode to indicate if command was processed correctly
* Possible values:
* SapResultCode:SUCCESS,
* SapResultCode:GENERIC_FAILURE
* SapResultCode:DATA_NOT_AVAILABLE
* @param cardReaderStatus Card Reader Status coded as described in 3GPP TS 11.14 Section 12.33
* and TS 31.111 Section 8.33
*/
void transferCardReaderStatusResponse(
in int token, in SapResultCode resultCode, in int cardReaderStatus);
/**
* SET_TRANSPORT_PROTOCOL_RESP from SAP 1.1 spec 5.1.21
*
* @param token Id to match req-resp. Value must match the one in req.
* @param resultCode ResultCode to indicate if command was processed correctly
* Possible values:
* SapResultCode:SUCCESS
* SapResultCode:NOT_SUPPORTED
*/
void transferProtocolResponse(in int token, in SapResultCode resultCode);
}

View File

@@ -39,6 +39,7 @@ enum RadioAccessFamily {
HSPAP = 1 << RadioTechnology.HSPAP,
GSM = 1 << RadioTechnology.GSM,
TD_SCDMA = 1 << RadioTechnology.TD_SCDMA,
IWLAN = 1 << RadioTechnology.IWLAN,
LTE_CA = 1 << RadioTechnology.LTE_CA,
/**
* 5G NR. This is only use in 5G Standalone mode.

View File

@@ -17,24 +17,12 @@
package android.hardware.radio;
@VintfStability
@Backing(type="int")
enum RadioConst {
CDMA_ALPHA_INFO_BUFFER_LENGTH = 64,
CDMA_NUMBER_INFO_BUFFER_LENGTH = 81,
MAX_RILDS = 3,
MAX_SOCKET_NAME_LENGTH = 6,
MAX_CLIENT_ID_LENGTH = 2,
MAX_DEBUG_SOCKET_NAME_LENGTH = 12,
MAX_QEMU_PIPE_NAME_LENGTH = 11,
MAX_UUID_LENGTH = 64,
CARD_MAX_APPS = 8,
CDMA_MAX_NUMBER_OF_INFO_RECS = 10,
SS_INFO_MAX = 4,
NUM_SERVICE_CLASSES = 7,
NUM_TX_POWER_LEVELS = 5,
RADIO_ACCESS_SPECIFIER_MAX_SIZE = 8,
parcelable RadioConst {
const int MAX_RILDS = 3;
const int MAX_UUID_LENGTH = 64;
const int CARD_MAX_APPS = 8;
/**
* No P2 value is provided
*/
P2_CONSTANT_NO_P2 = -1,
const int P2_CONSTANT_NO_P2 = -1;
}

View File

@@ -1,24 +0,0 @@
/*
* Copyright (C) 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.hardware.radio;
@VintfStability
@Backing(type="int")
enum SapApduType {
APDU,
APDU7816,
}

View File

@@ -1,27 +0,0 @@
/*
* Copyright (C) 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.hardware.radio;
@VintfStability
@Backing(type="int")
enum SapConnectRsp {
SUCCESS,
CONNECT_FAILURE,
MSG_SIZE_TOO_LARGE,
MSG_SIZE_TOO_SMALL,
CONNECT_OK_CALL_ONGOING,
}

View File

@@ -1,24 +0,0 @@
/*
* Copyright (C) 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.hardware.radio;
@VintfStability
@Backing(type="int")
enum SapDisconnectType {
GRACEFUL,
IMMEDIATE,
}

View File

@@ -1,30 +0,0 @@
/*
* Copyright (C) 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.hardware.radio;
@VintfStability
@Backing(type="int")
enum SapResultCode {
SUCCESS,
GENERIC_FAILURE,
CARD_NOT_ACCESSSIBLE,
CARD_ALREADY_POWERED_OFF,
CARD_REMOVED,
CARD_ALREADY_POWERED_ON,
DATA_NOT_AVAILABLE,
NOT_SUPPORTED,
}

View File

@@ -1,28 +0,0 @@
/*
* Copyright (C) 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.hardware.radio;
@VintfStability
@Backing(type="int")
enum SapStatus {
UNKNOWN_ERROR,
CARD_RESET,
CARD_NOT_ACCESSIBLE,
CARD_REMOVED,
CARD_INSERTED,
RECOVERED,
}

View File

@@ -1,24 +0,0 @@
/*
* Copyright (C) 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.hardware.radio;
@VintfStability
@Backing(type="int")
enum SapTransferProtocol {
T0,
T1,
}

View File

@@ -83,7 +83,7 @@ parcelable SliceInfo {
* value. A value of -1 indicates that there is no corresponding SliceInfo of the HPLMN.
* See: 3GPP TS 24.501 Section 9.11.2.8.
*/
int mappedHplmnSD;
int mappedHplmnSd;
/**
* Field to indicate the current status of the slice.
* Values are STATUS_

View File

@@ -16,7 +16,7 @@
package android.hardware.radio.network;
import android.hardware.radio.network.CellIdentityOperatorNames;
import android.hardware.radio.network.OperatorInfo;
@VintfStability
parcelable CellIdentityCdma {
@@ -44,5 +44,8 @@ parcelable CellIdentityCdma {
* (corresponding to a range of -90 to +90 degrees). INT_MAX if unknown
*/
int latitude;
CellIdentityOperatorNames operatorNames;
/**
* OperatorInfo containing alphaLong and alphaShort
*/
OperatorInfo operatorNames;
}

View File

@@ -16,7 +16,7 @@
package android.hardware.radio.network;
import android.hardware.radio.network.CellIdentityOperatorNames;
import android.hardware.radio.network.OperatorInfo;
@VintfStability
parcelable CellIdentityGsm {
@@ -44,7 +44,10 @@ parcelable CellIdentityGsm {
* 6-bit Base Station Identity Code, 0xFF if unknown
*/
byte bsic;
CellIdentityOperatorNames operatorNames;
/**
* OperatorInfo containing alphaLong and alphaShort
*/
OperatorInfo operatorNames;
/**
* Additional PLMN-IDs beyond the primary PLMN broadcast for this cell
*/

View File

@@ -16,9 +16,9 @@
package android.hardware.radio.network;
import android.hardware.radio.network.CellIdentityOperatorNames;
import android.hardware.radio.network.ClosedSubscriberGroupInfo;
import android.hardware.radio.network.EutranBands;
import android.hardware.radio.network.OperatorInfo;
@VintfStability
parcelable CellIdentityLte {
@@ -46,7 +46,10 @@ parcelable CellIdentityLte {
* 18-bit LTE Absolute RF Channel Number; this value must be valid
*/
int earfcn;
CellIdentityOperatorNames operatorNames;
/**
* OperatorInfo containing alphaLong and alphaShort
*/
OperatorInfo operatorNames;
/**
* Cell bandwidth, in kHz.
*/

View File

@@ -16,8 +16,8 @@
package android.hardware.radio.network;
import android.hardware.radio.network.CellIdentityOperatorNames;
import android.hardware.radio.network.NgranBands;
import android.hardware.radio.network.OperatorInfo;
/**
* The CellIdentity structure should be reported once for each element of the PLMN-IdentityInfoList
@@ -55,7 +55,10 @@ parcelable CellIdentityNr {
* This value must be valid.
*/
int nrarfcn;
CellIdentityOperatorNames operatorNames;
/**
* OperatorInfo containing alphaLong and alphaShort
*/
OperatorInfo operatorNames;
/**
* Additional PLMN-IDs beyond the primary PLMN broadcast for this cell
*/

View File

@@ -1,29 +0,0 @@
/*
* Copyright (C) 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.hardware.radio.network;
@VintfStability
parcelable CellIdentityOperatorNames {
/**
* Long alpha operator name string or enhanced operator name string.
*/
String alphaLong;
/**
* Short alpha operator name string or enhanced operator name string.
*/
String alphaShort;
}

View File

@@ -16,8 +16,8 @@
package android.hardware.radio.network;
import android.hardware.radio.network.CellIdentityOperatorNames;
import android.hardware.radio.network.ClosedSubscriberGroupInfo;
import android.hardware.radio.network.OperatorInfo;
@VintfStability
parcelable CellIdentityTdscdma {
@@ -45,7 +45,10 @@ parcelable CellIdentityTdscdma {
* 16-bit UMTS Absolute RF Channel Number defined in TS 25.102 5.4.4; this value must be valid.
*/
int uarfcn;
CellIdentityOperatorNames operatorNames;
/**
* OperatorInfo containing alphaLong and alphaShort
*/
OperatorInfo operatorNames;
/**
* Additional PLMN-IDs beyond the primary PLMN broadcast for this cell.
*/

View File

@@ -16,8 +16,8 @@
package android.hardware.radio.network;
import android.hardware.radio.network.CellIdentityOperatorNames;
import android.hardware.radio.network.ClosedSubscriberGroupInfo;
import android.hardware.radio.network.OperatorInfo;
@VintfStability
parcelable CellIdentityWcdma {
@@ -45,7 +45,10 @@ parcelable CellIdentityWcdma {
* 16-bit UMTS Absolute RF Channel Number; this value must be valid.
*/
int uarfcn;
CellIdentityOperatorNames operatorNames;
/**
* OperatorInfo containing alphaLong and alphaShort
*/
OperatorInfo operatorNames;
/**
* Additional PLMN-IDs beyond the primary PLMN broadcast for this cell.
*/

View File

@@ -113,15 +113,6 @@ oneway interface IRadioNetwork {
*/
void getImsRegistrationState(in int serial);
/**
* Request neighboring cell id in GSM network
*
* @param serial Serial number of request.
*
* Response function is IRadioNetworkResponse.getNeighboringCidsResponse()
*/
void getNeighboringCids(in int serial);
/**
* Query current network selection mode
*
@@ -186,15 +177,6 @@ oneway interface IRadioNetwork {
*/
void isNrDualConnectivityEnabled(in int serial);
/**
* Pull LCE service for capacity information.
*
* @param serial Serial number of request.
*
* Response function is IRadioNetworkResponse.pullLceDataResponse()
*/
void pullLceData(in int serial);
/**
* When response type received from a radio indication or radio response is
* RadioIndicationType:UNSOLICITED_ACK_EXP or RadioResponseType:SOLICITED_ACK_EXP respectively,

View File

@@ -177,25 +177,6 @@ oneway interface IRadioNetworkResponse {
void getImsRegistrationStateResponse(
in RadioResponseInfo info, in boolean isRegistered, in RadioTechnologyFamily ratFamily);
/**
* @param info Response info struct containing response type, serial no. and error
* @param cells Vector of neighboring radio cell
*
* Valid errors returned:
* RadioError:NONE
* RadioError:RADIO_NOT_AVAILABLE
* RadioError:INVALID_ARGUMENTS
* RadioError:NO_MEMORY
* RadioError:INTERNAL_ERR
* RadioError:SYSTEM_ERR
* RadioError:MODEM_ERR
* RadioError:NO_NETWORK_FOUND
* RadioError:REQUEST_NOT_SUPPORTED
* RadioError:NO_RESOURCES
* RadioError:CANCELLED
*/
void getNeighboringCidsResponse(in RadioResponseInfo info, in NeighboringCell[] cells);
/**
* @param info Response info struct containing response type, serial no. and error
* @param selection false for automatic selection, true for manual selection
@@ -297,23 +278,6 @@ oneway interface IRadioNetworkResponse {
*/
void isNrDualConnectivityEnabledResponse(in RadioResponseInfo info, in boolean isEnabled);
/**
* @param info Response info struct containing response type, serial no. and error
* @param lceInfo LceDataInfo indicating LCE data
*
* Valid errors returned:
* RadioError:REQUEST_NOT_SUPPORTED may be returned when HAL 1.2 or higher is supported.
* RadioError:NONE
* RadioError:RADIO_NOT_AVAILABLE
* RadioError:LCE_NOT_SUPPORTED
* RadioError:INTERNAL_ERR
* RadioError:NO_MEMORY
* RadioError:NO_RESOURCES
* RadioError:CANCELLED
* RadioError:SIM_ABSENT
*/
void pullLceDataResponse(in RadioResponseInfo info, in LceDataInfo lceInfo);
/**
* @param info Response info struct containing response type, serial no. and error
*

View File

@@ -20,6 +20,8 @@ import android.hardware.radio.network.RadioAccessSpecifier;
@VintfStability
parcelable NetworkScanRequest {
const int RADIO_ACCESS_SPECIFIER_MAX_SIZE = 8;
const int INCREMENTAL_RESULTS_PREIODICITY_RANGE_MIN = 1;
const int INCREMENTAL_RESULTS_PREIODICITY_RANGE_MAX = 10;
@@ -50,7 +52,7 @@ parcelable NetworkScanRequest {
int interval;
/**
* Networks with bands/channels to scan.
* Maximum length of the vector is RadioConst:RADIO_ACCESS_SPECIFIER_MAX_SIZE.
* Maximum length of the vector is RADIO_ACCESS_SPECIFIER_MAX_SIZE.
*/
RadioAccessSpecifier[] specifiers;
/**

View File

@@ -32,10 +32,11 @@ parcelable RegStateResult {
*/
RegState regState;
/**
* Indicates the available voice radio technology, valid values as defined by RadioTechnology,
* except LTE_CA, which is no longer a valid value on 1.5 or above. When the device is on
* carrier aggregation, vendor RIL service should properly report multiple PhysicalChannelConfig
* elements through IRadioNetwork::currentPhysicalChannelConfigs.
* Indicates the radio technology (except LTE_CA, which is no longer a valid value), which
* must not be UNKNOWN if regState is REG_HOME, REG_ROAMING, NOT_REG_MT_NOT_SEARCHING_OP_EM,
* NOT_REG_MT_SEARCHING_OP_EM, REG_DENIED_EM, or UNKNOWN_EM.
* When the device is on carrier aggregation, vendor RIL service must properly report multiple
* PhysicalChannelConfig elements through IRadioNetwork::currentPhysicalChannelConfigs.
*/
RadioTechnology rat;
/**

View File

@@ -261,17 +261,6 @@ oneway interface IRadioSim {
void requestIccSimAuthentication(
in int serial, in int authContext, in String authData, in String aid);
/**
* Request the ISIM application on the UICC to perform AKA challenge/response algorithm
* for IMS authentication
*
* @param serial Serial number of request.
* @param challenge challenge string in Base64 format
*
* Response function is IRadioSimResponse.requestIsimAuthenticationResponse()
*/
void requestIsimAuthentication(in int serial, in String challenge);
/**
* When response type received from a radio indication or radio response is
* RadioIndicationType:UNSOLICITED_ACK_EXP or RadioResponseType:SOLICITED_ACK_EXP respectively,
@@ -284,11 +273,11 @@ oneway interface IRadioSim {
* The SAT/USAT envelope command refers to 3GPP TS 11.14 and 3GPP TS 31.111
*
* @param serial Serial number of request.
* @param command SAT/USAT command in hexadecimal format string starting with command tag
* @param contents SAT/USAT command in hexadecimal format string starting with command tag
*
* Response function is IRadioSimResponse.sendEnvelopeResponse()
*/
void sendEnvelope(in int serial, in String command);
void sendEnvelope(in int serial, in String contents);
/**
* Requests to send a SAT/USAT envelope command to SIM. The SAT/USAT envelope command refers to
@@ -309,12 +298,12 @@ oneway interface IRadioSim {
* Requests to send a terminal response to SIM for a received proactive command
*
* @param serial Serial number of request.
* @param commandResponse SAT/USAT response in hexadecimal format string starting with
* @param contents SAT/USAT response in hexadecimal format string starting with
* first byte of response data
*
* Response function is IRadioSimResponse.sendTerminalResponseResponseToSim()
*/
void sendTerminalResponseToSim(in int serial, in String commandResponse);
void sendTerminalResponseToSim(in int serial, in String contents);
/**
* Set carrier restrictions. Expected modem behavior:

View File

@@ -363,24 +363,6 @@ oneway interface IRadioSimResponse {
*/
void requestIccSimAuthenticationResponse(in RadioResponseInfo info, in IccIoResult result);
/**
* @param info Response info struct containing response type, serial no. and error
* @param response response string of the challenge/response algo for ISIM auth in base64 format
*
* Valid errors returned:
* RadioError:NONE
* RadioError:RADIO_NOT_AVAILABLE
* RadioError:INTERNAL_ERR
* RadioError:NO_MEMORY
* RadioError:NO_RESOURCES
* RadioError:CANCELLED
* RadioError:INVALID_MODEM_STATE
* RadioError:INVALID_ARGUMENTS
* RadioError:REQUEST_NOT_SUPPORTED
* RadioError:SIM_ABSENT
*/
void requestIsimAuthenticationResponse(in RadioResponseInfo info, in String response);
/**
* @param info Response info struct containing response type, serial no. and error
* @param commandResponse SAT/USAT response in hexadecimal format string starting with first

View File

@@ -25,8 +25,9 @@ package android.hardware.radio.voice;
*/
@VintfStability
parcelable CdmaDisplayInfoRecord {
const int CDMA_ALPHA_INFO_BUFFER_LENGTH = 64;
/**
* Max length = RadioConst:CDMA_ALPHA_INFO_BUFFER_LENGTH
* Max length = CDMA_ALPHA_INFO_BUFFER_LENGTH
*/
String alphaBuf;
}

View File

@@ -25,7 +25,11 @@ import android.hardware.radio.voice.CdmaT53AudioControlInfoRecord;
import android.hardware.radio.voice.CdmaT53ClirInfoRecord;
@VintfStability
/**
* Max length of CdmaInformationRecords[] is CDMA_MAX_NUMBER_OF_INFO_RECS
*/
parcelable CdmaInformationRecord {
const int CDMA_MAX_NUMBER_OF_INFO_RECS = 10;
/**
* Names of the CDMA info records (C.S0005 section 3.7.5)
*/

View File

@@ -1,27 +0,0 @@
/*
* Copyright (C) 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.hardware.radio.voice;
import android.hardware.radio.voice.CdmaInformationRecord;
@VintfStability
parcelable CdmaInformationRecords {
/**
* Max length = RadioConst:CDMA_MAX_NUMBER_OF_INFO_RECS
*/
CdmaInformationRecord[] infoRec;
}

View File

@@ -23,8 +23,9 @@ package android.hardware.radio.voice;
*/
@VintfStability
parcelable CdmaNumberInfoRecord {
const int CDMA_NUMBER_INFO_BUFFER_LENGTH = 81;
/**
* Max length = RadioConst::CDMA_NUMBER_INFO_BUFFER_LENGTH
* Max length = CDMA_NUMBER_INFO_BUFFER_LENGTH
*/
String number;
byte numberType;

View File

@@ -20,9 +20,10 @@ import android.hardware.radio.voice.CallForwardInfo;
@VintfStability
parcelable CfData {
const int NUM_SERVICE_CLASSES = 7;
/**
* This is the response data for SS request to query call forward status.
* See getCallForwardStatus(). Max size = RadioConst:NUM_SERVICE_CLASSES.
* See getCallForwardStatus(). Max size = NUM_SERVICE_CLASSES.
*/
CallForwardInfo[] cfInfo;
}

View File

@@ -18,7 +18,7 @@ package android.hardware.radio.voice;
import android.hardware.radio.RadioIndicationType;
import android.hardware.radio.voice.CdmaCallWaiting;
import android.hardware.radio.voice.CdmaInformationRecords;
import android.hardware.radio.voice.CdmaInformationRecord;
import android.hardware.radio.voice.CdmaOtaProvisionStatus;
import android.hardware.radio.voice.CdmaSignalInfoRecord;
import android.hardware.radio.voice.EmergencyNumber;
@@ -67,9 +67,10 @@ oneway interface IRadioVoiceIndication {
* Indicates when CDMA radio receives one or more info recs.
*
* @param type Type of radio indication
* @param records New Cdma Information
* @param records New CDMA information records.
* Max length is RadioConst:CDMA_MAX_NUMBER_OF_INFO_RECS
*/
void cdmaInfoRec(in RadioIndicationType type, in CdmaInformationRecords records);
void cdmaInfoRec(in RadioIndicationType type, in CdmaInformationRecord[] records);
/**
* Indicates when CDMA radio receives an update of the progress of an OTASP/OTAPA call.

View File

@@ -18,11 +18,12 @@ package android.hardware.radio.voice;
@VintfStability
parcelable SsInfoData {
const int SS_INFO_MAX = 4;
/**
* This is the response data for all of the SS GET/SET Radio requests.
* E.g. IRadioVoice.getClir() returns two ints, so first two values of ssInfo[] will be used for
* response if serviceType is SS_CLIR and requestType is SS_INTERROGATION.
* Max size = RadioConst:SS_INFO_MAX
* Max size = SS_INFO_MAX
*/
int[] ssInfo;
}