diff options
author | android-build-team Robot | 2018-05-27 02:27:00 -0500 |
---|---|---|
committer | android-build-team Robot | 2018-05-27 02:27:00 -0500 |
commit | 1120f61876e60d7a6655ea29e08a771fdacad2e1 (patch) | |
tree | b79d061eeed31aeb38902c9b63f66553eef9b924 | |
parent | 19131e0f82af2ed99c3eb34d6cb3c52e3dac9393 (diff) | |
parent | a12e7b7847958fd57144ea643fed971543dbf353 (diff) | |
download | platform-hardware-interfaces-1120f61876e60d7a6655ea29e08a771fdacad2e1.tar.gz platform-hardware-interfaces-1120f61876e60d7a6655ea29e08a771fdacad2e1.tar.xz platform-hardware-interfaces-1120f61876e60d7a6655ea29e08a771fdacad2e1.zip |
Snap for 4807121 from a12e7b7847958fd57144ea643fed971543dbf353 to pi-release
Change-Id: I1e83ed6567ab3b3694884f35b3dfa60f85df79f9
-rw-r--r-- | automotive/vehicle/2.0/types.hal | 5 | ||||
-rw-r--r-- | camera/device/3.2/default/CameraDeviceSession.cpp | 25 | ||||
-rw-r--r-- | confirmationui/1.0/default/service.cpp | 1 | ||||
-rw-r--r-- | current.txt | 2 | ||||
-rw-r--r-- | keymaster/4.0/default/service.cpp | 1 | ||||
-rw-r--r-- | media/omx/1.0/vts/functional/audio/media_audio_hidl_test_common.cpp | 45 |
6 files changed, 72 insertions, 7 deletions
diff --git a/automotive/vehicle/2.0/types.hal b/automotive/vehicle/2.0/types.hal index a031ee98..57179dfd 100644 --- a/automotive/vehicle/2.0/types.hal +++ b/automotive/vehicle/2.0/types.hal | |||
@@ -501,7 +501,8 @@ enum VehicleProperty : int32_t { | |||
501 | /** | 501 | /** |
502 | * Tire pressure | 502 | * Tire pressure |
503 | * | 503 | * |
504 | * The min/max range is used to indicate the recommended tire pressure. | 504 | * min/max value indicates tire pressure sensor range. Each tire will have a separate min/max |
505 | * value denoted by its areaConfig.areaId. | ||
505 | * | 506 | * |
506 | * @change_mode VehiclePropertyChangeMode:CONTINUOUS | 507 | * @change_mode VehiclePropertyChangeMode:CONTINUOUS |
507 | * @access VehiclePropertyAccess:READ | 508 | * @access VehiclePropertyAccess:READ |
@@ -510,7 +511,7 @@ enum VehicleProperty : int32_t { | |||
510 | TIRE_PRESSURE = ( | 511 | TIRE_PRESSURE = ( |
511 | 0x0309 | 512 | 0x0309 |
512 | | VehiclePropertyGroup:SYSTEM | 513 | | VehiclePropertyGroup:SYSTEM |
513 | | VehiclePropertyType:MIXED | 514 | | VehiclePropertyType:FLOAT |
514 | | VehicleArea:WHEEL), | 515 | | VehicleArea:WHEEL), |
515 | 516 | ||
516 | /** | 517 | /** |
diff --git a/camera/device/3.2/default/CameraDeviceSession.cpp b/camera/device/3.2/default/CameraDeviceSession.cpp index f33da134..8d002646 100644 --- a/camera/device/3.2/default/CameraDeviceSession.cpp +++ b/camera/device/3.2/default/CameraDeviceSession.cpp | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <android/log.h> | 18 | #include <android/log.h> |
19 | 19 | ||
20 | #include <set> | 20 | #include <set> |
21 | #include <cutils/properties.h> | ||
21 | #include <utils/Trace.h> | 22 | #include <utils/Trace.h> |
22 | #include <hardware/gralloc.h> | 23 | #include <hardware/gralloc.h> |
23 | #include <hardware/gralloc1.h> | 24 | #include <hardware/gralloc1.h> |
@@ -31,9 +32,9 @@ namespace V3_2 { | |||
31 | namespace implementation { | 32 | namespace implementation { |
32 | 33 | ||
33 | // Size of request metadata fast message queue. Change to 0 to always use hwbinder buffer. | 34 | // Size of request metadata fast message queue. Change to 0 to always use hwbinder buffer. |
34 | static constexpr size_t CAMERA_REQUEST_METADATA_QUEUE_SIZE = 1 << 20 /* 1MB */; | 35 | static constexpr int32_t CAMERA_REQUEST_METADATA_QUEUE_SIZE = 1 << 20 /* 1MB */; |
35 | // Size of result metadata fast message queue. Change to 0 to always use hwbinder buffer. | 36 | // Size of result metadata fast message queue. Change to 0 to always use hwbinder buffer. |
36 | static constexpr size_t CAMERA_RESULT_METADATA_QUEUE_SIZE = 1 << 20 /* 1MB */; | 37 | static constexpr int32_t CAMERA_RESULT_METADATA_QUEUE_SIZE = 1 << 20 /* 1MB */; |
37 | 38 | ||
38 | // Metadata sent by HAL will be replaced by a compact copy | 39 | // Metadata sent by HAL will be replaced by a compact copy |
39 | // if their (total size >= compact size + METADATA_SHRINK_ABS_THRESHOLD && | 40 | // if their (total size >= compact size + METADATA_SHRINK_ABS_THRESHOLD && |
@@ -95,14 +96,30 @@ bool CameraDeviceSession::initialize() { | |||
95 | return true; | 96 | return true; |
96 | } | 97 | } |
97 | 98 | ||
99 | int32_t reqFMQSize = property_get_int32("ro.camera.req.fmq.size", /*default*/-1); | ||
100 | if (reqFMQSize < 0) { | ||
101 | reqFMQSize = CAMERA_REQUEST_METADATA_QUEUE_SIZE; | ||
102 | } else { | ||
103 | ALOGV("%s: request FMQ size overridden to %d", __FUNCTION__, reqFMQSize); | ||
104 | } | ||
105 | |||
98 | mRequestMetadataQueue = std::make_unique<RequestMetadataQueue>( | 106 | mRequestMetadataQueue = std::make_unique<RequestMetadataQueue>( |
99 | CAMERA_REQUEST_METADATA_QUEUE_SIZE, false /* non blocking */); | 107 | static_cast<size_t>(reqFMQSize), |
108 | false /* non blocking */); | ||
100 | if (!mRequestMetadataQueue->isValid()) { | 109 | if (!mRequestMetadataQueue->isValid()) { |
101 | ALOGE("%s: invalid request fmq", __FUNCTION__); | 110 | ALOGE("%s: invalid request fmq", __FUNCTION__); |
102 | return true; | 111 | return true; |
103 | } | 112 | } |
113 | |||
114 | int32_t resFMQSize = property_get_int32("ro.camera.res.fmq.size", /*default*/-1); | ||
115 | if (resFMQSize < 0) { | ||
116 | resFMQSize = CAMERA_RESULT_METADATA_QUEUE_SIZE; | ||
117 | } else { | ||
118 | ALOGV("%s: result FMQ size overridden to %d", __FUNCTION__, resFMQSize); | ||
119 | } | ||
104 | mResultMetadataQueue = std::make_shared<RequestMetadataQueue>( | 120 | mResultMetadataQueue = std::make_shared<RequestMetadataQueue>( |
105 | CAMERA_RESULT_METADATA_QUEUE_SIZE, false /* non blocking */); | 121 | static_cast<size_t>(resFMQSize), |
122 | false /* non blocking */); | ||
106 | if (!mResultMetadataQueue->isValid()) { | 123 | if (!mResultMetadataQueue->isValid()) { |
107 | ALOGE("%s: invalid result fmq", __FUNCTION__); | 124 | ALOGE("%s: invalid result fmq", __FUNCTION__); |
108 | return true; | 125 | return true; |
diff --git a/confirmationui/1.0/default/service.cpp b/confirmationui/1.0/default/service.cpp index 58ec66ab..39f3f62b 100644 --- a/confirmationui/1.0/default/service.cpp +++ b/confirmationui/1.0/default/service.cpp | |||
@@ -27,6 +27,7 @@ using android::hardware::joinRpcThreadpool; | |||
27 | using android::hardware::confirmationui::V1_0::implementation::ConfirmationUI; | 27 | using android::hardware::confirmationui::V1_0::implementation::ConfirmationUI; |
28 | 28 | ||
29 | int main() { | 29 | int main() { |
30 | ::android::hardware::configureRpcThreadpool(1, true /*willJoinThreadpool*/); | ||
30 | auto confirmationui = new ConfirmationUI(); | 31 | auto confirmationui = new ConfirmationUI(); |
31 | auto status = confirmationui->registerAsService(); | 32 | auto status = confirmationui->registerAsService(); |
32 | if (status != android::OK) { | 33 | if (status != android::OK) { |
diff --git a/current.txt b/current.txt index 15b096b3..f45af273 100644 --- a/current.txt +++ b/current.txt | |||
@@ -311,7 +311,7 @@ f2904a4c108ad1b93eb2fa4e43b82bd01ce1ff26156316e49d1d9fc80dfecaad android.hardwar | |||
311 | 3b17c1fdfc389e0abe626c37054954b07201127d890c2bc05d47613ec1f4de4f android.hardware.automotive.evs@1.0::types | 311 | 3b17c1fdfc389e0abe626c37054954b07201127d890c2bc05d47613ec1f4de4f android.hardware.automotive.evs@1.0::types |
312 | b3caf524c46a47d67e6453a34419e1881942d059e146cda740502670e9a752c3 android.hardware.automotive.vehicle@2.0::IVehicle | 312 | b3caf524c46a47d67e6453a34419e1881942d059e146cda740502670e9a752c3 android.hardware.automotive.vehicle@2.0::IVehicle |
313 | 7ce8728b27600e840cacf0a832f6942819fe535f9d3797ae052d5eef5065921c android.hardware.automotive.vehicle@2.0::IVehicleCallback | 313 | 7ce8728b27600e840cacf0a832f6942819fe535f9d3797ae052d5eef5065921c android.hardware.automotive.vehicle@2.0::IVehicleCallback |
314 | 3562503f550f70eec7a688343a600fb92b74efb807a31452b70195dfab328b22 android.hardware.automotive.vehicle@2.0::types | 314 | 06fa7218fb1500acca69b265a7e697b885933f7146cd6e8d83fe6c1fa06ce876 android.hardware.automotive.vehicle@2.0::types |
315 | 32cc50cc2a7658ec613c0c2dd2accbf6a05113b749852879e818b8b7b438db19 android.hardware.bluetooth.a2dp@1.0::IBluetoothAudioHost | 315 | 32cc50cc2a7658ec613c0c2dd2accbf6a05113b749852879e818b8b7b438db19 android.hardware.bluetooth.a2dp@1.0::IBluetoothAudioHost |
316 | ff4be64d7992f8bec97dff37f35450e79b3430c61f85f54322ce45bef229dc3b android.hardware.bluetooth.a2dp@1.0::IBluetoothAudioOffload | 316 | ff4be64d7992f8bec97dff37f35450e79b3430c61f85f54322ce45bef229dc3b android.hardware.bluetooth.a2dp@1.0::IBluetoothAudioOffload |
317 | 27f22d2e873e6201f9620cf4d8e2facb25bd0dd30a2b911e441b4600d560fa62 android.hardware.bluetooth.a2dp@1.0::types | 317 | 27f22d2e873e6201f9620cf4d8e2facb25bd0dd30a2b911e441b4600d560fa62 android.hardware.bluetooth.a2dp@1.0::types |
diff --git a/keymaster/4.0/default/service.cpp b/keymaster/4.0/default/service.cpp index cfb960a5..fdcc6ba9 100644 --- a/keymaster/4.0/default/service.cpp +++ b/keymaster/4.0/default/service.cpp | |||
@@ -24,6 +24,7 @@ | |||
24 | using android::hardware::keymaster::V4_0::SecurityLevel; | 24 | using android::hardware::keymaster::V4_0::SecurityLevel; |
25 | 25 | ||
26 | int main() { | 26 | int main() { |
27 | ::android::hardware::configureRpcThreadpool(1, true /* willJoinThreadpool */); | ||
27 | auto keymaster = ::keymaster::V4_0::ng::CreateKeymasterDevice(SecurityLevel::SOFTWARE); | 28 | auto keymaster = ::keymaster::V4_0::ng::CreateKeymasterDevice(SecurityLevel::SOFTWARE); |
28 | auto status = keymaster->registerAsService(); | 29 | auto status = keymaster->registerAsService(); |
29 | if (status != android::OK) { | 30 | if (status != android::OK) { |
diff --git a/media/omx/1.0/vts/functional/audio/media_audio_hidl_test_common.cpp b/media/omx/1.0/vts/functional/audio/media_audio_hidl_test_common.cpp index 9500094d..e7ae0830 100644 --- a/media/omx/1.0/vts/functional/audio/media_audio_hidl_test_common.cpp +++ b/media/omx/1.0/vts/functional/audio/media_audio_hidl_test_common.cpp | |||
@@ -94,6 +94,51 @@ void setupPCMPort(sp<IOmxNode> omxNode, OMX_U32 portIndex, int32_t nChannels, | |||
94 | param.eChannelMapping[0] = OMX_AUDIO_ChannelLF; | 94 | param.eChannelMapping[0] = OMX_AUDIO_ChannelLF; |
95 | param.eChannelMapping[1] = OMX_AUDIO_ChannelRF; | 95 | param.eChannelMapping[1] = OMX_AUDIO_ChannelRF; |
96 | break; | 96 | break; |
97 | case 3: | ||
98 | param.eChannelMapping[0] = OMX_AUDIO_ChannelLF; | ||
99 | param.eChannelMapping[1] = OMX_AUDIO_ChannelRF; | ||
100 | param.eChannelMapping[2] = OMX_AUDIO_ChannelCF; | ||
101 | break; | ||
102 | case 4: | ||
103 | param.eChannelMapping[0] = OMX_AUDIO_ChannelLF; | ||
104 | param.eChannelMapping[1] = OMX_AUDIO_ChannelRF; | ||
105 | param.eChannelMapping[2] = OMX_AUDIO_ChannelLR; | ||
106 | param.eChannelMapping[3] = OMX_AUDIO_ChannelRR; | ||
107 | break; | ||
108 | case 5: | ||
109 | param.eChannelMapping[0] = OMX_AUDIO_ChannelLF; | ||
110 | param.eChannelMapping[1] = OMX_AUDIO_ChannelRF; | ||
111 | param.eChannelMapping[2] = OMX_AUDIO_ChannelCF; | ||
112 | param.eChannelMapping[3] = OMX_AUDIO_ChannelLR; | ||
113 | param.eChannelMapping[4] = OMX_AUDIO_ChannelRR; | ||
114 | break; | ||
115 | case 6: | ||
116 | param.eChannelMapping[0] = OMX_AUDIO_ChannelLF; | ||
117 | param.eChannelMapping[1] = OMX_AUDIO_ChannelRF; | ||
118 | param.eChannelMapping[2] = OMX_AUDIO_ChannelCF; | ||
119 | param.eChannelMapping[3] = OMX_AUDIO_ChannelLFE; | ||
120 | param.eChannelMapping[4] = OMX_AUDIO_ChannelLR; | ||
121 | param.eChannelMapping[5] = OMX_AUDIO_ChannelRR; | ||
122 | break; | ||
123 | case 7: | ||
124 | param.eChannelMapping[0] = OMX_AUDIO_ChannelLF; | ||
125 | param.eChannelMapping[1] = OMX_AUDIO_ChannelRF; | ||
126 | param.eChannelMapping[2] = OMX_AUDIO_ChannelCF; | ||
127 | param.eChannelMapping[3] = OMX_AUDIO_ChannelLFE; | ||
128 | param.eChannelMapping[4] = OMX_AUDIO_ChannelLR; | ||
129 | param.eChannelMapping[5] = OMX_AUDIO_ChannelRR; | ||
130 | param.eChannelMapping[6] = OMX_AUDIO_ChannelCS; | ||
131 | break; | ||
132 | case 8: | ||
133 | param.eChannelMapping[0] = OMX_AUDIO_ChannelLF; | ||
134 | param.eChannelMapping[1] = OMX_AUDIO_ChannelRF; | ||
135 | param.eChannelMapping[2] = OMX_AUDIO_ChannelCF; | ||
136 | param.eChannelMapping[3] = OMX_AUDIO_ChannelLFE; | ||
137 | param.eChannelMapping[4] = OMX_AUDIO_ChannelLR; | ||
138 | param.eChannelMapping[5] = OMX_AUDIO_ChannelRR; | ||
139 | param.eChannelMapping[6] = OMX_AUDIO_ChannelLS; | ||
140 | param.eChannelMapping[7] = OMX_AUDIO_ChannelRS; | ||
141 | break; | ||
97 | default: | 142 | default: |
98 | EXPECT_TRUE(false); | 143 | EXPECT_TRUE(false); |
99 | } | 144 | } |