Merge "Update comments for doc comments." into pi-dev am: cce4c95c1c

am: cbc30e1f58

Change-Id: I9f7d33cdd3c40e28c0341df2e8a8bd298ec52b79
This commit is contained in:
Steven Moreland
2018-05-18 18:55:50 -07:00
committed by android-build-merger
15 changed files with 68 additions and 59 deletions

View File

@@ -184,9 +184,9 @@ struct AudioMicrophoneCoordinate {
* Simple processing as constant gain adjustment must be DIRECT.
*/
enum AudioMicrophoneChannelMapping : uint32_t {
UNUSED = 0, /** Channel not used */
DIRECT = 1, /** Channel used and signal not processed */
PROCESSED = 2, /** Channel used and signal has some process */
UNUSED = 0, /* Channel not used */
DIRECT = 1, /* Channel used and signal not processed */
PROCESSED = 2, /* Channel used and signal has some process */
};
/**

View File

@@ -136,7 +136,8 @@ struct Properties {
uint32_t numAudioSources;
/** the hardware supports capture of audio source from audio HAL */
bool supportsCapture;
vec<BandConfig> bands; /** band descriptors */
/** band descriptors */
vec<BandConfig> bands;
};
enum MetadataType : int32_t {
@@ -229,6 +230,7 @@ struct ProgramInfo {
*/
uint32_t signalStrength;
vec<MetaData> metadata; /** Metadata: PTY, song title etc. */
/** Metadata: PTY, song title etc. */
vec<MetaData> metadata;
};

View File

@@ -250,6 +250,7 @@ f4945e397b5dea41bb64518dfde59be71245d8a125fd1e0acffeb57ac7b08fed android.hardwar
c8bc853546dd55584611def2a9fa1d99f657e3366c976d2f60fe6b8aa6d2cb87 android.hardware.thermal@1.1::IThermalCallback
# ABI preserving changes to HALs during Android P
9e7a0b650d0e461ece2cfec0e1072abf8676f592b41a7fb48f01e88fc3c8f780 android.hardware.broadcastradio@1.0::types
eaeb3e4f3237430a7fdc206bffdf844713f5682990b2d49ea24392e15b5d343f android.hardware.broadcastradio@2.0::ITunerCallback
2804120c1f8522ad15feb7695fe5eece527d399b406c671ea99618194118c316 android.hardware.broadcastradio@2.0::types
cf72ff5a52bfa4d08e9e1000cf3ab5952a2d280c7f13cdad5ab7905c08050766 android.hardware.camera.metadata@3.2::types
@@ -258,10 +259,21 @@ cf72ff5a52bfa4d08e9e1000cf3ab5952a2d280c7f13cdad5ab7905c08050766 android.hardwar
fb92e2b40f8e9d494e8fd3b4ac18499a3216342e7cff160714c3bbf3660b6e79 android.hardware.gnss@1.0::IGnssConfiguration
251594ea9b27447bfa005ebd806e58fb0ae4aad84a69938129c9800ec0c64eda android.hardware.gnss@1.0::IGnssMeasurementCallback
4e7169919d24fbe5573e5bcd683d0bd7abf553a4e6c34c41f9dfc1e12050db07 android.hardware.gnss@1.0::IGnssNavigationMessageCallback
190ea4898809de6cf379afe318f5fa9564686157b24d9a2d7f5698b0c977d8b2 android.hardware.graphics.bufferqueue@1.0::IGraphicBufferProducer
25892789b50eb673506b6c5a2cdab5d9aa428d41608aab10280cc898538b524a android.hardware.graphics.composer@2.1::IComposerClient
e205dd30f5ff99445b706a901de8ebc46c379e9d7c1921d6a327ed2082cfa83d android.hardware.graphics.composer@2.1::types
a46251718abfada458dc64c41ce94915757bf6c87cfa2d9e99cfb01fa8e32331 android.hardware.graphics.mapper@2.0::IMapper
bd33ac23c57b4a07632691d2191bc2c93930f57e62f4ccf459748fdaa5c0f480 android.hardware.graphics.mapper@2.0::types
ad8a28ca3a5549fb9bc24cf5f80ac8f660cc27be885210d76266780aa52ddb8d android.hardware.keymaster@3.0::types
5804ca86611d72e5481f022b3a0c1b334217f2e4988dad25730c42af2d1f4d1c android.hardware.neuralnetworks@1.0::IDevice
12e8dca4ab7d8aadd0ef8f1b438021938e2396139e85db2ed65783b08800aa52 android.hardware.neuralnetworks@1.0::IExecutionCallback
18e6885e184fe48401c2c53f1d1b8bfb07240f40c81ae6b9d2e336fca6efdbb7 android.hardware.neuralnetworks@1.0::types
d4840db8efabdf1e4b344fc981cd36e5fe81a39aff6e199f6d06c1c8da413efd android.hardware.radio@1.0::types
f96cbc59dfe16c8d0c2a7e06db24d8738a6328b6e90f7b8e1640ea2b4600debd android.hardware.radio@1.1::ISap
2d86929794795e5c70f4fdb5073485fd05835c9c6f496116687c3d9f32e6df3e android.hardware.radio@1.2::ISap
905a4af79c8329b39d8b11b08f015137216bb078b427b6986f32884a04bc1bec android.hardware.tv.cec@1.0::types
aebcd9ff2da05c9d4c439916f40dfd219ba7629919007cb981ebf150064b4f82 android.hardware.usb@1.1::IUsb
e29fb1941b40a990676f8e9c676a38761defd890b81a9c034608eb7ba6496023 android.hardware.wifi@1.0::IWifiP2pIface
b280c4704dfcc548a9bf127b59b7c3578f460c50cce70a06b66fe0df8b27cff0 android.hardware.wifi@1.0::types
# HALs released in Android P
@@ -272,7 +284,7 @@ be3dc9baed45a0d330152eca3ca24fa419b375b20a41644c88d4fb46b72784d2 android.hardwar
d5de64e66b95f135dd42492250a309134b8227203ef3524440798c66b6f5a392 android.hardware.audio@4.0::IStreamIn
888ac906461327fa0bd93854d5109be8c292a33afdb467164826970a8bd5b789 android.hardware.audio@4.0::IStreamOut
15f6ae78e73344c8e7d68847ef03caec64fcd9f951bbcf59957d1712c247fcff android.hardware.audio@4.0::IStreamOutCallback
e8abfc73b7f3c2095ea4fad83b5f42bced4315de2abcc3199376af880dac451b android.hardware.audio@4.0::types
61f0eaa4d08547d039e9b1dd7c82abe2c004286d1b9b8153c2491ff46a8a63ca android.hardware.audio@4.0::types
5d47a2ad2c136b8aba067dd45bb10d0ad390dd76340764154f580658f98f4fe6 android.hardware.audio.common@4.0::types
b04b6b364938b80008e61fa2e318bc299622433e57c2e1f6cfba332a3f6e3f15 android.hardware.audio.effect@4.0::IAcousticEchoCancelerEffect
1c17d4ece5c8ba3f7a646a305ee0dd109b0d51372e1bd585812e513cd40e1852 android.hardware.audio.effect@4.0::IAutomaticGainControlEffect
@@ -326,6 +338,7 @@ a830336ac8627d6432cfafb1b884343ad9f885dee0a5323e380e6d3c519156b8 android.hardwar
1a07d1383e847c3deb696ec7a2c9e33b9683772945660448a010b18063da67a4 android.hardware.gnss@1.1::IGnssMeasurement
83e7a10ff3702147bd7ffa04567b20d407a3b16bbb7705644af44d919afe9103 android.hardware.gnss@1.1::IGnssMeasurementCallback
0b96e0254e2168cfecb30c1ed5fb42681652cc00faa68c6e07568fafe64d1d50 android.hardware.graphics.common@1.1::types
7d2cef99c838fb58038de8bbfd3cdb76ff4797241987077721715297f8d45e34 android.hardware.graphics.common@1.1::types # b/78135149
d9b40a5b09962a5a0780b10fe33a4e607e69e2e088fc83de88a584115b7cb1c0 android.hardware.graphics.composer@2.2::IComposer
e7717f2ff2f6db43b24370ff08e14cd353da3004b32b17740e4a7ed4894b7e45 android.hardware.graphics.composer@2.2::IComposerClient
dd83be076b6b3f10ed62ab34d8c8b95f2415961fb785200eb842e7bfb2b0ee92 android.hardware.graphics.mapper@2.1::IMapper

View File

@@ -546,7 +546,7 @@ interface IGraphicBufferProducer {
*/
disconnect(
int32_t api,
DisconnectMode mode /** = DisconnectMode::API */
DisconnectMode mode /* = DisconnectMode::API */
) generates (
Status status
);

View File

@@ -124,7 +124,7 @@ enum BufferUsage : @1.0::BufferUsage {
/** buffer contains a complete mipmap hierarchy */
GPU_MIPMAP_COMPLETE = 1ULL << 26,
/** bits 27 and 32-47 must be zero and are reserved for future versions */
/* bits 27 and 32-47 must be zero and are reserved for future versions */
};
@export(name="android_dataspace_v1_1_t", value_prefix="HAL_DATASPACE_",

View File

@@ -1138,7 +1138,7 @@ interface IComposerClient {
SET_LAYER_Z_ORDER = 0x40a << OPCODE_SHIFT,
SET_PRESENT_OR_VALIDATE_DISPLAY_RESULT = 0x40b << OPCODE_SHIFT,
/** 0x800 - 0xfff are reserved for vendor extensions */
/** 0x1000 - 0xffff are reserved */
/* 0x800 - 0xfff are reserved for vendor extensions */
/* 0x1000 - 0xffff are reserved */
};
};

View File

@@ -18,15 +18,15 @@ package android.hardware.graphics.composer@2.1;
/** Return codes from all functions. */
enum Error : int32_t {
NONE = 0, /** no error */
BAD_CONFIG = 1, /** invalid Config */
BAD_DISPLAY = 2, /** invalid Display */
BAD_LAYER = 3, /** invalid Layer */
BAD_PARAMETER = 4, /** invalid width, height, etc. */
/** 5 is reserved */
NO_RESOURCES = 6, /** temporary failure due to resource contention */
NOT_VALIDATED = 7, /** validateDisplay has not been called */
UNSUPPORTED = 8, /** permanent failure */
NONE = 0, /* no error */
BAD_CONFIG = 1, /* invalid Config */
BAD_DISPLAY = 2, /* invalid Display */
BAD_LAYER = 3, /* invalid Layer */
BAD_PARAMETER = 4, /* invalid width, height, etc. */
/* 5 is reserved */
NO_RESOURCES = 6, /* temporary failure due to resource contention */
NOT_VALIDATED = 7, /* validateDisplay has not been called */
UNSUPPORTED = 8, /* permanent failure */
};
typedef uint32_t Config;

View File

@@ -155,7 +155,7 @@ interface IMapper {
* @param cpuUsage specifies one or more CPU usage flags to request.
* @param accessRegion is the portion of the buffer that the client
* intends to access.
* @param acquireFence, when non-empty, is a handle containing a file
* @param acquireFence when non-empty, is a handle containing a file
* descriptor referring to a sync fence object, which will be
* signaled when it is safe for the mapper to lock the buffer. If
* it is already safe to lock, acquireFence is empty.
@@ -191,7 +191,7 @@ interface IMapper {
* @param cpuUsage specifies one or more CPU usage flags to request.
* @param accessRegion is the portion of the buffer that the client
* intends to access.
* @param acquireFence, when non-empty, is a handle containing a file
* @param acquireFence when non-empty, is a handle containing a file
* descriptor referring to a sync fence object, which will be
* signaled when it is safe for the mapper to lock the buffer. If
* it is already safe to lock, acquireFence is empty.

View File

@@ -17,14 +17,14 @@
package android.hardware.graphics.mapper@2.0;
enum Error : int32_t {
NONE = 0, /** no error */
BAD_DESCRIPTOR = 1, /** invalid BufferDescriptor */
BAD_BUFFER = 2, /** invalid buffer handle */
BAD_VALUE = 3, /** invalid width, height, etc. */
NONE = 0, /* no error */
BAD_DESCRIPTOR = 1, /* invalid BufferDescriptor */
BAD_BUFFER = 2, /* invalid buffer handle */
BAD_VALUE = 3, /* invalid width, height, etc. */
/* 4 is reserved */
NO_RESOURCES = 5, /** temporary failure due to resource contention */
NO_RESOURCES = 5, /* temporary failure due to resource contention */
/* 6 is reserved */
UNSUPPORTED = 7, /** permanent failure */
UNSUPPORTED = 7, /* permanent failure */
};
/**

View File

@@ -17,17 +17,17 @@
package android.hardware.keymaster@3.0;
enum TagType : uint32_t {
INVALID = 0 << 28, /** Invalid type, used to designate a tag as uninitialized */
INVALID = 0 << 28, /* Invalid type, used to designate a tag as uninitialized */
ENUM = 1 << 28,
ENUM_REP = 2 << 28, /** Repeatable enumeration value. */
ENUM_REP = 2 << 28, /* Repeatable enumeration value. */
UINT = 3 << 28,
UINT_REP = 4 << 28, /** Repeatable integer value */
UINT_REP = 4 << 28, /* Repeatable integer value */
ULONG = 5 << 28,
DATE = 6 << 28,
BOOL = 7 << 28,
BIGNUM = 8 << 28,
BYTES = 9 << 28,
ULONG_REP = 10 << 28, /** Repeatable long value */
ULONG_REP = 10 << 28, /* Repeatable long value */
};
enum Tag : uint32_t {
@@ -254,12 +254,12 @@ enum KeyBlobUsageRequirements : uint32_t {
* Possible purposes of a key (or pair).
*/
enum KeyPurpose : uint32_t {
ENCRYPT = 0, /** Usable with RSA, EC and AES keys. */
DECRYPT = 1, /** Usable with RSA, EC and AES keys. */
SIGN = 2, /** Usable with RSA, EC and HMAC keys. */
VERIFY = 3, /** Usable with RSA, EC and HMAC keys. */
DERIVE_KEY = 4, /** Usable with EC keys. */
WRAP_KEY = 5, /** Usable with wrapping keys. */
ENCRYPT = 0, /* Usable with RSA, EC and AES keys. */
DECRYPT = 1, /* Usable with RSA, EC and AES keys. */
SIGN = 2, /* Usable with RSA, EC and HMAC keys. */
VERIFY = 3, /* Usable with RSA, EC and HMAC keys. */
DERIVE_KEY = 4, /* Usable with EC keys. */
WRAP_KEY = 5, /* Usable with wrapping keys. */
};
/**

View File

@@ -18,8 +18,7 @@ package android.hardware.radio@1.1;
import @1.0::ISap;
interface ISap extends @1.0::ISap {
/**
* Empty top level interface.
*/
};
/**
* Empty top level interface.
*/
interface ISap extends @1.0::ISap {};

View File

@@ -18,8 +18,7 @@ package android.hardware.radio@1.2;
import @1.1::ISap;
interface ISap extends @1.1::ISap {
/**
* Empty top level interface.
*/
};
/**
* Empty top level interface.
*/
interface ISap extends @1.1::ISap {};

View File

@@ -193,7 +193,7 @@ enum OptionKey : int32_t {
*/
SYSTEM_CEC_CONTROL = 3,
/** Option 4 not used */
/* Option 4 not used */
};
struct CecMessage {

View File

@@ -18,11 +18,9 @@ package android.hardware.usb@1.1;
import android.hardware.usb@1.0;
interface IUsb extends android.hardware.usb@1.0::IUsb {
/**
* The setCallback function in V1_0 is used to register the V1_1
* IUsbCallback object as well. The implementation can use the
* castFrom method to cast the IUsbCallback object.
*/
};
/*
* The setCallback function in V1_0 is used to register the V1_1
* IUsbCallback object as well. The implementation can use the
* castFrom method to cast the IUsbCallback object.
*/
interface IUsb extends android.hardware.usb@1.0::IUsb {};

View File

@@ -21,6 +21,4 @@ import IWifiIface;
/**
* Interface used to represent a single NAN iface.
*/
interface IWifiP2pIface extends IWifiIface {
/** TODO(rpius): Add methods to the interface. */
};
interface IWifiP2pIface extends IWifiIface {};