Merge "Displaying HD audio indicator for GSM/CDMA calls"

am: 62bd6006e9

Change-Id: I42060d76f3dd12b8fe3fc3275762fbc22ace89c8
This commit is contained in:
Takumi Hori 2018-02-02 00:14:44 +00:00 committed by android-build-merger
commit 68bd6ae440
3 changed files with 51 additions and 0 deletions

View file

@ -19,6 +19,8 @@ hidl_interface {
"android.hidl.base@1.0", "android.hidl.base@1.0",
], ],
types: [ types: [
"AudioQuality",
"Call",
"CardStatus", "CardStatus",
"CellConnectionStatus", "CellConnectionStatus",
"CellIdentityCdma", "CellIdentityCdma",

View file

@ -72,4 +72,20 @@ interface IRadioResponse extends @1.1::IRadioResponse {
* RadioError:INTERNAL_ERR * RadioError:INTERNAL_ERR
*/ */
oneway setLinkCapacityReportingCriteriaResponse(RadioResponseInfo info); oneway setLinkCapacityReportingCriteriaResponse(RadioResponseInfo info);
/**
* @param calls Current call list
*
* Valid errors returned:
* RadioError:NONE
* RadioError:RADIO_NOT_AVAILABLE
* RadioError:NO_MEMORY
* RadioError:INTERNAL_ERR
* RadioError:SYSTEM_ERR
* RadioError:INVALID_ARGUMENTS
* RadioError:REQUEST_NOT_SUPPORTED
* RadioError:NO_RESOURCES
* RadioError:CANCELLED
*/
oneway getCurrentCallsResponse_1_2(RadioResponseInfo info, vec<Call> calls);
}; };

View file

@ -16,6 +16,7 @@
package android.hardware.radio@1.2; package android.hardware.radio@1.2;
import @1.0::Call;
import @1.0::CdmaSignalStrength; import @1.0::CdmaSignalStrength;
import @1.0::CardState; import @1.0::CardState;
import @1.0::CardStatus; import @1.0::CardStatus;
@ -125,6 +126,33 @@ enum IndicationFilter : int32_t {
PHYSICAL_CHANNEL_CONFIG = 1 << 4, PHYSICAL_CHANNEL_CONFIG = 1 << 4,
}; };
/**
* Audio codec which is used on GSM, UMTS, and CDMA. These values must be opaque
* to the Android framework. Only for display.
*/
enum AudioQuality : int32_t {
/** Unspecified audio codec */
UNSPECIFIED,
/** AMR (Narrowband) audio codec */
AMR,
/** AMR (Wideband) audio codec */
AMR_WB,
/** GSM Enhanced Full-Rate audio codec */
GSM_EFR,
/** GSM Full-Rate audio codec */
GSM_FR,
/** GSM Half-Rate audio codec */
GSM_HR,
/** Enhanced Variable rate codec */
EVRC,
/** Enhanced Variable rate codec revision B */
EVRC_B,
/** Enhanced Variable rate codec (Wideband) */
EVRC_WB,
/** Enhanced Variable rate codec (Narrowband) */
EVRC_NW,
};
struct NetworkScanRequest { struct NetworkScanRequest {
ScanType type; ScanType type;
@ -364,3 +392,8 @@ enum DataRequestReason : int32_t {
*/ */
HANDOVER = 0x03, HANDOVER = 0x03,
}; };
struct Call {
@1.0::Call base;
AudioQuality audioQuality;
};