Merge "media: Update IGraphicBufferSource interface for the timestamp support."
diff --git a/CleanSpec.mk b/CleanSpec.mk
new file mode 100644
index 0000000..962f6cd
--- /dev/null
+++ b/CleanSpec.mk
@@ -0,0 +1,50 @@
+# Copyright 2017 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.
+#
+
+# If you don't need to do a full clean build but would like to touch
+# a file or delete some intermediate files, add a clean step to the end
+# of the list. These steps will only be run once, if they haven't been
+# run before.
+#
+# E.g.:
+# $(call add-clean-step, touch -c external/sqlite/sqlite3.h)
+# $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)
+#
+# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with
+# files that are missing or have been moved.
+#
+# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.
+# Use $(OUT_DIR) to refer to the "out" directory.
+#
+# If you need to re-do something that's already mentioned, just copy
+# the command and add it to the bottom of the list. E.g., if a change
+# that you made last week required touching a file and a change you
+# made today requires touching the same file, just copy the old
+# touch step and add it to the end of the list.
+#
+# ************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
+# ************************************************
+
+# For example:
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
+#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
+#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
+
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/hw/android.hardware*)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/hw/android.hardware*)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib64/hw/android.hardware*)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/init/android.hardware*)
diff --git a/audio/2.0/Android.bp b/audio/2.0/Android.bp
index 2f0c936..69ff791 100644
--- a/audio/2.0/Android.bp
+++ b/audio/2.0/Android.bp
@@ -1,9 +1,7 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
-genrule {
- name: "android.hardware.audio@2.0_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio@2.0",
+filegroup {
+ name: "android.hardware.audio@2.0_hal",
srcs: [
"types.hal",
"IDevice.hal",
@@ -14,6 +12,15 @@
"IStreamOut.hal",
"IStreamOutCallback.hal",
],
+}
+
+genrule {
+ name: "android.hardware.audio@2.0_genc++",
+ tools: ["hidl-gen"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio@2.0",
+ srcs: [
+ ":android.hardware.audio@2.0_hal",
+ ],
out: [
"android/hardware/audio/2.0/types.cpp",
"android/hardware/audio/2.0/DeviceAll.cpp",
@@ -31,14 +38,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio@2.0",
srcs: [
- "types.hal",
- "IDevice.hal",
- "IDevicesFactory.hal",
- "IPrimaryDevice.hal",
- "IStream.hal",
- "IStreamIn.hal",
- "IStreamOut.hal",
- "IStreamOutCallback.hal",
+ ":android.hardware.audio@2.0_hal",
],
out: [
"android/hardware/audio/2.0/types.h",
diff --git a/audio/2.0/Android.mk b/audio/2.0/Android.mk
index f8767ec..e989364 100644
--- a/audio/2.0/Android.mk
+++ b/audio/2.0/Android.mk
@@ -8,7 +8,7 @@
LOCAL_MODULE := android.hardware.audio@2.0-java-constants
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
#
diff --git a/audio/2.0/IStreamIn.hal b/audio/2.0/IStreamIn.hal
index 9a96f71..6f1f9df 100644
--- a/audio/2.0/IStreamIn.hal
+++ b/audio/2.0/IStreamIn.hal
@@ -41,6 +41,26 @@
setGain(float gain) generates (Result retval);
/*
+ * Commands that can be executed on the driver reader thread.
+ */
+ enum ReadCommand : int32_t {
+ READ,
+ GET_CAPTURE_POSITION
+ };
+
+ /*
+ * Data structure passed to the driver for executing commands
+ * on the driver reader thread.
+ */
+ struct ReadParameters {
+ ReadCommand command; // discriminator
+ union Params {
+ uint64_t read; // READ command, amount of bytes to read, >= 0.
+ // No parameters for GET_CAPTURE_POSITION.
+ } params;
+ };
+
+ /*
* Data structure passed back to the client via status message queue
* of 'read' operation.
*
@@ -51,35 +71,53 @@
*/
struct ReadStatus {
Result retval;
- uint64_t read;
+ ReadCommand replyTo; // discriminator
+ union Reply {
+ uint64_t read; // READ command, amount of bytes read, >= 0.
+ struct CapturePosition { // same as generated by getCapturePosition.
+ uint64_t frames;
+ uint64_t time;
+ } capturePosition;
+ } reply;
};
/*
* Set up required transports for receiving audio buffers from the driver.
*
- * The transport consists of two message queues: one is used for passing
- * audio data from the driver to the client, another is used for reporting
- * read operation status (amount of bytes actually read or error code),
- * see ReadStatus structure definition.
+ * The transport consists of three message queues:
+ * -- command queue is used to instruct the reader thread what operation
+ * to perform;
+ * -- data queue is used for passing audio data from the driver
+ * to the client;
+ * -- status queue is used for reporting operation status
+ * (e.g. amount of bytes actually read or error code).
+ *
+ * The driver operates on a dedicated thread. The client must ensure that
+ * the thread is given an appropriate priority and assigned to correct
+ * scheduler and cgroup. For this purpose, the method returns identifiers
+ * of the driver thread.
*
* @param frameSize the size of a single frame, in bytes.
* @param framesCount the number of frames in a buffer.
- * @param threadPriority priority of the thread that performs reads.
+ * @param threadPriority priority of the driver thread.
* @return retval OK if both message queues were created successfully.
* INVALID_STATE if the method was already called.
* INVALID_ARGUMENTS if there was a problem setting up
* the queues.
+ * @return commandMQ a message queue used for passing commands.
* @return dataMQ a message queue used for passing audio data in the format
* specified at the stream opening.
* @return statusMQ a message queue used for passing status from the driver
* using ReadStatus structures.
+ * @return threadInfo identifiers of the driver's dedicated thread.
*/
- prepareForReading(
- uint32_t frameSize, uint32_t framesCount,
- ThreadPriority threadPriority)
+ prepareForReading(uint32_t frameSize, uint32_t framesCount)
generates (
Result retval,
- fmq_sync<uint8_t> dataMQ, fmq_sync<ReadStatus> statusMQ);
+ fmq_sync<ReadParameters> commandMQ,
+ fmq_sync<uint8_t> dataMQ,
+ fmq_sync<ReadStatus> statusMQ,
+ ThreadInfo threadInfo);
/*
* Return the amount of input frames lost in the audio driver since the last
diff --git a/audio/2.0/IStreamOut.hal b/audio/2.0/IStreamOut.hal
index 336684f..9ee32c5 100644
--- a/audio/2.0/IStreamOut.hal
+++ b/audio/2.0/IStreamOut.hal
@@ -44,55 +44,73 @@
setVolume(float left, float right) generates (Result retval);
/*
+ * Commands that can be executed on the driver writer thread.
+ */
+ enum WriteCommand : int32_t {
+ WRITE,
+ GET_PRESENTATION_POSITION,
+ GET_LATENCY
+ };
+
+ /*
* Data structure passed back to the client via status message queue
* of 'write' operation.
*
- * Possible values of 'writeRetval' field:
+ * Possible values of 'retval' field:
* - OK, write operation was successful;
* - INVALID_ARGUMENTS, stream was not configured properly;
- * - INVALID_STATE, stream is in a state that doesn't allow writes.
- *
- * Possible values of 'presentationPositionRetval' field (must only
- * be considered if 'writeRetval' field is set to 'OK'):
- * - OK, presentation position retrieved successfully;
- * - INVALID_ARGUMENTS, indicates that the position can't be retrieved;
- * - INVALID_OPERATION, retrieving presentation position isn't supported;
+ * - INVALID_STATE, stream is in a state that doesn't allow writes;
+ * - INVALID_OPERATION, retrieving presentation position isn't supported.
*/
struct WriteStatus {
- Result writeRetval;
- uint64_t written;
- Result presentationPositionRetval;
- uint64_t frames; // presentation position
- TimeSpec timeStamp; // presentation position
+ Result retval;
+ WriteCommand replyTo; // discriminator
+ union Reply {
+ uint64_t written; // WRITE command, amount of bytes written, >= 0.
+ struct PresentationPosition { // same as generated by
+ uint64_t frames; // getPresentationPosition.
+ TimeSpec timeStamp;
+ } presentationPosition;
+ uint32_t latencyMs; // Same as generated by getLatency.
+ } reply;
};
/*
* Set up required transports for passing audio buffers to the driver.
*
- * The transport consists of two message queues: one is used for passing
- * audio data from the client to the driver, another is used for reporting
- * write operation status (amount of bytes actually written or error code),
- * and the presentation position immediately after the write, see
- * WriteStatus structure definition.
+ * The transport consists of three message queues:
+ * -- command queue is used to instruct the writer thread what operation
+ * to perform;
+ * -- data queue is used for passing audio data from the client
+ * to the driver;
+ * -- status queue is used for reporting operation status
+ * (e.g. amount of bytes actually written or error code).
+ *
+ * The driver operates on a dedicated thread. The client must ensure that
+ * the thread is given an appropriate priority and assigned to correct
+ * scheduler and cgroup. For this purpose, the method returns identifiers
+ * of the driver thread.
*
* @param frameSize the size of a single frame, in bytes.
* @param framesCount the number of frames in a buffer.
- * @param threadPriority priority of the thread that performs writes.
* @return retval OK if both message queues were created successfully.
* INVALID_STATE if the method was already called.
* INVALID_ARGUMENTS if there was a problem setting up
* the queues.
+ * @return commandMQ a message queue used for passing commands.
* @return dataMQ a message queue used for passing audio data in the format
* specified at the stream opening.
* @return statusMQ a message queue used for passing status from the driver
* using WriteStatus structures.
+ * @return threadInfo identifiers of the driver's dedicated thread.
*/
- prepareForWriting(
- uint32_t frameSize, uint32_t framesCount,
- ThreadPriority threadPriority)
+ prepareForWriting(uint32_t frameSize, uint32_t framesCount)
generates (
Result retval,
- fmq_sync<uint8_t> dataMQ, fmq_sync<WriteStatus> statusMQ);
+ fmq_sync<WriteCommand> commandMQ,
+ fmq_sync<uint8_t> dataMQ,
+ fmq_sync<WriteStatus> statusMQ,
+ ThreadInfo threadInfo);
/*
* Return the number of audio frames written by the audio DSP to DAC since
diff --git a/audio/2.0/default/Android.mk b/audio/2.0/default/Android.mk
index eeea92c..9cb56c7 100644
--- a/audio/2.0/default/Android.mk
+++ b/audio/2.0/default/Android.mk
@@ -19,6 +19,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.audio@2.0-impl
LOCAL_MODULE_RELATIVE_PATH := hw
+LOCAL_PROPRIETARY_MODULE := true
LOCAL_SRC_FILES := \
Conversions.cpp \
Device.cpp \
@@ -38,7 +39,6 @@
libhidltransport \
libhwbinder \
liblog \
- libmediautils \
libutils \
android.hardware.audio@2.0 \
android.hardware.audio.common@2.0 \
@@ -56,6 +56,7 @@
LOCAL_MODULE := android.hardware.audio@2.0-service
LOCAL_INIT_RC := android.hardware.audio@2.0-service.rc
LOCAL_MODULE_RELATIVE_PATH := hw
+LOCAL_PROPRIETARY_MODULE := true
LOCAL_SRC_FILES := \
service.cpp
diff --git a/audio/2.0/default/Stream.cpp b/audio/2.0/default/Stream.cpp
index 62b34a3..c16a956 100644
--- a/audio/2.0/default/Stream.cpp
+++ b/audio/2.0/default/Stream.cpp
@@ -44,8 +44,8 @@
}
// static
-Result Stream::analyzeStatus(const char* funcName, int status, int ignoreError) {
- if (status != 0 && status != -ignoreError) {
+Result Stream::analyzeStatus(const char* funcName, int status, int ignoreError, int ignoreError2) {
+ if (status != 0 && status != -ignoreError && status != -ignoreError2) {
ALOGW("Error from HAL stream in function %s: %s", funcName, strerror(-status));
}
switch (status) {
diff --git a/audio/2.0/default/Stream.h b/audio/2.0/default/Stream.h
index 73afe05..63ea1bb 100644
--- a/audio/2.0/default/Stream.h
+++ b/audio/2.0/default/Stream.h
@@ -79,7 +79,8 @@
Return<Result> close() override;
// Utility methods for extending interfaces.
- static Result analyzeStatus(const char* funcName, int status, int ignoreError = OK);
+ static Result analyzeStatus(
+ const char* funcName, int status, int ignoreError = OK, int ignoreError2 = OK);
private:
audio_stream_t *mStream;
diff --git a/audio/2.0/default/StreamIn.cpp b/audio/2.0/default/StreamIn.cpp
index ad18986..a8229d3 100644
--- a/audio/2.0/default/StreamIn.cpp
+++ b/audio/2.0/default/StreamIn.cpp
@@ -16,10 +16,11 @@
#define LOG_TAG "StreamInHAL"
//#define LOG_NDEBUG 0
+#define ATRACE_TAG ATRACE_TAG_AUDIO
#include <android/log.h>
#include <hardware/audio.h>
-#include <mediautils/SchedulingPolicyService.h>
+#include <utils/Trace.h>
#include "StreamIn.h"
@@ -31,6 +32,8 @@
namespace V2_0 {
namespace implementation {
+using ::android::hardware::audio::common::V2_0::ThreadInfo;
+
namespace {
class ReadThread : public Thread {
@@ -38,43 +41,62 @@
// ReadThread's lifespan never exceeds StreamIn's lifespan.
ReadThread(std::atomic<bool>* stop,
audio_stream_in_t* stream,
+ StreamIn::CommandMQ* commandMQ,
StreamIn::DataMQ* dataMQ,
StreamIn::StatusMQ* statusMQ,
- EventFlag* efGroup,
- ThreadPriority threadPriority)
+ EventFlag* efGroup)
: Thread(false /*canCallJava*/),
mStop(stop),
mStream(stream),
+ mCommandMQ(commandMQ),
mDataMQ(dataMQ),
mStatusMQ(statusMQ),
mEfGroup(efGroup),
- mThreadPriority(threadPriority),
mBuffer(new uint8_t[dataMQ->getQuantumCount()]) {
}
virtual ~ReadThread() {}
- status_t readyToRun() override;
-
private:
std::atomic<bool>* mStop;
audio_stream_in_t* mStream;
+ StreamIn::CommandMQ* mCommandMQ;
StreamIn::DataMQ* mDataMQ;
StreamIn::StatusMQ* mStatusMQ;
EventFlag* mEfGroup;
- ThreadPriority mThreadPriority;
std::unique_ptr<uint8_t[]> mBuffer;
+ IStreamIn::ReadParameters mParameters;
+ IStreamIn::ReadStatus mStatus;
bool threadLoop() override;
+
+ void doGetCapturePosition();
+ void doRead();
};
-status_t ReadThread::readyToRun() {
- if (mThreadPriority != ThreadPriority::NORMAL) {
- int err = requestPriority(
- getpid(), getTid(), static_cast<int>(mThreadPriority), true /*asynchronous*/);
- ALOGW_IF(err, "failed to set priority %d for pid %d tid %d; error %d",
- static_cast<int>(mThreadPriority), getpid(), getTid(), err);
+void ReadThread::doRead() {
+ size_t availableToWrite = mDataMQ->availableToWrite();
+ size_t requestedToRead = mParameters.params.read;
+ if (requestedToRead > availableToWrite) {
+ ALOGW("truncating read data from %d to %d due to insufficient data queue space",
+ (int32_t)requestedToRead, (int32_t)availableToWrite);
+ requestedToRead = availableToWrite;
}
- return OK;
+ ssize_t readResult = mStream->read(mStream, &mBuffer[0], requestedToRead);
+ mStatus.retval = Result::OK;
+ uint64_t read = 0;
+ if (readResult >= 0) {
+ mStatus.reply.read = readResult;
+ if (!mDataMQ->write(&mBuffer[0], readResult)) {
+ ALOGW("data message queue write failed");
+ }
+ } else {
+ mStatus.retval = Stream::analyzeStatus("read", readResult);
+ }
+}
+
+void ReadThread::doGetCapturePosition() {
+ mStatus.retval = StreamIn::getCapturePositionImpl(
+ mStream, &mStatus.reply.capturePosition.frames, &mStatus.reply.capturePosition.time);
}
bool ReadThread::threadLoop() {
@@ -83,25 +105,27 @@
while(!std::atomic_load_explicit(mStop, std::memory_order_acquire)) {
// TODO: Remove manual event flag handling once blocking MQ is implemented. b/33815422
uint32_t efState = 0;
- mEfGroup->wait(static_cast<uint32_t>(MessageQueueFlagBits::NOT_FULL), &efState, NS_PER_SEC);
+ mEfGroup->wait(static_cast<uint32_t>(MessageQueueFlagBits::NOT_FULL), &efState);
if (!(efState & static_cast<uint32_t>(MessageQueueFlagBits::NOT_FULL))) {
continue; // Nothing to do.
}
-
- const size_t availToWrite = mDataMQ->availableToWrite();
- ssize_t readResult = mStream->read(mStream, &mBuffer[0], availToWrite);
- Result retval = Result::OK;
- uint64_t read = 0;
- if (readResult >= 0) {
- read = readResult;
- if (!mDataMQ->write(&mBuffer[0], readResult)) {
- ALOGW("data message queue write failed");
- }
- } else {
- retval = Stream::analyzeStatus("read", readResult);
+ if (!mCommandMQ->read(&mParameters)) {
+ continue; // Nothing to do.
}
- IStreamIn::ReadStatus status = { retval, read };
- if (!mStatusMQ->write(&status)) {
+ mStatus.replyTo = mParameters.command;
+ switch (mParameters.command) {
+ case IStreamIn::ReadCommand::READ:
+ doRead();
+ break;
+ case IStreamIn::ReadCommand::GET_CAPTURE_POSITION:
+ doGetCapturePosition();
+ break;
+ default:
+ ALOGE("Unknown read thread command code %d", mParameters.command);
+ mStatus.retval = Result::NOT_SUPPORTED;
+ break;
+ }
+ if (!mStatusMQ->write(&mStatus)) {
ALOGW("status message queue write failed");
}
mEfGroup->wake(static_cast<uint32_t>(MessageQueueFlagBits::NOT_EMPTY));
@@ -120,7 +144,18 @@
}
StreamIn::~StreamIn() {
+ ATRACE_CALL();
close();
+ if (mReadThread.get()) {
+ ATRACE_NAME("mReadThread->join");
+ status_t status = mReadThread->join();
+ ALOGE_IF(status, "read thread exit error: %s", strerror(-status));
+ }
+ if (mEfGroup) {
+ status_t status = EventFlag::deleteEventFlag(&mEfGroup);
+ ALOGE_IF(status, "read MQ event flag deletion error: %s", strerror(-status));
+ }
+ mDevice->close_input_stream(mDevice, mStream);
mStream = nullptr;
mDevice = nullptr;
}
@@ -240,14 +275,10 @@
mIsClosed = true;
if (mReadThread.get()) {
mStopReadThread.store(true, std::memory_order_release);
- status_t status = mReadThread->requestExitAndWait();
- ALOGE_IF(status, "read thread exit error: %s", strerror(-status));
}
if (mEfGroup) {
- status_t status = EventFlag::deleteEventFlag(&mEfGroup);
- ALOGE_IF(status, "read MQ event flag deletion error: %s", strerror(-status));
+ mEfGroup->wake(static_cast<uint32_t>(MessageQueueFlagBits::NOT_FULL));
}
- mDevice->close_input_stream(mDevice, mStream);
return Result::OK;
}
@@ -268,24 +299,26 @@
}
Return<void> StreamIn::prepareForReading(
- uint32_t frameSize, uint32_t framesCount, ThreadPriority threadPriority,
- prepareForReading_cb _hidl_cb) {
+ uint32_t frameSize, uint32_t framesCount, prepareForReading_cb _hidl_cb) {
status_t status;
+ ThreadInfo threadInfo = { 0, 0 };
// Create message queues.
if (mDataMQ) {
ALOGE("the client attempts to call prepareForReading twice");
_hidl_cb(Result::INVALID_STATE,
- DataMQ::Descriptor(), StatusMQ::Descriptor());
+ CommandMQ::Descriptor(), DataMQ::Descriptor(), StatusMQ::Descriptor(), threadInfo);
return Void();
}
+ std::unique_ptr<CommandMQ> tempCommandMQ(new CommandMQ(1));
std::unique_ptr<DataMQ> tempDataMQ(
new DataMQ(frameSize * framesCount, true /* EventFlag */));
std::unique_ptr<StatusMQ> tempStatusMQ(new StatusMQ(1));
- if (!tempDataMQ->isValid() || !tempStatusMQ->isValid()) {
+ if (!tempCommandMQ->isValid() || !tempDataMQ->isValid() || !tempStatusMQ->isValid()) {
+ ALOGE_IF(!tempCommandMQ->isValid(), "command MQ is invalid");
ALOGE_IF(!tempDataMQ->isValid(), "data MQ is invalid");
ALOGE_IF(!tempStatusMQ->isValid(), "status MQ is invalid");
_hidl_cb(Result::INVALID_ARGUMENTS,
- DataMQ::Descriptor(), StatusMQ::Descriptor());
+ CommandMQ::Descriptor(), DataMQ::Descriptor(), StatusMQ::Descriptor(), threadInfo);
return Void();
}
// TODO: Remove event flag management once blocking MQ is implemented. b/33815422
@@ -293,7 +326,7 @@
if (status != OK || !mEfGroup) {
ALOGE("failed creating event flag for data MQ: %s", strerror(-status));
_hidl_cb(Result::INVALID_ARGUMENTS,
- DataMQ::Descriptor(), StatusMQ::Descriptor());
+ CommandMQ::Descriptor(), DataMQ::Descriptor(), StatusMQ::Descriptor(), threadInfo);
return Void();
}
@@ -301,21 +334,26 @@
mReadThread = new ReadThread(
&mStopReadThread,
mStream,
+ tempCommandMQ.get(),
tempDataMQ.get(),
tempStatusMQ.get(),
- mEfGroup,
- threadPriority);
+ mEfGroup);
status = mReadThread->run("reader", PRIORITY_URGENT_AUDIO);
if (status != OK) {
ALOGW("failed to start reader thread: %s", strerror(-status));
_hidl_cb(Result::INVALID_ARGUMENTS,
- DataMQ::Descriptor(), StatusMQ::Descriptor());
+ CommandMQ::Descriptor(), DataMQ::Descriptor(), StatusMQ::Descriptor(), threadInfo);
return Void();
}
+ mCommandMQ = std::move(tempCommandMQ);
mDataMQ = std::move(tempDataMQ);
mStatusMQ = std::move(tempStatusMQ);
- _hidl_cb(Result::OK, *mDataMQ->getDesc(), *mStatusMQ->getDesc());
+ threadInfo.pid = getpid();
+ threadInfo.tid = mReadThread->getTid();
+ _hidl_cb(Result::OK,
+ *mCommandMQ->getDesc(), *mDataMQ->getDesc(), *mStatusMQ->getDesc(),
+ threadInfo);
return Void();
}
@@ -323,22 +361,28 @@
return mStream->get_input_frames_lost(mStream);
}
-Return<void> StreamIn::getCapturePosition(getCapturePosition_cb _hidl_cb) {
+// static
+Result StreamIn::getCapturePositionImpl(
+ audio_stream_in_t *stream, uint64_t *frames, uint64_t *time) {
Result retval(Result::NOT_SUPPORTED);
- uint64_t frames = 0, time = 0;
- if (mStream->get_capture_position != NULL) {
- int64_t halFrames, halTime;
- retval = Stream::analyzeStatus(
- "get_capture_position",
- mStream->get_capture_position(mStream, &halFrames, &halTime),
- // HAL may have a stub function, always returning ENOSYS, don't
- // spam the log in this case.
- ENOSYS);
- if (retval == Result::OK) {
- frames = halFrames;
- time = halTime;
- }
+ if (stream->get_capture_position != NULL) return retval;
+ int64_t halFrames, halTime;
+ retval = Stream::analyzeStatus(
+ "get_capture_position",
+ stream->get_capture_position(stream, &halFrames, &halTime),
+ // HAL may have a stub function, always returning ENOSYS, don't
+ // spam the log in this case.
+ ENOSYS);
+ if (retval == Result::OK) {
+ *frames = halFrames;
+ *time = halTime;
}
+ return retval;
+};
+
+Return<void> StreamIn::getCapturePosition(getCapturePosition_cb _hidl_cb) {
+ uint64_t frames = 0, time = 0;
+ Result retval = getCapturePositionImpl(mStream, &frames, &time);
_hidl_cb(retval, frames, time);
return Void();
}
diff --git a/audio/2.0/default/StreamIn.h b/audio/2.0/default/StreamIn.h
index fc813d9..b867387 100644
--- a/audio/2.0/default/StreamIn.h
+++ b/audio/2.0/default/StreamIn.h
@@ -44,7 +44,6 @@
using ::android::hardware::audio::V2_0::IStreamIn;
using ::android::hardware::audio::V2_0::ParameterValue;
using ::android::hardware::audio::V2_0::Result;
-using ::android::hardware::audio::V2_0::ThreadPriority;
using ::android::hardware::Return;
using ::android::hardware::Void;
using ::android::hardware::hidl_vec;
@@ -52,6 +51,7 @@
using ::android::sp;
struct StreamIn : public IStreamIn {
+ typedef MessageQueue<ReadParameters, kSynchronizedReadWrite> CommandMQ;
typedef MessageQueue<uint8_t, kSynchronizedReadWrite> DataMQ;
typedef MessageQueue<ReadStatus, kSynchronizedReadWrite> StatusMQ;
@@ -88,8 +88,7 @@
Return<void> getAudioSource(getAudioSource_cb _hidl_cb) override;
Return<Result> setGain(float gain) override;
Return<void> prepareForReading(
- uint32_t frameSize, uint32_t framesCount, ThreadPriority threadPriority,
- prepareForReading_cb _hidl_cb) override;
+ uint32_t frameSize, uint32_t framesCount, prepareForReading_cb _hidl_cb) override;
Return<uint32_t> getInputFramesLost() override;
Return<void> getCapturePosition(getCapturePosition_cb _hidl_cb) override;
Return<Result> start() override;
@@ -97,12 +96,16 @@
Return<void> createMmapBuffer(int32_t minSizeFrames, createMmapBuffer_cb _hidl_cb) override;
Return<void> getMmapPosition(getMmapPosition_cb _hidl_cb) override;
+ static Result getCapturePositionImpl(
+ audio_stream_in_t *stream, uint64_t *frames, uint64_t *time);
+
private:
bool mIsClosed;
audio_hw_device_t *mDevice;
audio_stream_in_t *mStream;
sp<Stream> mStreamCommon;
sp<StreamMmap<audio_stream_in_t>> mStreamMmap;
+ std::unique_ptr<CommandMQ> mCommandMQ;
std::unique_ptr<DataMQ> mDataMQ;
std::unique_ptr<StatusMQ> mStatusMQ;
EventFlag* mEfGroup;
diff --git a/audio/2.0/default/StreamOut.cpp b/audio/2.0/default/StreamOut.cpp
index 1948b68..6ccdbcd 100644
--- a/audio/2.0/default/StreamOut.cpp
+++ b/audio/2.0/default/StreamOut.cpp
@@ -16,10 +16,11 @@
#define LOG_TAG "StreamOutHAL"
//#define LOG_NDEBUG 0
+#define ATRACE_TAG ATRACE_TAG_AUDIO
#include <android/log.h>
#include <hardware/audio.h>
-#include <mediautils/SchedulingPolicyService.h>
+#include <utils/Trace.h>
#include "StreamOut.h"
@@ -29,6 +30,8 @@
namespace V2_0 {
namespace implementation {
+using ::android::hardware::audio::common::V2_0::ThreadInfo;
+
namespace {
class WriteThread : public Thread {
@@ -36,43 +39,62 @@
// WriteThread's lifespan never exceeds StreamOut's lifespan.
WriteThread(std::atomic<bool>* stop,
audio_stream_out_t* stream,
+ StreamOut::CommandMQ* commandMQ,
StreamOut::DataMQ* dataMQ,
StreamOut::StatusMQ* statusMQ,
- EventFlag* efGroup,
- ThreadPriority threadPriority)
+ EventFlag* efGroup)
: Thread(false /*canCallJava*/),
mStop(stop),
mStream(stream),
+ mCommandMQ(commandMQ),
mDataMQ(dataMQ),
mStatusMQ(statusMQ),
mEfGroup(efGroup),
- mThreadPriority(threadPriority),
mBuffer(new uint8_t[dataMQ->getQuantumCount()]) {
}
virtual ~WriteThread() {}
- status_t readyToRun() override;
-
private:
std::atomic<bool>* mStop;
audio_stream_out_t* mStream;
+ StreamOut::CommandMQ* mCommandMQ;
StreamOut::DataMQ* mDataMQ;
StreamOut::StatusMQ* mStatusMQ;
EventFlag* mEfGroup;
- ThreadPriority mThreadPriority;
std::unique_ptr<uint8_t[]> mBuffer;
+ IStreamOut::WriteStatus mStatus;
bool threadLoop() override;
+
+ void doGetLatency();
+ void doGetPresentationPosition();
+ void doWrite();
};
-status_t WriteThread::readyToRun() {
- if (mThreadPriority != ThreadPriority::NORMAL) {
- int err = requestPriority(
- getpid(), getTid(), static_cast<int>(mThreadPriority), true /*asynchronous*/);
- ALOGW_IF(err, "failed to set priority %d for pid %d tid %d; error %d",
- static_cast<int>(mThreadPriority), getpid(), getTid(), err);
+void WriteThread::doWrite() {
+ const size_t availToRead = mDataMQ->availableToRead();
+ mStatus.retval = Result::OK;
+ mStatus.reply.written = 0;
+ if (mDataMQ->read(&mBuffer[0], availToRead)) {
+ ssize_t writeResult = mStream->write(mStream, &mBuffer[0], availToRead);
+ if (writeResult >= 0) {
+ mStatus.reply.written = writeResult;
+ } else {
+ mStatus.retval = Stream::analyzeStatus("write", writeResult);
+ }
}
- return OK;
+}
+
+void WriteThread::doGetPresentationPosition() {
+ mStatus.retval = StreamOut::getPresentationPositionImpl(
+ mStream,
+ &mStatus.reply.presentationPosition.frames,
+ &mStatus.reply.presentationPosition.timeStamp);
+}
+
+void WriteThread::doGetLatency() {
+ mStatus.retval = Result::OK;
+ mStatus.reply.latencyMs = mStream->get_latency(mStream);
}
bool WriteThread::threadLoop() {
@@ -81,29 +103,30 @@
while(!std::atomic_load_explicit(mStop, std::memory_order_acquire)) {
// TODO: Remove manual event flag handling once blocking MQ is implemented. b/33815422
uint32_t efState = 0;
- mEfGroup->wait(
- static_cast<uint32_t>(MessageQueueFlagBits::NOT_EMPTY), &efState, NS_PER_SEC);
+ mEfGroup->wait(static_cast<uint32_t>(MessageQueueFlagBits::NOT_EMPTY), &efState);
if (!(efState & static_cast<uint32_t>(MessageQueueFlagBits::NOT_EMPTY))) {
continue; // Nothing to do.
}
-
- const size_t availToRead = mDataMQ->availableToRead();
- IStreamOut::WriteStatus status;
- status.writeRetval = Result::OK;
- status.written = 0;
- if (mDataMQ->read(&mBuffer[0], availToRead)) {
- ssize_t writeResult = mStream->write(mStream, &mBuffer[0], availToRead);
- if (writeResult >= 0) {
- status.written = writeResult;
- } else {
- status.writeRetval = Stream::analyzeStatus("write", writeResult);
- }
+ if (!mCommandMQ->read(&mStatus.replyTo)) {
+ continue; // Nothing to do.
}
- status.presentationPositionRetval = status.writeRetval == Result::OK ?
- StreamOut::getPresentationPositionImpl(mStream, &status.frames, &status.timeStamp) :
- Result::OK;
- if (!mStatusMQ->write(&status)) {
- ALOGW("status message queue write failed");
+ switch (mStatus.replyTo) {
+ case IStreamOut::WriteCommand::WRITE:
+ doWrite();
+ break;
+ case IStreamOut::WriteCommand::GET_PRESENTATION_POSITION:
+ doGetPresentationPosition();
+ break;
+ case IStreamOut::WriteCommand::GET_LATENCY:
+ doGetLatency();
+ break;
+ default:
+ ALOGE("Unknown write thread command code %d", mStatus.replyTo);
+ mStatus.retval = Result::NOT_SUPPORTED;
+ break;
+ }
+ if (!mStatusMQ->write(&mStatus)) {
+ ALOGE("status message queue write failed");
}
mEfGroup->wake(static_cast<uint32_t>(MessageQueueFlagBits::NOT_FULL));
}
@@ -121,7 +144,19 @@
}
StreamOut::~StreamOut() {
+ ATRACE_CALL();
close();
+ if (mWriteThread.get()) {
+ ATRACE_NAME("mWriteThread->join");
+ status_t status = mWriteThread->join();
+ ALOGE_IF(status, "write thread exit error: %s", strerror(-status));
+ }
+ if (mEfGroup) {
+ status_t status = EventFlag::deleteEventFlag(&mEfGroup);
+ ALOGE_IF(status, "write MQ event flag deletion error: %s", strerror(-status));
+ }
+ mCallback.clear();
+ mDevice->close_output_stream(mDevice, mStream);
mStream = nullptr;
mDevice = nullptr;
}
@@ -225,15 +260,10 @@
mIsClosed = true;
if (mWriteThread.get()) {
mStopWriteThread.store(true, std::memory_order_release);
- status_t status = mWriteThread->requestExitAndWait();
- ALOGE_IF(status, "write thread exit error: %s", strerror(-status));
}
if (mEfGroup) {
- status_t status = EventFlag::deleteEventFlag(&mEfGroup);
- ALOGE_IF(status, "write MQ event flag deletion error: %s", strerror(-status));
+ mEfGroup->wake(static_cast<uint32_t>(MessageQueueFlagBits::NOT_EMPTY));
}
- mCallback.clear();
- mDevice->close_output_stream(mDevice, mStream);
return Result::OK;
}
@@ -252,24 +282,26 @@
}
Return<void> StreamOut::prepareForWriting(
- uint32_t frameSize, uint32_t framesCount, ThreadPriority threadPriority,
- prepareForWriting_cb _hidl_cb) {
+ uint32_t frameSize, uint32_t framesCount, prepareForWriting_cb _hidl_cb) {
status_t status;
+ ThreadInfo threadInfo = { 0, 0 };
// Create message queues.
if (mDataMQ) {
ALOGE("the client attempts to call prepareForWriting twice");
_hidl_cb(Result::INVALID_STATE,
- DataMQ::Descriptor(), StatusMQ::Descriptor());
+ CommandMQ::Descriptor(), DataMQ::Descriptor(), StatusMQ::Descriptor(), threadInfo);
return Void();
}
+ std::unique_ptr<CommandMQ> tempCommandMQ(new CommandMQ(1));
std::unique_ptr<DataMQ> tempDataMQ(
new DataMQ(frameSize * framesCount, true /* EventFlag */));
std::unique_ptr<StatusMQ> tempStatusMQ(new StatusMQ(1));
- if (!tempDataMQ->isValid() || !tempStatusMQ->isValid()) {
+ if (!tempCommandMQ->isValid() || !tempDataMQ->isValid() || !tempStatusMQ->isValid()) {
+ ALOGE_IF(!tempCommandMQ->isValid(), "command MQ is invalid");
ALOGE_IF(!tempDataMQ->isValid(), "data MQ is invalid");
ALOGE_IF(!tempStatusMQ->isValid(), "status MQ is invalid");
_hidl_cb(Result::INVALID_ARGUMENTS,
- DataMQ::Descriptor(), StatusMQ::Descriptor());
+ CommandMQ::Descriptor(), DataMQ::Descriptor(), StatusMQ::Descriptor(), threadInfo);
return Void();
}
// TODO: Remove event flag management once blocking MQ is implemented. b/33815422
@@ -277,7 +309,7 @@
if (status != OK || !mEfGroup) {
ALOGE("failed creating event flag for data MQ: %s", strerror(-status));
_hidl_cb(Result::INVALID_ARGUMENTS,
- DataMQ::Descriptor(), StatusMQ::Descriptor());
+ CommandMQ::Descriptor(), DataMQ::Descriptor(), StatusMQ::Descriptor(), threadInfo);
return Void();
}
@@ -285,21 +317,26 @@
mWriteThread = new WriteThread(
&mStopWriteThread,
mStream,
+ tempCommandMQ.get(),
tempDataMQ.get(),
tempStatusMQ.get(),
- mEfGroup,
- threadPriority);
+ mEfGroup);
status = mWriteThread->run("writer", PRIORITY_URGENT_AUDIO);
if (status != OK) {
ALOGW("failed to start writer thread: %s", strerror(-status));
_hidl_cb(Result::INVALID_ARGUMENTS,
- DataMQ::Descriptor(), StatusMQ::Descriptor());
+ CommandMQ::Descriptor(), DataMQ::Descriptor(), StatusMQ::Descriptor(), threadInfo);
return Void();
}
+ mCommandMQ = std::move(tempCommandMQ);
mDataMQ = std::move(tempDataMQ);
mStatusMQ = std::move(tempStatusMQ);
- _hidl_cb(Result::OK, *mDataMQ->getDesc(), *mStatusMQ->getDesc());
+ threadInfo.pid = getpid();
+ threadInfo.tid = mWriteThread->getTid();
+ _hidl_cb(Result::OK,
+ *mCommandMQ->getDesc(), *mDataMQ->getDesc(), *mStatusMQ->getDesc(),
+ threadInfo);
return Void();
}
@@ -405,8 +442,9 @@
"get_presentation_position",
stream->get_presentation_position(stream, frames, &halTimeStamp),
// Don't logspam on EINVAL--it's normal for get_presentation_position
- // to return it sometimes.
- EINVAL);
+ // to return it sometimes. EAGAIN may be returned by A2DP audio HAL
+ // implementation.
+ EINVAL, EAGAIN);
if (retval == Result::OK) {
timeStamp->tvSec = halTimeStamp.tv_sec;
timeStamp->tvNSec = halTimeStamp.tv_nsec;
diff --git a/audio/2.0/default/StreamOut.h b/audio/2.0/default/StreamOut.h
index 754a0c0..bbe64a1 100644
--- a/audio/2.0/default/StreamOut.h
+++ b/audio/2.0/default/StreamOut.h
@@ -45,7 +45,6 @@
using ::android::hardware::audio::V2_0::IStreamOutCallback;
using ::android::hardware::audio::V2_0::ParameterValue;
using ::android::hardware::audio::V2_0::Result;
-using ::android::hardware::audio::V2_0::ThreadPriority;
using ::android::hardware::audio::V2_0::TimeSpec;
using ::android::hardware::Return;
using ::android::hardware::Void;
@@ -54,6 +53,7 @@
using ::android::sp;
struct StreamOut : public IStreamOut {
+ typedef MessageQueue<WriteCommand, kSynchronizedReadWrite> CommandMQ;
typedef MessageQueue<uint8_t, kSynchronizedReadWrite> DataMQ;
typedef MessageQueue<WriteStatus, kSynchronizedReadWrite> StatusMQ;
@@ -90,8 +90,7 @@
Return<uint32_t> getLatency() override;
Return<Result> setVolume(float left, float right) override;
Return<void> prepareForWriting(
- uint32_t frameSize, uint32_t framesCount, ThreadPriority threadPriority,
- prepareForWriting_cb _hidl_cb) override;
+ uint32_t frameSize, uint32_t framesCount, prepareForWriting_cb _hidl_cb) override;
Return<void> getRenderPosition(getRenderPosition_cb _hidl_cb) override;
Return<void> getNextWriteTimestamp(getNextWriteTimestamp_cb _hidl_cb) override;
Return<Result> setCallback(const sp<IStreamOutCallback>& callback) override;
@@ -118,6 +117,7 @@
sp<Stream> mStreamCommon;
sp<StreamMmap<audio_stream_out_t>> mStreamMmap;
sp<IStreamOutCallback> mCallback;
+ std::unique_ptr<CommandMQ> mCommandMQ;
std::unique_ptr<DataMQ> mDataMQ;
std::unique_ptr<StatusMQ> mStatusMQ;
EventFlag* mEfGroup;
diff --git a/audio/2.0/default/android.hardware.audio@2.0-service.rc b/audio/2.0/default/android.hardware.audio@2.0-service.rc
index 0a5bfc5..eeaf71b 100644
--- a/audio/2.0/default/android.hardware.audio@2.0-service.rc
+++ b/audio/2.0/default/android.hardware.audio@2.0-service.rc
@@ -1,4 +1,4 @@
-service audio-hal-2-0 /system/bin/hw/android.hardware.audio@2.0-service
+service audio-hal-2-0 /vendor/bin/hw/android.hardware.audio@2.0-service
class hal
user audioserver
# media gid needed for /dev/fm (radio) and for /data/misc/media (tee)
diff --git a/audio/2.0/default/service.cpp b/audio/2.0/default/service.cpp
index 646d898..8b608c8 100644
--- a/audio/2.0/default/service.cpp
+++ b/audio/2.0/default/service.cpp
@@ -33,11 +33,20 @@
using android::hardware::registerPassthroughServiceImplementation;
using android::hardware::broadcastradio::V1_0::IBroadcastRadioFactory;
+using android::OK;
+
int main(int /* argc */, char* /* argv */ []) {
configureRpcThreadpool(16, true /*callerWillJoin*/);
- registerPassthroughServiceImplementation<IDevicesFactory>("audio_devices_factory");
- registerPassthroughServiceImplementation<IEffectsFactory>("audio_effects_factory");
- registerPassthroughServiceImplementation<ISoundTriggerHw>("sound_trigger.primary");
- registerPassthroughServiceImplementation<IBroadcastRadioFactory>("broadcastradio");
+ android::status_t status;
+ status = registerPassthroughServiceImplementation<IDevicesFactory>("audio_devices_factory");
+ LOG_ALWAYS_FATAL_IF(status != OK, "Error while registering audio service: %d", status);
+ status = registerPassthroughServiceImplementation<IEffectsFactory>("audio_effects_factory");
+ LOG_ALWAYS_FATAL_IF(status != OK, "Error while registering audio effects service: %d", status);
+ // Soundtrigger and FM radio might be not present.
+ status = registerPassthroughServiceImplementation<ISoundTriggerHw>("sound_trigger.primary");
+ ALOGE_IF(status != OK, "Error while registering soundtrigger service: %d", status);
+ status = registerPassthroughServiceImplementation<IBroadcastRadioFactory>("broadcastradio");
+ ALOGE_IF(status != OK, "Error while registering fm radio service: %d", status);
joinRpcThreadpool();
+ return status;
}
diff --git a/audio/2.0/types.hal b/audio/2.0/types.hal
index 8fc4314..8e9ff14 100644
--- a/audio/2.0/types.hal
+++ b/audio/2.0/types.hal
@@ -98,12 +98,3 @@
NOT_EMPTY = 1 << 0,
NOT_FULL = 1 << 1
};
-
-/*
- * The priority of threads executing reads and writes of audio data.
- */
-enum ThreadPriority : int32_t {
- NORMAL = 0,
- FAST_CAPTURE = 3,
- FAST_MIXER = 3
-};
diff --git a/audio/common/2.0/Android.bp b/audio/common/2.0/Android.bp
index 5d33733..5330086 100644
--- a/audio/common/2.0/Android.bp
+++ b/audio/common/2.0/Android.bp
@@ -1,11 +1,18 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
+filegroup {
+ name: "android.hardware.audio.common@2.0_hal",
+ srcs: [
+ "types.hal",
+ ],
+}
+
genrule {
name: "android.hardware.audio.common@2.0_genc++",
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.common@2.0",
srcs: [
- "types.hal",
+ ":android.hardware.audio.common@2.0_hal",
],
out: [
"android/hardware/audio/common/2.0/types.cpp",
@@ -17,7 +24,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.common@2.0",
srcs: [
- "types.hal",
+ ":android.hardware.audio.common@2.0_hal",
],
out: [
"android/hardware/audio/common/2.0/types.h",
diff --git a/audio/common/2.0/Android.mk b/audio/common/2.0/Android.mk
index 423fe35..7d62779 100644
--- a/audio/common/2.0/Android.mk
+++ b/audio/common/2.0/Android.mk
@@ -8,7 +8,7 @@
LOCAL_MODULE := android.hardware.audio.common@2.0-java-constants
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
#
diff --git a/audio/common/2.0/types.hal b/audio/common/2.0/types.hal
index 63d66db..ae7f545 100644
--- a/audio/common/2.0/types.hal
+++ b/audio/common/2.0/types.hal
@@ -933,3 +933,8 @@
AudioPortSessionExt session;
} ext;
};
+
+struct ThreadInfo {
+ int64_t pid;
+ int64_t tid;
+};
diff --git a/audio/common/2.0/vts/types.vts b/audio/common/2.0/vts/types.vts
index 8d1a9db..d790573 100644
--- a/audio/common/2.0/vts/types.vts
+++ b/audio/common/2.0/vts/types.vts
@@ -56,8 +56,8 @@
struct_value: {
name: "node"
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -381,10 +381,14 @@
scalar_value: {
uint32_t: 553648128
}
- enumerator: "LDAC"
+ enumerator: "AC4"
scalar_value: {
uint32_t: 570425344
}
+ enumerator: "LDAC"
+ scalar_value: {
+ uint32_t: 587202560
+ }
enumerator: "MAIN_MASK"
scalar_value: {
uint32_t: 4278190080
@@ -811,6 +815,10 @@
scalar_value: {
uint32_t: 48
}
+ enumerator: "IN_6"
+ scalar_value: {
+ uint32_t: 252
+ }
enumerator: "IN_VOICE_UPLINK_MONO"
scalar_value: {
uint32_t: 16400
@@ -1357,13 +1365,17 @@
scalar_value: {
int32_t: 15
}
- enumerator: "CNT"
+ enumerator: "ASSISTANT"
scalar_value: {
int32_t: 16
}
+ enumerator: "CNT"
+ scalar_value: {
+ int32_t: 17
+ }
enumerator: "MAX"
scalar_value: {
- int32_t: 15
+ int32_t: 16
}
}
}
@@ -1545,8 +1557,8 @@
struct_value: {
name: "values"
type: TYPE_ARRAY
+ vector_size: 32
vector_value: {
- vector_size: 32
type: TYPE_SCALAR
scalar_type: "int32_t"
}
@@ -1620,8 +1632,8 @@
struct_value: {
name: "address"
type: TYPE_ARRAY
+ vector_size: 32
vector_value: {
- vector_size: 32
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -1785,8 +1797,8 @@
struct_value: {
name: "address"
type: TYPE_ARRAY
+ vector_size: 32
vector_value: {
- vector_size: 32
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -1925,3 +1937,18 @@
}
}
+attribute: {
+ name: "::android::hardware::audio::common::V2_0::ThreadInfo"
+ type: TYPE_STRUCT
+ struct_value: {
+ name: "pid"
+ type: TYPE_SCALAR
+ scalar_type: "int64_t"
+ }
+ struct_value: {
+ name: "tid"
+ type: TYPE_SCALAR
+ scalar_type: "int64_t"
+ }
+}
+
diff --git a/audio/effect/2.0/Android.bp b/audio/effect/2.0/Android.bp
index ee76a0e..83a702a 100644
--- a/audio/effect/2.0/Android.bp
+++ b/audio/effect/2.0/Android.bp
@@ -1,9 +1,7 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
-genrule {
- name: "android.hardware.audio.effect@2.0_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.effect@2.0",
+filegroup {
+ name: "android.hardware.audio.effect@2.0_hal",
srcs: [
"types.hal",
"IAcousticEchoCancelerEffect.hal",
@@ -21,6 +19,15 @@
"IVirtualizerEffect.hal",
"IVisualizerEffect.hal",
],
+}
+
+genrule {
+ name: "android.hardware.audio.effect@2.0_genc++",
+ tools: ["hidl-gen"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.effect@2.0",
+ srcs: [
+ ":android.hardware.audio.effect@2.0_hal",
+ ],
out: [
"android/hardware/audio/effect/2.0/types.cpp",
"android/hardware/audio/effect/2.0/AcousticEchoCancelerEffectAll.cpp",
@@ -45,21 +52,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.effect@2.0",
srcs: [
- "types.hal",
- "IAcousticEchoCancelerEffect.hal",
- "IAutomaticGainControlEffect.hal",
- "IBassBoostEffect.hal",
- "IDownmixEffect.hal",
- "IEffect.hal",
- "IEffectBufferProviderCallback.hal",
- "IEffectsFactory.hal",
- "IEnvironmentalReverbEffect.hal",
- "IEqualizerEffect.hal",
- "ILoudnessEnhancerEffect.hal",
- "INoiseSuppressionEffect.hal",
- "IPresetReverbEffect.hal",
- "IVirtualizerEffect.hal",
- "IVisualizerEffect.hal",
+ ":android.hardware.audio.effect@2.0_hal",
],
out: [
"android/hardware/audio/effect/2.0/types.h",
diff --git a/audio/effect/2.0/Android.mk b/audio/effect/2.0/Android.mk
index 3383efd..d71255e 100644
--- a/audio/effect/2.0/Android.mk
+++ b/audio/effect/2.0/Android.mk
@@ -8,7 +8,7 @@
LOCAL_MODULE := android.hardware.audio.effect@2.0-java-constants
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
#
diff --git a/audio/effect/2.0/default/Android.mk b/audio/effect/2.0/default/Android.mk
index 18076ed..1541d41 100644
--- a/audio/effect/2.0/default/Android.mk
+++ b/audio/effect/2.0/default/Android.mk
@@ -2,6 +2,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.audio.effect@2.0-impl
+LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_SRC_FILES := \
AcousticEchoCancelerEffect.cpp \
diff --git a/audio/effect/2.0/default/Effect.cpp b/audio/effect/2.0/default/Effect.cpp
index 3c97fc4..83c8e09 100644
--- a/audio/effect/2.0/default/Effect.cpp
+++ b/audio/effect/2.0/default/Effect.cpp
@@ -17,8 +17,11 @@
#include <memory.h>
#define LOG_TAG "EffectHAL"
+#define ATRACE_TAG ATRACE_TAG_AUDIO
+
#include <android/log.h>
#include <media/EffectsFactoryApi.h>
+#include <utils/Trace.h>
#include "Conversions.h"
#include "Effect.h"
@@ -74,12 +77,10 @@
// as the Thread uses mutexes, and this can lead to priority inversion.
while(!std::atomic_load_explicit(mStop, std::memory_order_acquire)) {
uint32_t efState = 0;
- mEfGroup->wait(
- static_cast<uint32_t>(MessageQueueFlagBits::REQUEST_PROCESS_ALL),
- &efState,
- NS_PER_SEC);
- if (!(efState & static_cast<uint32_t>(MessageQueueFlagBits::REQUEST_PROCESS_ALL))) {
- continue; // Nothing to do.
+ mEfGroup->wait(static_cast<uint32_t>(MessageQueueFlagBits::REQUEST_PROCESS_ALL), &efState);
+ if (!(efState & static_cast<uint32_t>(MessageQueueFlagBits::REQUEST_PROCESS_ALL))
+ || (efState & static_cast<uint32_t>(MessageQueueFlagBits::REQUEST_QUIT))) {
+ continue; // Nothing to do or time to quit.
}
Result retval = Result::OK;
if (efState & static_cast<uint32_t>(MessageQueueFlagBits::REQUEST_PROCESS_REVERSE)
@@ -134,7 +135,23 @@
}
Effect::~Effect() {
+ ATRACE_CALL();
close();
+ if (mProcessThread.get()) {
+ ATRACE_NAME("mProcessThread->join");
+ status_t status = mProcessThread->join();
+ ALOGE_IF(status, "processing thread exit error: %s", strerror(-status));
+ }
+ if (mEfGroup) {
+ status_t status = EventFlag::deleteEventFlag(&mEfGroup);
+ ALOGE_IF(status, "processing MQ event flag deletion error: %s", strerror(-status));
+ }
+ mInBuffer.clear();
+ mOutBuffer.clear();
+ int status = EffectRelease(mHandle);
+ ALOGW_IF(status, "Error releasing effect %p: %s", mHandle, strerror(-status));
+ EffectMap::getInstance().remove(mHandle);
+ mHandle = 0;
}
// static
@@ -731,19 +748,10 @@
mIsClosed = true;
if (mProcessThread.get()) {
mStopProcessThread.store(true, std::memory_order_release);
- status_t status = mProcessThread->requestExitAndWait();
- ALOGE_IF(status, "processing thread exit error: %s", strerror(-status));
}
if (mEfGroup) {
- status_t status = EventFlag::deleteEventFlag(&mEfGroup);
- ALOGE_IF(status, "processing MQ event flag deletion error: %s", strerror(-status));
+ mEfGroup->wake(static_cast<uint32_t>(MessageQueueFlagBits::REQUEST_QUIT));
}
- mInBuffer.clear();
- mOutBuffer.clear();
- int status = EffectRelease(mHandle);
- ALOGW_IF(status, "Error releasing effect %p: %s", mHandle, strerror(-status));
- EffectMap::getInstance().remove(mHandle);
- mHandle = 0;
return Result::OK;
}
diff --git a/audio/effect/2.0/types.hal b/audio/effect/2.0/types.hal
index 0cac59a..0626ec5 100644
--- a/audio/effect/2.0/types.hal
+++ b/audio/effect/2.0/types.hal
@@ -293,5 +293,7 @@
DONE_PROCESSING = 1 << 0,
REQUEST_PROCESS = 1 << 1,
REQUEST_PROCESS_REVERSE = 1 << 2,
- REQUEST_PROCESS_ALL = REQUEST_PROCESS | REQUEST_PROCESS_REVERSE
+ REQUEST_QUIT = 1 << 3,
+ REQUEST_PROCESS_ALL =
+ REQUEST_PROCESS | REQUEST_PROCESS_REVERSE | REQUEST_QUIT
};
diff --git a/audio/effect/2.0/vts/functional/Android.mk b/audio/effect/2.0/vts/functional/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/audio/effect/2.0/vts/functional/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/audio/effect/2.0/vts/functional/vts/Android.mk b/audio/effect/2.0/vts/functional/vts/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/audio/effect/2.0/vts/functional/vts/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/audio/effect/2.0/vts/functional/vts/testcases/Android.mk b/audio/effect/2.0/vts/functional/vts/testcases/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/audio/effect/2.0/vts/functional/vts/testcases/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/audio/effect/2.0/vts/functional/vts/testcases/hal/Android.mk b/audio/effect/2.0/vts/functional/vts/testcases/hal/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/audio/effect/2.0/vts/functional/vts/testcases/hal/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/audio/effect/2.0/vts/functional/vts/testcases/hal/audio/Android.mk b/audio/effect/2.0/vts/functional/vts/testcases/hal/audio/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/audio/effect/2.0/vts/functional/vts/testcases/hal/audio/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/audio/effect/2.0/vts/functional/vts/testcases/hal/audio/effect/Android.mk b/audio/effect/2.0/vts/functional/vts/testcases/hal/audio/effect/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/audio/effect/2.0/vts/functional/vts/testcases/hal/audio/effect/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/audio/effect/2.0/vts/functional/vts/testcases/hal/audio/effect/hidl/Android.mk b/audio/effect/2.0/vts/functional/vts/testcases/hal/audio/effect/hidl/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/audio/effect/2.0/vts/functional/vts/testcases/hal/audio/effect/hidl/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/audio/effect/2.0/vts/functional/vts/testcases/hal/audio/effect/hidl/target/Android.mk b/audio/effect/2.0/vts/functional/vts/testcases/hal/audio/effect/hidl/target/Android.mk
deleted file mode 100644
index fe5ea0f..0000000
--- a/audio/effect/2.0/vts/functional/vts/testcases/hal/audio/effect/hidl/target/Android.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := HalAudioEffectHidlTargetBasicTest
-VTS_CONFIG_SRC_DIR := testcases/hal/audio/effect/hidl/target
-include test/vts/tools/build/Android.host_config.mk
diff --git a/audio/effect/2.0/vts/functional/vts/testcases/hal/audio/effect/hidl/target/AndroidTest.xml b/audio/effect/2.0/vts/functional/vts/testcases/hal/audio/effect/hidl/target/AndroidTest.xml
deleted file mode 100644
index f0af67a..0000000
--- a/audio/effect/2.0/vts/functional/vts/testcases/hal/audio/effect/hidl/target/AndroidTest.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<configuration description="Config for VTS Audio Effect HIDL HAL's basic target-side test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="HalAudioEffectHidlTargetBasicTest" />
- <option name="binary-test-sources" value="
- _32bit::DATA/nativetest/audio_effect_hidl_hal_test/audio_effect_hidl_hal_test,
- _64bit::DATA/nativetest64/audio_effect_hidl_hal_test/audio_effect_hidl_hal_test,
- "/>
- <option name="binary-test-type" value="gtest" />
- <option name="test-timeout" value="1m" />
- </test>
-</configuration>
diff --git a/audio/effect/2.0/vts/functional/vts/testcases/hal/audio/effect/hidl/target_profiling/Android.mk b/audio/effect/2.0/vts/functional/vts/testcases/hal/audio/effect/hidl/target_profiling/Android.mk
deleted file mode 100644
index 430600d..0000000
--- a/audio/effect/2.0/vts/functional/vts/testcases/hal/audio/effect/hidl/target_profiling/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := HalAudioEffectHidlTargetBasicProfilingTest
-VTS_CONFIG_SRC_DIR := testcases/hal/audio/effect/hidl/target_profiling
-include test/vts/tools/build/Android.host_config.mk
diff --git a/audio/effect/2.0/vts/functional/vts/testcases/hal/audio/effect/hidl/target_profiling/AndroidTest.xml b/audio/effect/2.0/vts/functional/vts/testcases/hal/audio/effect/hidl/target_profiling/AndroidTest.xml
deleted file mode 100644
index 7febf26..0000000
--- a/audio/effect/2.0/vts/functional/vts/testcases/hal/audio/effect/hidl/target_profiling/AndroidTest.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<configuration description="Config for VTS Audio Effect HIDL HAL's basic target-side, profiling test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="HalAudioEffectHidlTargetBasicProfilingTest" />
- <option name="binary-test-sources" value="
- _32bit::DATA/nativetest/audio_effect_hidl_hal_test/audio_effect_hidl_hal_test,
- _64bit::DATA/nativetest64/audio_effect_hidl_hal_test/audio_effect_hidl_hal_test,
- "/>
- <option name="binary-test-type" value="gtest" />
- <option name="test-timeout" value="1m" />
- <option name="enable-profiling" value="true" />
- </test>
-</configuration>
diff --git a/automotive/Android.bp b/automotive/Android.bp
new file mode 100644
index 0000000..0302cd5
--- /dev/null
+++ b/automotive/Android.bp
@@ -0,0 +1,6 @@
+// This is an autogenerated file, do not edit.
+subdirs = [
+ "vehicle",
+ "vehicle/2.0",
+ "vehicle/2.1",
+]
diff --git a/automotive/vehicle/2.0/Android.bp b/automotive/vehicle/2.0/Android.bp
new file mode 100644
index 0000000..e08d3ca
--- /dev/null
+++ b/automotive/vehicle/2.0/Android.bp
@@ -0,0 +1,69 @@
+// This file is autogenerated by hidl-gen. Do not edit manually.
+
+filegroup {
+ name: "android.hardware.automotive.vehicle@2.0_hal",
+ srcs: [
+ "types.hal",
+ "IVehicle.hal",
+ "IVehicleCallback.hal",
+ ],
+}
+
+genrule {
+ name: "android.hardware.automotive.vehicle@2.0_genc++",
+ tools: ["hidl-gen"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.vehicle@2.0",
+ srcs: [
+ ":android.hardware.automotive.vehicle@2.0_hal",
+ ],
+ out: [
+ "android/hardware/automotive/vehicle/2.0/types.cpp",
+ "android/hardware/automotive/vehicle/2.0/VehicleAll.cpp",
+ "android/hardware/automotive/vehicle/2.0/VehicleCallbackAll.cpp",
+ ],
+}
+
+genrule {
+ name: "android.hardware.automotive.vehicle@2.0_genc++_headers",
+ tools: ["hidl-gen"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.vehicle@2.0",
+ srcs: [
+ ":android.hardware.automotive.vehicle@2.0_hal",
+ ],
+ out: [
+ "android/hardware/automotive/vehicle/2.0/types.h",
+ "android/hardware/automotive/vehicle/2.0/IVehicle.h",
+ "android/hardware/automotive/vehicle/2.0/IHwVehicle.h",
+ "android/hardware/automotive/vehicle/2.0/BnHwVehicle.h",
+ "android/hardware/automotive/vehicle/2.0/BpHwVehicle.h",
+ "android/hardware/automotive/vehicle/2.0/BsVehicle.h",
+ "android/hardware/automotive/vehicle/2.0/IVehicleCallback.h",
+ "android/hardware/automotive/vehicle/2.0/IHwVehicleCallback.h",
+ "android/hardware/automotive/vehicle/2.0/BnHwVehicleCallback.h",
+ "android/hardware/automotive/vehicle/2.0/BpHwVehicleCallback.h",
+ "android/hardware/automotive/vehicle/2.0/BsVehicleCallback.h",
+ ],
+}
+
+cc_library_shared {
+ name: "android.hardware.automotive.vehicle@2.0",
+ generated_sources: ["android.hardware.automotive.vehicle@2.0_genc++"],
+ generated_headers: ["android.hardware.automotive.vehicle@2.0_genc++_headers"],
+ export_generated_headers: ["android.hardware.automotive.vehicle@2.0_genc++_headers"],
+ shared_libs: [
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "liblog",
+ "libutils",
+ "libcutils",
+ "android.hidl.base@1.0",
+ ],
+ export_shared_lib_headers: [
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "libutils",
+ "android.hidl.base@1.0",
+ ],
+}
diff --git a/vehicle/2.0/Android.mk b/automotive/vehicle/2.0/Android.mk
similarity index 72%
rename from vehicle/2.0/Android.mk
rename to automotive/vehicle/2.0/Android.mk
index 1dd0f45..c540027 100644
--- a/vehicle/2.0/Android.mk
+++ b/automotive/vehicle/2.0/Android.mk
@@ -5,10 +5,10 @@
################################################################################
include $(CLEAR_VARS)
-LOCAL_MODULE := android.hardware.vehicle@2.0-java
+LOCAL_MODULE := android.hardware.automotive.vehicle@2.0-java
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -19,7 +19,7 @@
#
# Build types.hal (CommonIgnitionMonitors)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/CommonIgnitionMonitors.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/CommonIgnitionMonitors.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -29,7 +29,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.CommonIgnitionMonitors
+ android.hardware.automotive.vehicle@2.0::types.CommonIgnitionMonitors
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -38,7 +38,7 @@
#
# Build types.hal (CompressionIgnitionMonitors)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/CompressionIgnitionMonitors.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/CompressionIgnitionMonitors.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -48,7 +48,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.CompressionIgnitionMonitors
+ android.hardware.automotive.vehicle@2.0::types.CompressionIgnitionMonitors
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -57,7 +57,7 @@
#
# Build types.hal (FuelSystemStatus)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/FuelSystemStatus.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/FuelSystemStatus.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -67,7 +67,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.FuelSystemStatus
+ android.hardware.automotive.vehicle@2.0::types.FuelSystemStatus
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -76,7 +76,7 @@
#
# Build types.hal (FuelType)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/FuelType.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/FuelType.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -86,7 +86,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.FuelType
+ android.hardware.automotive.vehicle@2.0::types.FuelType
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -95,7 +95,7 @@
#
# Build types.hal (IgnitionMonitorKind)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/IgnitionMonitorKind.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/IgnitionMonitorKind.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -105,7 +105,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.IgnitionMonitorKind
+ android.hardware.automotive.vehicle@2.0::types.IgnitionMonitorKind
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -114,7 +114,7 @@
#
# Build types.hal (Obd2FloatSensorIndex)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/Obd2FloatSensorIndex.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2FloatSensorIndex.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -124,7 +124,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.Obd2FloatSensorIndex
+ android.hardware.automotive.vehicle@2.0::types.Obd2FloatSensorIndex
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -133,7 +133,7 @@
#
# Build types.hal (Obd2IntegerSensorIndex)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/Obd2IntegerSensorIndex.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2IntegerSensorIndex.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -143,7 +143,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.Obd2IntegerSensorIndex
+ android.hardware.automotive.vehicle@2.0::types.Obd2IntegerSensorIndex
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -152,7 +152,7 @@
#
# Build types.hal (SecondaryAirStatus)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/SecondaryAirStatus.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/SecondaryAirStatus.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -162,7 +162,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.SecondaryAirStatus
+ android.hardware.automotive.vehicle@2.0::types.SecondaryAirStatus
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -171,7 +171,7 @@
#
# Build types.hal (SparkIgnitionMonitors)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/SparkIgnitionMonitors.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/SparkIgnitionMonitors.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -181,7 +181,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.SparkIgnitionMonitors
+ android.hardware.automotive.vehicle@2.0::types.SparkIgnitionMonitors
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -190,7 +190,7 @@
#
# Build types.hal (StatusCode)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/StatusCode.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/StatusCode.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -200,7 +200,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.StatusCode
+ android.hardware.automotive.vehicle@2.0::types.StatusCode
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -209,7 +209,7 @@
#
# Build types.hal (SubscribeFlags)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/SubscribeFlags.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/SubscribeFlags.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -219,7 +219,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.SubscribeFlags
+ android.hardware.automotive.vehicle@2.0::types.SubscribeFlags
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -228,7 +228,7 @@
#
# Build types.hal (SubscribeOptions)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/SubscribeOptions.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/SubscribeOptions.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -238,7 +238,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.SubscribeOptions
+ android.hardware.automotive.vehicle@2.0::types.SubscribeOptions
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -247,7 +247,7 @@
#
# Build types.hal (VehicleApPowerBootupReason)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleApPowerBootupReason.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleApPowerBootupReason.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -257,7 +257,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleApPowerBootupReason
+ android.hardware.automotive.vehicle@2.0::types.VehicleApPowerBootupReason
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -266,7 +266,7 @@
#
# Build types.hal (VehicleApPowerSetState)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleApPowerSetState.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleApPowerSetState.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -276,7 +276,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleApPowerSetState
+ android.hardware.automotive.vehicle@2.0::types.VehicleApPowerSetState
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -285,7 +285,7 @@
#
# Build types.hal (VehicleApPowerState)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleApPowerState.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleApPowerState.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -295,7 +295,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleApPowerState
+ android.hardware.automotive.vehicle@2.0::types.VehicleApPowerState
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -304,7 +304,7 @@
#
# Build types.hal (VehicleApPowerStateConfigFlag)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleApPowerStateConfigFlag.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleApPowerStateConfigFlag.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -314,7 +314,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleApPowerStateConfigFlag
+ android.hardware.automotive.vehicle@2.0::types.VehicleApPowerStateConfigFlag
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -323,7 +323,7 @@
#
# Build types.hal (VehicleApPowerStateIndex)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleApPowerStateIndex.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleApPowerStateIndex.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -333,7 +333,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleApPowerStateIndex
+ android.hardware.automotive.vehicle@2.0::types.VehicleApPowerStateIndex
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -342,7 +342,7 @@
#
# Build types.hal (VehicleApPowerStateShutdownParam)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleApPowerStateShutdownParam.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleApPowerStateShutdownParam.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -352,7 +352,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleApPowerStateShutdownParam
+ android.hardware.automotive.vehicle@2.0::types.VehicleApPowerStateShutdownParam
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -361,7 +361,7 @@
#
# Build types.hal (VehicleArea)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleArea.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleArea.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -371,7 +371,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleArea
+ android.hardware.automotive.vehicle@2.0::types.VehicleArea
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -380,7 +380,7 @@
#
# Build types.hal (VehicleAreaConfig)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleAreaConfig.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAreaConfig.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -390,7 +390,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleAreaConfig
+ android.hardware.automotive.vehicle@2.0::types.VehicleAreaConfig
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -399,7 +399,7 @@
#
# Build types.hal (VehicleAreaDoor)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleAreaDoor.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAreaDoor.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -409,7 +409,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleAreaDoor
+ android.hardware.automotive.vehicle@2.0::types.VehicleAreaDoor
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -418,7 +418,7 @@
#
# Build types.hal (VehicleAreaMirror)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleAreaMirror.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAreaMirror.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -428,7 +428,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleAreaMirror
+ android.hardware.automotive.vehicle@2.0::types.VehicleAreaMirror
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -437,7 +437,7 @@
#
# Build types.hal (VehicleAreaSeat)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleAreaSeat.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAreaSeat.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -447,7 +447,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleAreaSeat
+ android.hardware.automotive.vehicle@2.0::types.VehicleAreaSeat
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -456,7 +456,7 @@
#
# Build types.hal (VehicleAreaWindow)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleAreaWindow.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAreaWindow.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -466,7 +466,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleAreaWindow
+ android.hardware.automotive.vehicle@2.0::types.VehicleAreaWindow
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -475,7 +475,7 @@
#
# Build types.hal (VehicleAreaZone)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleAreaZone.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAreaZone.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -485,7 +485,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleAreaZone
+ android.hardware.automotive.vehicle@2.0::types.VehicleAreaZone
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -494,7 +494,7 @@
#
# Build types.hal (VehicleAudioContextFlag)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleAudioContextFlag.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioContextFlag.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -504,7 +504,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleAudioContextFlag
+ android.hardware.automotive.vehicle@2.0::types.VehicleAudioContextFlag
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -513,7 +513,7 @@
#
# Build types.hal (VehicleAudioExtFocusFlag)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleAudioExtFocusFlag.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioExtFocusFlag.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -523,7 +523,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleAudioExtFocusFlag
+ android.hardware.automotive.vehicle@2.0::types.VehicleAudioExtFocusFlag
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -532,7 +532,7 @@
#
# Build types.hal (VehicleAudioFocusIndex)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleAudioFocusIndex.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioFocusIndex.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -542,7 +542,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleAudioFocusIndex
+ android.hardware.automotive.vehicle@2.0::types.VehicleAudioFocusIndex
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -551,7 +551,7 @@
#
# Build types.hal (VehicleAudioFocusRequest)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleAudioFocusRequest.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioFocusRequest.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -561,7 +561,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleAudioFocusRequest
+ android.hardware.automotive.vehicle@2.0::types.VehicleAudioFocusRequest
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -570,7 +570,7 @@
#
# Build types.hal (VehicleAudioFocusState)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleAudioFocusState.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioFocusState.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -580,7 +580,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleAudioFocusState
+ android.hardware.automotive.vehicle@2.0::types.VehicleAudioFocusState
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -589,7 +589,7 @@
#
# Build types.hal (VehicleAudioHwVariantConfigFlag)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleAudioHwVariantConfigFlag.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioHwVariantConfigFlag.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -599,7 +599,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleAudioHwVariantConfigFlag
+ android.hardware.automotive.vehicle@2.0::types.VehicleAudioHwVariantConfigFlag
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -608,7 +608,7 @@
#
# Build types.hal (VehicleAudioRoutingPolicyIndex)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleAudioRoutingPolicyIndex.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioRoutingPolicyIndex.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -618,7 +618,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleAudioRoutingPolicyIndex
+ android.hardware.automotive.vehicle@2.0::types.VehicleAudioRoutingPolicyIndex
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -627,7 +627,7 @@
#
# Build types.hal (VehicleAudioStream)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleAudioStream.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioStream.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -637,7 +637,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleAudioStream
+ android.hardware.automotive.vehicle@2.0::types.VehicleAudioStream
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -646,7 +646,7 @@
#
# Build types.hal (VehicleAudioStreamFlag)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleAudioStreamFlag.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioStreamFlag.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -656,7 +656,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleAudioStreamFlag
+ android.hardware.automotive.vehicle@2.0::types.VehicleAudioStreamFlag
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -665,7 +665,7 @@
#
# Build types.hal (VehicleAudioVolumeCapabilityFlag)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleAudioVolumeCapabilityFlag.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioVolumeCapabilityFlag.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -675,7 +675,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleAudioVolumeCapabilityFlag
+ android.hardware.automotive.vehicle@2.0::types.VehicleAudioVolumeCapabilityFlag
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -684,7 +684,7 @@
#
# Build types.hal (VehicleAudioVolumeIndex)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleAudioVolumeIndex.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioVolumeIndex.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -694,7 +694,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleAudioVolumeIndex
+ android.hardware.automotive.vehicle@2.0::types.VehicleAudioVolumeIndex
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -703,7 +703,7 @@
#
# Build types.hal (VehicleAudioVolumeLimitIndex)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleAudioVolumeLimitIndex.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioVolumeLimitIndex.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -713,7 +713,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleAudioVolumeLimitIndex
+ android.hardware.automotive.vehicle@2.0::types.VehicleAudioVolumeLimitIndex
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -722,7 +722,7 @@
#
# Build types.hal (VehicleAudioVolumeState)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleAudioVolumeState.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioVolumeState.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -732,7 +732,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleAudioVolumeState
+ android.hardware.automotive.vehicle@2.0::types.VehicleAudioVolumeState
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -741,7 +741,7 @@
#
# Build types.hal (VehicleDisplay)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleDisplay.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleDisplay.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -751,7 +751,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleDisplay
+ android.hardware.automotive.vehicle@2.0::types.VehicleDisplay
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -760,7 +760,7 @@
#
# Build types.hal (VehicleDrivingStatus)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleDrivingStatus.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleDrivingStatus.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -770,7 +770,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleDrivingStatus
+ android.hardware.automotive.vehicle@2.0::types.VehicleDrivingStatus
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -779,7 +779,7 @@
#
# Build types.hal (VehicleGear)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleGear.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleGear.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -789,7 +789,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleGear
+ android.hardware.automotive.vehicle@2.0::types.VehicleGear
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -798,7 +798,7 @@
#
# Build types.hal (VehicleHvacFanDirection)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleHvacFanDirection.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleHvacFanDirection.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -808,7 +808,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleHvacFanDirection
+ android.hardware.automotive.vehicle@2.0::types.VehicleHvacFanDirection
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -817,7 +817,7 @@
#
# Build types.hal (VehicleHwKeyInputAction)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleHwKeyInputAction.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleHwKeyInputAction.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -827,7 +827,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleHwKeyInputAction
+ android.hardware.automotive.vehicle@2.0::types.VehicleHwKeyInputAction
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -836,7 +836,7 @@
#
# Build types.hal (VehicleIgnitionState)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleIgnitionState.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleIgnitionState.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -846,7 +846,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleIgnitionState
+ android.hardware.automotive.vehicle@2.0::types.VehicleIgnitionState
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -855,7 +855,7 @@
#
# Build types.hal (VehicleInstrumentClusterType)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleInstrumentClusterType.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleInstrumentClusterType.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -865,7 +865,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleInstrumentClusterType
+ android.hardware.automotive.vehicle@2.0::types.VehicleInstrumentClusterType
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -874,7 +874,7 @@
#
# Build types.hal (VehiclePropConfig)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehiclePropConfig.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehiclePropConfig.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -884,7 +884,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehiclePropConfig
+ android.hardware.automotive.vehicle@2.0::types.VehiclePropConfig
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -893,7 +893,7 @@
#
# Build types.hal (VehiclePropValue)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehiclePropValue.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehiclePropValue.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -903,7 +903,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehiclePropValue
+ android.hardware.automotive.vehicle@2.0::types.VehiclePropValue
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -912,7 +912,7 @@
#
# Build types.hal (VehicleProperty)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleProperty.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleProperty.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -922,7 +922,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleProperty
+ android.hardware.automotive.vehicle@2.0::types.VehicleProperty
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -931,7 +931,7 @@
#
# Build types.hal (VehiclePropertyAccess)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehiclePropertyAccess.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehiclePropertyAccess.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -941,7 +941,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehiclePropertyAccess
+ android.hardware.automotive.vehicle@2.0::types.VehiclePropertyAccess
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -950,7 +950,7 @@
#
# Build types.hal (VehiclePropertyChangeMode)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehiclePropertyChangeMode.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehiclePropertyChangeMode.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -960,7 +960,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehiclePropertyChangeMode
+ android.hardware.automotive.vehicle@2.0::types.VehiclePropertyChangeMode
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -969,7 +969,7 @@
#
# Build types.hal (VehiclePropertyGroup)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehiclePropertyGroup.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehiclePropertyGroup.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -979,7 +979,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehiclePropertyGroup
+ android.hardware.automotive.vehicle@2.0::types.VehiclePropertyGroup
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -988,7 +988,7 @@
#
# Build types.hal (VehiclePropertyOperation)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehiclePropertyOperation.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehiclePropertyOperation.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -998,7 +998,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehiclePropertyOperation
+ android.hardware.automotive.vehicle@2.0::types.VehiclePropertyOperation
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1007,7 +1007,7 @@
#
# Build types.hal (VehiclePropertyType)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehiclePropertyType.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehiclePropertyType.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1017,7 +1017,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehiclePropertyType
+ android.hardware.automotive.vehicle@2.0::types.VehiclePropertyType
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1026,7 +1026,7 @@
#
# Build types.hal (VehicleRadioConstants)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleRadioConstants.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleRadioConstants.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1036,7 +1036,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleRadioConstants
+ android.hardware.automotive.vehicle@2.0::types.VehicleRadioConstants
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1045,7 +1045,7 @@
#
# Build types.hal (VehicleTurnSignal)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleTurnSignal.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleTurnSignal.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1055,7 +1055,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleTurnSignal
+ android.hardware.automotive.vehicle@2.0::types.VehicleTurnSignal
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1064,7 +1064,7 @@
#
# Build types.hal (VehicleUnit)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleUnit.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleUnit.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1074,7 +1074,45 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleUnit
+ android.hardware.automotive.vehicle@2.0::types.VehicleUnit
+
+$(GEN): $(LOCAL_PATH)/types.hal
+ $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+
+#
+# Build types.hal (VmsMessageIntegerValuesIndex)
+#
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsMessageIntegerValuesIndex.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
+ android.hardware.automotive.vehicle@2.0::types.VmsMessageIntegerValuesIndex
+
+$(GEN): $(LOCAL_PATH)/types.hal
+ $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+
+#
+# Build types.hal (VmsMessageType)
+#
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsMessageType.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
+ android.hardware.automotive.vehicle@2.0::types.VmsMessageType
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1083,7 +1121,7 @@
#
# Build types.hal (Wheel)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/Wheel.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Wheel.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1093,7 +1131,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.Wheel
+ android.hardware.automotive.vehicle@2.0::types.Wheel
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1102,7 +1140,7 @@
#
# Build IVehicle.hal
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/IVehicle.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/IVehicle.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IVehicle.hal
@@ -1116,7 +1154,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::IVehicle
+ android.hardware.automotive.vehicle@2.0::IVehicle
$(GEN): $(LOCAL_PATH)/IVehicle.hal
$(transform-generated-source)
@@ -1125,7 +1163,7 @@
#
# Build IVehicleCallback.hal
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/IVehicleCallback.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/IVehicleCallback.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IVehicleCallback.hal
@@ -1137,7 +1175,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::IVehicleCallback
+ android.hardware.automotive.vehicle@2.0::IVehicleCallback
$(GEN): $(LOCAL_PATH)/IVehicleCallback.hal
$(transform-generated-source)
@@ -1148,10 +1186,10 @@
################################################################################
include $(CLEAR_VARS)
-LOCAL_MODULE := android.hardware.vehicle@2.0-java-static
+LOCAL_MODULE := android.hardware.automotive.vehicle@2.0-java-static
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -1162,7 +1200,7 @@
#
# Build types.hal (CommonIgnitionMonitors)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/CommonIgnitionMonitors.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/CommonIgnitionMonitors.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1172,7 +1210,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.CommonIgnitionMonitors
+ android.hardware.automotive.vehicle@2.0::types.CommonIgnitionMonitors
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1181,7 +1219,7 @@
#
# Build types.hal (CompressionIgnitionMonitors)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/CompressionIgnitionMonitors.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/CompressionIgnitionMonitors.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1191,7 +1229,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.CompressionIgnitionMonitors
+ android.hardware.automotive.vehicle@2.0::types.CompressionIgnitionMonitors
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1200,7 +1238,7 @@
#
# Build types.hal (FuelSystemStatus)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/FuelSystemStatus.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/FuelSystemStatus.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1210,7 +1248,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.FuelSystemStatus
+ android.hardware.automotive.vehicle@2.0::types.FuelSystemStatus
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1219,7 +1257,7 @@
#
# Build types.hal (FuelType)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/FuelType.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/FuelType.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1229,7 +1267,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.FuelType
+ android.hardware.automotive.vehicle@2.0::types.FuelType
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1238,7 +1276,7 @@
#
# Build types.hal (IgnitionMonitorKind)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/IgnitionMonitorKind.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/IgnitionMonitorKind.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1248,7 +1286,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.IgnitionMonitorKind
+ android.hardware.automotive.vehicle@2.0::types.IgnitionMonitorKind
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1257,7 +1295,7 @@
#
# Build types.hal (Obd2FloatSensorIndex)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/Obd2FloatSensorIndex.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2FloatSensorIndex.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1267,7 +1305,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.Obd2FloatSensorIndex
+ android.hardware.automotive.vehicle@2.0::types.Obd2FloatSensorIndex
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1276,7 +1314,7 @@
#
# Build types.hal (Obd2IntegerSensorIndex)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/Obd2IntegerSensorIndex.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2IntegerSensorIndex.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1286,7 +1324,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.Obd2IntegerSensorIndex
+ android.hardware.automotive.vehicle@2.0::types.Obd2IntegerSensorIndex
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1295,7 +1333,7 @@
#
# Build types.hal (SecondaryAirStatus)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/SecondaryAirStatus.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/SecondaryAirStatus.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1305,7 +1343,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.SecondaryAirStatus
+ android.hardware.automotive.vehicle@2.0::types.SecondaryAirStatus
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1314,7 +1352,7 @@
#
# Build types.hal (SparkIgnitionMonitors)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/SparkIgnitionMonitors.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/SparkIgnitionMonitors.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1324,7 +1362,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.SparkIgnitionMonitors
+ android.hardware.automotive.vehicle@2.0::types.SparkIgnitionMonitors
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1333,7 +1371,7 @@
#
# Build types.hal (StatusCode)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/StatusCode.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/StatusCode.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1343,7 +1381,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.StatusCode
+ android.hardware.automotive.vehicle@2.0::types.StatusCode
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1352,7 +1390,7 @@
#
# Build types.hal (SubscribeFlags)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/SubscribeFlags.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/SubscribeFlags.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1362,7 +1400,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.SubscribeFlags
+ android.hardware.automotive.vehicle@2.0::types.SubscribeFlags
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1371,7 +1409,7 @@
#
# Build types.hal (SubscribeOptions)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/SubscribeOptions.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/SubscribeOptions.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1381,7 +1419,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.SubscribeOptions
+ android.hardware.automotive.vehicle@2.0::types.SubscribeOptions
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1390,7 +1428,7 @@
#
# Build types.hal (VehicleApPowerBootupReason)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleApPowerBootupReason.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleApPowerBootupReason.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1400,7 +1438,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleApPowerBootupReason
+ android.hardware.automotive.vehicle@2.0::types.VehicleApPowerBootupReason
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1409,7 +1447,7 @@
#
# Build types.hal (VehicleApPowerSetState)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleApPowerSetState.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleApPowerSetState.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1419,7 +1457,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleApPowerSetState
+ android.hardware.automotive.vehicle@2.0::types.VehicleApPowerSetState
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1428,7 +1466,7 @@
#
# Build types.hal (VehicleApPowerState)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleApPowerState.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleApPowerState.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1438,7 +1476,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleApPowerState
+ android.hardware.automotive.vehicle@2.0::types.VehicleApPowerState
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1447,7 +1485,7 @@
#
# Build types.hal (VehicleApPowerStateConfigFlag)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleApPowerStateConfigFlag.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleApPowerStateConfigFlag.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1457,7 +1495,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleApPowerStateConfigFlag
+ android.hardware.automotive.vehicle@2.0::types.VehicleApPowerStateConfigFlag
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1466,7 +1504,7 @@
#
# Build types.hal (VehicleApPowerStateIndex)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleApPowerStateIndex.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleApPowerStateIndex.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1476,7 +1514,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleApPowerStateIndex
+ android.hardware.automotive.vehicle@2.0::types.VehicleApPowerStateIndex
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1485,7 +1523,7 @@
#
# Build types.hal (VehicleApPowerStateShutdownParam)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleApPowerStateShutdownParam.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleApPowerStateShutdownParam.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1495,7 +1533,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleApPowerStateShutdownParam
+ android.hardware.automotive.vehicle@2.0::types.VehicleApPowerStateShutdownParam
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1504,7 +1542,7 @@
#
# Build types.hal (VehicleArea)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleArea.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleArea.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1514,7 +1552,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleArea
+ android.hardware.automotive.vehicle@2.0::types.VehicleArea
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1523,7 +1561,7 @@
#
# Build types.hal (VehicleAreaConfig)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleAreaConfig.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAreaConfig.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1533,7 +1571,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleAreaConfig
+ android.hardware.automotive.vehicle@2.0::types.VehicleAreaConfig
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1542,7 +1580,7 @@
#
# Build types.hal (VehicleAreaDoor)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleAreaDoor.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAreaDoor.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1552,7 +1590,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleAreaDoor
+ android.hardware.automotive.vehicle@2.0::types.VehicleAreaDoor
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1561,7 +1599,7 @@
#
# Build types.hal (VehicleAreaMirror)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleAreaMirror.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAreaMirror.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1571,7 +1609,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleAreaMirror
+ android.hardware.automotive.vehicle@2.0::types.VehicleAreaMirror
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1580,7 +1618,7 @@
#
# Build types.hal (VehicleAreaSeat)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleAreaSeat.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAreaSeat.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1590,7 +1628,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleAreaSeat
+ android.hardware.automotive.vehicle@2.0::types.VehicleAreaSeat
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1599,7 +1637,7 @@
#
# Build types.hal (VehicleAreaWindow)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleAreaWindow.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAreaWindow.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1609,7 +1647,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleAreaWindow
+ android.hardware.automotive.vehicle@2.0::types.VehicleAreaWindow
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1618,7 +1656,7 @@
#
# Build types.hal (VehicleAreaZone)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleAreaZone.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAreaZone.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1628,7 +1666,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleAreaZone
+ android.hardware.automotive.vehicle@2.0::types.VehicleAreaZone
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1637,7 +1675,7 @@
#
# Build types.hal (VehicleAudioContextFlag)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleAudioContextFlag.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioContextFlag.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1647,7 +1685,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleAudioContextFlag
+ android.hardware.automotive.vehicle@2.0::types.VehicleAudioContextFlag
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1656,7 +1694,7 @@
#
# Build types.hal (VehicleAudioExtFocusFlag)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleAudioExtFocusFlag.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioExtFocusFlag.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1666,7 +1704,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleAudioExtFocusFlag
+ android.hardware.automotive.vehicle@2.0::types.VehicleAudioExtFocusFlag
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1675,7 +1713,7 @@
#
# Build types.hal (VehicleAudioFocusIndex)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleAudioFocusIndex.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioFocusIndex.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1685,7 +1723,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleAudioFocusIndex
+ android.hardware.automotive.vehicle@2.0::types.VehicleAudioFocusIndex
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1694,7 +1732,7 @@
#
# Build types.hal (VehicleAudioFocusRequest)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleAudioFocusRequest.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioFocusRequest.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1704,7 +1742,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleAudioFocusRequest
+ android.hardware.automotive.vehicle@2.0::types.VehicleAudioFocusRequest
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1713,7 +1751,7 @@
#
# Build types.hal (VehicleAudioFocusState)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleAudioFocusState.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioFocusState.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1723,7 +1761,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleAudioFocusState
+ android.hardware.automotive.vehicle@2.0::types.VehicleAudioFocusState
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1732,7 +1770,7 @@
#
# Build types.hal (VehicleAudioHwVariantConfigFlag)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleAudioHwVariantConfigFlag.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioHwVariantConfigFlag.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1742,7 +1780,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleAudioHwVariantConfigFlag
+ android.hardware.automotive.vehicle@2.0::types.VehicleAudioHwVariantConfigFlag
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1751,7 +1789,7 @@
#
# Build types.hal (VehicleAudioRoutingPolicyIndex)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleAudioRoutingPolicyIndex.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioRoutingPolicyIndex.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1761,7 +1799,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleAudioRoutingPolicyIndex
+ android.hardware.automotive.vehicle@2.0::types.VehicleAudioRoutingPolicyIndex
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1770,7 +1808,7 @@
#
# Build types.hal (VehicleAudioStream)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleAudioStream.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioStream.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1780,7 +1818,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleAudioStream
+ android.hardware.automotive.vehicle@2.0::types.VehicleAudioStream
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1789,7 +1827,7 @@
#
# Build types.hal (VehicleAudioStreamFlag)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleAudioStreamFlag.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioStreamFlag.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1799,7 +1837,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleAudioStreamFlag
+ android.hardware.automotive.vehicle@2.0::types.VehicleAudioStreamFlag
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1808,7 +1846,7 @@
#
# Build types.hal (VehicleAudioVolumeCapabilityFlag)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleAudioVolumeCapabilityFlag.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioVolumeCapabilityFlag.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1818,7 +1856,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleAudioVolumeCapabilityFlag
+ android.hardware.automotive.vehicle@2.0::types.VehicleAudioVolumeCapabilityFlag
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1827,7 +1865,7 @@
#
# Build types.hal (VehicleAudioVolumeIndex)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleAudioVolumeIndex.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioVolumeIndex.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1837,7 +1875,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleAudioVolumeIndex
+ android.hardware.automotive.vehicle@2.0::types.VehicleAudioVolumeIndex
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1846,7 +1884,7 @@
#
# Build types.hal (VehicleAudioVolumeLimitIndex)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleAudioVolumeLimitIndex.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioVolumeLimitIndex.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1856,7 +1894,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleAudioVolumeLimitIndex
+ android.hardware.automotive.vehicle@2.0::types.VehicleAudioVolumeLimitIndex
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1865,7 +1903,7 @@
#
# Build types.hal (VehicleAudioVolumeState)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleAudioVolumeState.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioVolumeState.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1875,7 +1913,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleAudioVolumeState
+ android.hardware.automotive.vehicle@2.0::types.VehicleAudioVolumeState
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1884,7 +1922,7 @@
#
# Build types.hal (VehicleDisplay)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleDisplay.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleDisplay.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1894,7 +1932,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleDisplay
+ android.hardware.automotive.vehicle@2.0::types.VehicleDisplay
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1903,7 +1941,7 @@
#
# Build types.hal (VehicleDrivingStatus)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleDrivingStatus.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleDrivingStatus.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1913,7 +1951,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleDrivingStatus
+ android.hardware.automotive.vehicle@2.0::types.VehicleDrivingStatus
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1922,7 +1960,7 @@
#
# Build types.hal (VehicleGear)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleGear.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleGear.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1932,7 +1970,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleGear
+ android.hardware.automotive.vehicle@2.0::types.VehicleGear
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1941,7 +1979,7 @@
#
# Build types.hal (VehicleHvacFanDirection)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleHvacFanDirection.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleHvacFanDirection.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1951,7 +1989,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleHvacFanDirection
+ android.hardware.automotive.vehicle@2.0::types.VehicleHvacFanDirection
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1960,7 +1998,7 @@
#
# Build types.hal (VehicleHwKeyInputAction)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleHwKeyInputAction.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleHwKeyInputAction.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1970,7 +2008,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleHwKeyInputAction
+ android.hardware.automotive.vehicle@2.0::types.VehicleHwKeyInputAction
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1979,7 +2017,7 @@
#
# Build types.hal (VehicleIgnitionState)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleIgnitionState.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleIgnitionState.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1989,7 +2027,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleIgnitionState
+ android.hardware.automotive.vehicle@2.0::types.VehicleIgnitionState
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1998,7 +2036,7 @@
#
# Build types.hal (VehicleInstrumentClusterType)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleInstrumentClusterType.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleInstrumentClusterType.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2008,7 +2046,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleInstrumentClusterType
+ android.hardware.automotive.vehicle@2.0::types.VehicleInstrumentClusterType
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -2017,7 +2055,7 @@
#
# Build types.hal (VehiclePropConfig)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehiclePropConfig.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehiclePropConfig.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2027,7 +2065,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehiclePropConfig
+ android.hardware.automotive.vehicle@2.0::types.VehiclePropConfig
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -2036,7 +2074,7 @@
#
# Build types.hal (VehiclePropValue)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehiclePropValue.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehiclePropValue.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2046,7 +2084,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehiclePropValue
+ android.hardware.automotive.vehicle@2.0::types.VehiclePropValue
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -2055,7 +2093,7 @@
#
# Build types.hal (VehicleProperty)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleProperty.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleProperty.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2065,7 +2103,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleProperty
+ android.hardware.automotive.vehicle@2.0::types.VehicleProperty
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -2074,7 +2112,7 @@
#
# Build types.hal (VehiclePropertyAccess)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehiclePropertyAccess.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehiclePropertyAccess.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2084,7 +2122,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehiclePropertyAccess
+ android.hardware.automotive.vehicle@2.0::types.VehiclePropertyAccess
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -2093,7 +2131,7 @@
#
# Build types.hal (VehiclePropertyChangeMode)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehiclePropertyChangeMode.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehiclePropertyChangeMode.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2103,7 +2141,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehiclePropertyChangeMode
+ android.hardware.automotive.vehicle@2.0::types.VehiclePropertyChangeMode
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -2112,7 +2150,7 @@
#
# Build types.hal (VehiclePropertyGroup)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehiclePropertyGroup.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehiclePropertyGroup.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2122,7 +2160,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehiclePropertyGroup
+ android.hardware.automotive.vehicle@2.0::types.VehiclePropertyGroup
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -2131,7 +2169,7 @@
#
# Build types.hal (VehiclePropertyOperation)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehiclePropertyOperation.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehiclePropertyOperation.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2141,7 +2179,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehiclePropertyOperation
+ android.hardware.automotive.vehicle@2.0::types.VehiclePropertyOperation
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -2150,7 +2188,7 @@
#
# Build types.hal (VehiclePropertyType)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehiclePropertyType.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehiclePropertyType.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2160,7 +2198,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehiclePropertyType
+ android.hardware.automotive.vehicle@2.0::types.VehiclePropertyType
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -2169,7 +2207,7 @@
#
# Build types.hal (VehicleRadioConstants)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleRadioConstants.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleRadioConstants.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2179,7 +2217,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleRadioConstants
+ android.hardware.automotive.vehicle@2.0::types.VehicleRadioConstants
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -2188,7 +2226,7 @@
#
# Build types.hal (VehicleTurnSignal)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleTurnSignal.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleTurnSignal.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2198,7 +2236,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleTurnSignal
+ android.hardware.automotive.vehicle@2.0::types.VehicleTurnSignal
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -2207,7 +2245,7 @@
#
# Build types.hal (VehicleUnit)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/VehicleUnit.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleUnit.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2217,7 +2255,45 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.VehicleUnit
+ android.hardware.automotive.vehicle@2.0::types.VehicleUnit
+
+$(GEN): $(LOCAL_PATH)/types.hal
+ $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+
+#
+# Build types.hal (VmsMessageIntegerValuesIndex)
+#
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsMessageIntegerValuesIndex.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
+ android.hardware.automotive.vehicle@2.0::types.VmsMessageIntegerValuesIndex
+
+$(GEN): $(LOCAL_PATH)/types.hal
+ $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+
+#
+# Build types.hal (VmsMessageType)
+#
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsMessageType.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
+ android.hardware.automotive.vehicle@2.0::types.VmsMessageType
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -2226,7 +2302,7 @@
#
# Build types.hal (Wheel)
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/Wheel.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Wheel.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2236,7 +2312,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::types.Wheel
+ android.hardware.automotive.vehicle@2.0::types.Wheel
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -2245,7 +2321,7 @@
#
# Build IVehicle.hal
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/IVehicle.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/IVehicle.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IVehicle.hal
@@ -2259,7 +2335,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::IVehicle
+ android.hardware.automotive.vehicle@2.0::IVehicle
$(GEN): $(LOCAL_PATH)/IVehicle.hal
$(transform-generated-source)
@@ -2268,7 +2344,7 @@
#
# Build IVehicleCallback.hal
#
-GEN := $(intermediates)/android/hardware/vehicle/V2_0/IVehicleCallback.java
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/IVehicleCallback.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IVehicleCallback.hal
@@ -2280,7 +2356,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.vehicle@2.0::IVehicleCallback
+ android.hardware.automotive.vehicle@2.0::IVehicleCallback
$(GEN): $(LOCAL_PATH)/IVehicleCallback.hal
$(transform-generated-source)
diff --git a/vehicle/2.0/IVehicle.hal b/automotive/vehicle/2.0/IVehicle.hal
similarity index 95%
rename from vehicle/2.0/IVehicle.hal
rename to automotive/vehicle/2.0/IVehicle.hal
index cab6ce0..5de416f 100644
--- a/vehicle/2.0/IVehicle.hal
+++ b/automotive/vehicle/2.0/IVehicle.hal
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.hardware.vehicle@2.0;
+package android.hardware.automotive.vehicle@2.0;
import IVehicleCallback;
@@ -32,7 +32,7 @@
* StatusCode::INVALID_ARG, otherwise a list of vehicle property
* configurations with StatusCode::OK
*/
- getPropConfigs(vec<VehicleProperty> props)
+ getPropConfigs(vec<int32_t> props)
generates (StatusCode status, vec<VehiclePropConfig> propConfigs);
/**
@@ -84,7 +84,7 @@
* If this client wasn't subscribed to the given property, this method
* must return StatusCode::INVALID_ARG.
*/
- unsubscribe(IVehicleCallback callback, VehicleProperty propId)
+ unsubscribe(IVehicleCallback callback, int32_t propId)
generates (StatusCode status);
/**
diff --git a/vehicle/2.0/IVehicleCallback.hal b/automotive/vehicle/2.0/IVehicleCallback.hal
similarity index 95%
rename from vehicle/2.0/IVehicleCallback.hal
rename to automotive/vehicle/2.0/IVehicleCallback.hal
index e7e05bf..167e5e1 100644
--- a/vehicle/2.0/IVehicleCallback.hal
+++ b/automotive/vehicle/2.0/IVehicleCallback.hal
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.hardware.vehicle@2.0;
+package android.hardware.automotive.vehicle@2.0;
interface IVehicleCallback {
@@ -54,6 +54,6 @@
* occurred, must be 0 for global properties
*/
oneway onPropertySetError(StatusCode errorCode,
- VehicleProperty propId,
+ int32_t propId,
int32_t areaId);
};
diff --git a/automotive/vehicle/2.0/default/Android.mk b/automotive/vehicle/2.0/default/Android.mk
new file mode 100644
index 0000000..324be51
--- /dev/null
+++ b/automotive/vehicle/2.0/default/Android.mk
@@ -0,0 +1,165 @@
+# Copyright (C) 2016 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.
+
+LOCAL_PATH := $(call my-dir)
+
+vhal_v2_0 = android.hardware.automotive.vehicle@2.0
+
+###############################################################################
+# Vehicle reference implementation lib
+###############################################################################
+include $(CLEAR_VARS)
+LOCAL_MODULE := $(vhal_v2_0)-manager-lib
+LOCAL_SRC_FILES := \
+ common/src/AccessControlConfigParser.cpp \
+ common/src/Obd2SensorStore.cpp \
+ common/src/SubscriptionManager.cpp \
+ common/src/VehicleHalManager.cpp \
+ common/src/VehicleObjectPool.cpp \
+ common/src/VehicleUtils.cpp \
+
+LOCAL_C_INCLUDES := \
+ $(LOCAL_PATH)/common/include/vhal_v2_0
+
+LOCAL_EXPORT_C_INCLUDE_DIRS := \
+ $(LOCAL_PATH)/common/include
+
+LOCAL_SHARED_LIBRARIES := \
+ libbinder \
+ libhidlbase \
+ libhidltransport \
+ libhwbinder \
+ liblog \
+ libutils \
+ $(vhal_v2_0) \
+
+include $(BUILD_STATIC_LIBRARY)
+
+###############################################################################
+# Vehicle HAL Protobuf library
+###############################################################################
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES := $(call all-proto-files-under, impl/vhal_v2_0/proto)
+
+LOCAL_PROTOC_OPTIMIZE_TYPE := nano
+
+LOCAL_MODULE := $(vhal_v2_0)-libproto-native
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_STRIP_MODULE := keep_symbols
+
+generated_sources_dir := $(call local-generated-sources-dir)
+LOCAL_EXPORT_C_INCLUDE_DIRS := \
+ $(generated_sources_dir)/proto/$(LOCAL_PATH)/impl/vhal_v2_0/proto
+
+include $(BUILD_STATIC_LIBRARY)
+
+
+###############################################################################
+# Vehicle default VehicleHAL implementation
+###############################################################################
+include $(CLEAR_VARS)
+
+LOCAL_MODULE:= $(vhal_v2_0)-default-impl-lib
+LOCAL_SRC_FILES:= \
+ impl/vhal_v2_0/DefaultVehicleHal.cpp \
+
+LOCAL_C_INCLUDES := \
+ $(LOCAL_PATH)/impl/vhal_v2_0
+
+LOCAL_EXPORT_C_INCLUDE_DIRS := \
+ $(LOCAL_PATH)/impl
+
+LOCAL_WHOLE_STATIC_LIBRARIES := \
+ $(vhal_v2_0)-manager-lib \
+
+LOCAL_SHARED_LIBRARIES := \
+ libbinder \
+ libhidlbase \
+ libhidltransport \
+ libhwbinder \
+ liblog \
+ libprotobuf-cpp-lite \
+ libutils \
+ $(vhal_v2_0) \
+
+LOCAL_STATIC_LIBRARIES := \
+ $(vhal_v2_0)-libproto-native \
+
+include $(BUILD_STATIC_LIBRARY)
+
+
+###############################################################################
+# Vehicle reference implementation unit tests
+###############################################################################
+include $(CLEAR_VARS)
+
+LOCAL_MODULE:= $(vhal_v2_0)-manager-unit-tests
+
+LOCAL_WHOLE_STATIC_LIBRARIES := \
+ $(vhal_v2_0)-manager-lib \
+
+LOCAL_SRC_FILES:= \
+ tests/AccessControlConfigParser_test.cpp \
+ tests/Obd2SensorStore_test.cpp \
+ tests/SubscriptionManager_test.cpp \
+ tests/VehicleHalManager_test.cpp \
+ tests/VehicleObjectPool_test.cpp \
+ tests/VehiclePropConfigIndex_test.cpp \
+
+LOCAL_SHARED_LIBRARIES := \
+ libbinder \
+ libhidlbase \
+ libhidltransport \
+ libhwbinder \
+ liblog \
+ libutils \
+ $(vhal_v2_0) \
+
+LOCAL_CFLAGS += -Wall -Wextra
+LOCAL_MODULE_TAGS := tests
+
+include $(BUILD_NATIVE_TEST)
+
+
+###############################################################################
+# Vehicle HAL service
+###############################################################################
+include $(CLEAR_VARS)
+LOCAL_MODULE := $(vhal_v2_0)-service
+LOCAL_INIT_RC := $(vhal_v2_0)-service.rc
+LOCAL_PROPRIETARY_MODULE := true
+LOCAL_MODULE_RELATIVE_PATH := hw
+
+LOCAL_SRC_FILES := \
+ VehicleService.cpp
+
+LOCAL_SHARED_LIBRARIES := \
+ libbinder \
+ libhidlbase \
+ libhidltransport \
+ libhwbinder \
+ liblog \
+ libprotobuf-cpp-lite \
+ libutils \
+ $(vhal_v2_0) \
+
+LOCAL_STATIC_LIBRARIES := \
+ $(vhal_v2_0)-manager-lib \
+ $(vhal_v2_0)-default-impl-lib \
+ $(vhal_v2_0)-libproto-native \
+
+include $(BUILD_EXECUTABLE)
diff --git a/vehicle/2.0/default/VehicleService.cpp b/automotive/vehicle/2.0/default/VehicleService.cpp
similarity index 85%
rename from vehicle/2.0/default/VehicleService.cpp
rename to automotive/vehicle/2.0/default/VehicleService.cpp
index 493df74..f88ce7b 100644
--- a/vehicle/2.0/default/VehicleService.cpp
+++ b/automotive/vehicle/2.0/default/VehicleService.cpp
@@ -14,19 +14,18 @@
* limitations under the License.
*/
-#define LOG_TAG "android.hardware.vehicle@2.0-service"
+#define LOG_TAG "automotive.vehicle@2.0-service"
#include <android/log.h>
#include <hidl/HidlTransportSupport.h>
#include <iostream>
-
-#include <vehicle_hal_manager/VehicleHalManager.h>
-#include <impl/DefaultVehicleHal.h>
+#include <vhal_v2_0/VehicleHalManager.h>
+#include <vhal_v2_0/DefaultVehicleHal.h>
using namespace android;
using namespace android::hardware;
-using namespace android::hardware::vehicle::V2_0;
+using namespace android::hardware::automotive::vehicle::V2_0;
int main(int /* argc */, char* /* argv */ []) {
auto hal = std::make_unique<impl::DefaultVehicleHal>();
diff --git a/automotive/vehicle/2.0/default/android.hardware.automotive.vehicle@2.0-service.rc b/automotive/vehicle/2.0/default/android.hardware.automotive.vehicle@2.0-service.rc
new file mode 100644
index 0000000..30e249e
--- /dev/null
+++ b/automotive/vehicle/2.0/default/android.hardware.automotive.vehicle@2.0-service.rc
@@ -0,0 +1,4 @@
+service vehicle-hal-2.0 /vendor/bin/hw/android.hardware.automotive.vehicle@2.0-service
+ class hal
+ user vehicle_network
+ group system inet
diff --git a/vehicle/2.0/default/vehicle_hal_manager/AccessControlConfigParser.h b/automotive/vehicle/2.0/default/common/include/vhal_v2_0/AccessControlConfigParser.h
similarity index 80%
rename from vehicle/2.0/default/vehicle_hal_manager/AccessControlConfigParser.h
rename to automotive/vehicle/2.0/default/common/include/vhal_v2_0/AccessControlConfigParser.h
index 5cd0c3e..8ef6f5a 100644
--- a/vehicle/2.0/default/vehicle_hal_manager/AccessControlConfigParser.h
+++ b/automotive/vehicle/2.0/default/common/include/vhal_v2_0/AccessControlConfigParser.h
@@ -14,28 +14,29 @@
* limitations under the License.
*/
-#ifndef android_hardware_vehicle_V2_0_AccessControlConfigParser_H_
-#define android_hardware_vehicle_V2_0_AccessControlConfigParser_H_
+#ifndef android_hardware_automotive_vehicle_V2_0_AccessControlConfigParser_H_
+#define android_hardware_automotive_vehicle_V2_0_AccessControlConfigParser_H_
#include <string>
#include <vector>
#include <unordered_map>
#include <list>
-#include <android/hardware/vehicle/2.0/types.h>
+#include <android/hardware/automotive/vehicle/2.0/types.h>
namespace android {
namespace hardware {
+namespace automotive {
namespace vehicle {
namespace V2_0 {
struct PropertyAcl {
- VehicleProperty propId;
+ int32_t propId;
unsigned uid;
VehiclePropertyAccess access;
};
-using PropertyAclMap = std::unordered_multimap<VehicleProperty, PropertyAcl>;
+using PropertyAclMap = std::unordered_multimap<int32_t, PropertyAcl>;
/**
* Parser for per-property access control in vehicle HAL.
@@ -64,7 +65,7 @@
*
* @param properties - properties supported by HAL implementation
*/
- AccessControlConfigParser(const std::vector<VehicleProperty>& properties);
+ AccessControlConfigParser(const std::vector<int32_t>& properties);
/**
* Parses config content from given stream and writes results to
@@ -81,7 +82,7 @@
bool parsePropertyId(const std::string& strPropId,
VehiclePropertyGroup propertyGroup,
- VehicleProperty* outVehicleProperty) const;
+ int32_t* outVehicleProperty) const;
bool parseUid(const std::string& strUid, unsigned* outUid) const;
@@ -100,12 +101,13 @@
// aliases.
// Map property ids w/o TYPE and AREA to VehicleProperty.
- std::unordered_map<int, VehicleProperty> mStrippedToVehiclePropertyMap;
+ std::unordered_map<int32_t, int32_t> mStrippedToVehiclePropertyMap;
};
} // namespace V2_0
} // namespace vehicle
+} // namespace automotive
} // namespace hardware
} // namespace android
-#endif // android_hardware_vehicle_V2_0_AccessControlConfigParser_H_
+#endif // android_hardware_automotive_vehicle_V2_0_AccessControlConfigParser_H_
diff --git a/vehicle/2.0/default/vehicle_hal_manager/ConcurrentQueue.h b/automotive/vehicle/2.0/default/common/include/vhal_v2_0/ConcurrentQueue.h
similarity index 94%
rename from vehicle/2.0/default/vehicle_hal_manager/ConcurrentQueue.h
rename to automotive/vehicle/2.0/default/common/include/vhal_v2_0/ConcurrentQueue.h
index 8f575dc..b63429f 100644
--- a/vehicle/2.0/default/vehicle_hal_manager/ConcurrentQueue.h
+++ b/automotive/vehicle/2.0/default/common/include/vhal_v2_0/ConcurrentQueue.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef android_hardware_vehicle_V2_0_ConcurrentQueue_H_
-#define android_hardware_vehicle_V2_0_ConcurrentQueue_H_
+#ifndef android_hardware_automotive_vehicle_V2_0_ConcurrentQueue_H_
+#define android_hardware_automotive_vehicle_V2_0_ConcurrentQueue_H_
#include <queue>
#include <atomic>
@@ -153,4 +153,4 @@
} // namespace android
-#endif //android_hardware_vehicle_V2_0_ConcurrentQueue_H_
+#endif //android_hardware_automotive_vehicle_V2_0_ConcurrentQueue_H_
diff --git a/automotive/vehicle/2.0/default/common/include/vhal_v2_0/Obd2SensorStore.h b/automotive/vehicle/2.0/default/common/include/vhal_v2_0/Obd2SensorStore.h
new file mode 100644
index 0000000..fe231be
--- /dev/null
+++ b/automotive/vehicle/2.0/default/common/include/vhal_v2_0/Obd2SensorStore.h
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2017 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.
+ */
+
+#ifndef android_hardware_automotive_vehicle_V2_0_Obd2SensorStore_H_
+#define android_hardware_automotive_vehicle_V2_0_Obd2SensorStore_H_
+
+#include <vector>
+
+#include "VehicleHal.h"
+
+namespace android {
+namespace hardware {
+namespace automotive {
+namespace vehicle {
+namespace V2_0 {
+
+// This class wraps all the logic required to create an OBD2 frame.
+// It allows storing sensor values, setting appropriate bitmasks as needed,
+// and returning appropriately laid out storage of sensor values suitable
+// for being returned via a VehicleHal implementation.
+class Obd2SensorStore {
+public:
+ // Creates a sensor storage with a given number of vendor-specific sensors.
+ Obd2SensorStore(size_t numVendorIntegerSensors,
+ size_t numVendorFloatSensors);
+
+ // Stores an integer-valued sensor.
+ StatusCode setIntegerSensor(Obd2IntegerSensorIndex index, int32_t value);
+ // Stores an integer-valued sensor.
+ StatusCode setIntegerSensor(size_t index, int32_t value);
+
+ // Stores a float-valued sensor.
+ StatusCode setFloatSensor(Obd2FloatSensorIndex index, float value);
+ // Stores a float-valued sensor.
+ StatusCode setFloatSensor(size_t index, float value);
+
+ // Returns a vector that contains all integer sensors stored.
+ const std::vector<int32_t>& getIntegerSensors() const;
+ // Returns a vector that contains all float sensors stored.
+ const std::vector<float>& getFloatSensors() const;
+ // Returns a vector that contains a bitmask for all stored sensors.
+ const std::vector<uint8_t>& getSensorsBitmask() const;
+
+ // Given a stringValue, fill in a VehiclePropValue
+ void fillPropValue(VehiclePropValue *propValue,
+ std::string dtc) const;
+
+private:
+ class BitmaskInVector {
+ public:
+ BitmaskInVector(size_t numBits = 0);
+ void resize(size_t numBits);
+ bool get(size_t index) const;
+ void set(size_t index, bool value);
+
+ const std::vector<uint8_t>& getBitmask() const;
+
+ private:
+ std::vector<uint8_t> mStorage;
+ };
+
+ std::vector<int32_t> mIntegerSensors;
+ std::vector<float> mFloatSensors;
+ BitmaskInVector mSensorsBitmask;
+};
+
+} // namespace V2_0
+} // namespace vehicle
+} // namespace automotive
+} // namespace hardware
+} // namespace android
+
+#endif // android_hardware_automotive_vehicle_V2_0_Obd2SensorStore_H_
diff --git a/vehicle/2.0/default/vehicle_hal_manager/SubscriptionManager.h b/automotive/vehicle/2.0/default/common/include/vhal_v2_0/SubscriptionManager.h
similarity index 81%
rename from vehicle/2.0/default/vehicle_hal_manager/SubscriptionManager.h
rename to automotive/vehicle/2.0/default/common/include/vhal_v2_0/SubscriptionManager.h
index 9f2ed8d..6a12b77 100644
--- a/vehicle/2.0/default/vehicle_hal_manager/SubscriptionManager.h
+++ b/automotive/vehicle/2.0/default/common/include/vhal_v2_0/SubscriptionManager.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef android_hardware_vehicle_V2_0_SubscriptionManager_H_
-#define android_hardware_vehicle_V2_0_SubscriptionManager_H_
+#ifndef android_hardware_automotive_vehicle_V2_0_SubscriptionManager_H_
+#define android_hardware_automotive_vehicle_V2_0_SubscriptionManager_H_
#include <memory>
#include <map>
@@ -25,13 +25,14 @@
#include <android/log.h>
#include <hwbinder/IPCThreadState.h>
-#include <android/hardware/vehicle/2.0/IVehicle.h>
+#include <android/hardware/automotive/vehicle/2.0/IVehicle.h>
#include "ConcurrentQueue.h"
#include "VehicleObjectPool.h"
namespace android {
namespace hardware {
+namespace automotive {
namespace vehicle {
namespace V2_0 {
@@ -50,7 +51,7 @@
void addOrUpdateSubscription(const SubscribeOptions &opts);
- bool isSubscribed(VehicleProperty propId,
+ bool isSubscribed(int32_t propId,
int32_t areaId,
SubscribeFlags flags);
@@ -59,7 +60,7 @@
const int32_t mPid;
const int32_t mUid;
- std::map<VehicleProperty, SubscribeOptions> mSubscriptions;
+ std::map<int32_t, SubscribeOptions> mSubscriptions;
};
class HalClientVector : private SortedVector<sp<HalClient>> , public RefBase {
@@ -103,26 +104,26 @@
SubscribeFlags flags) const;
std::list<sp<HalClient>> getSubscribedClients(
- VehicleProperty propId, int32_t area, SubscribeFlags flags) const;
+ int32_t propId, int32_t area, SubscribeFlags flags) const;
/**
* Returns true the client was unsubscribed successfully and there are
* no more clients subscribed to given propId.
*/
bool unsubscribe(const sp<IVehicleCallback>& callback,
- VehicleProperty propId);
+ int32_t propId);
private:
std::list<sp< HalClient>> getSubscribedClientsLocked(
- VehicleProperty propId, int32_t area, SubscribeFlags flags) const;
+ int32_t propId, int32_t area, SubscribeFlags flags) const;
bool updateHalEventSubscriptionLocked(const SubscribeOptions &opts,
SubscribeOptions *out);
- void addClientToPropMapLocked(VehicleProperty propId,
+ void addClientToPropMapLocked(int32_t propId,
const sp<HalClient> &client);
sp<HalClientVector> getClientsForPropertyLocked(
- VehicleProperty propId) const;
+ int32_t propId) const;
sp<HalClient> getOrCreateHalClientLocked(
const sp<IVehicleCallback> &callback);
@@ -133,15 +134,16 @@
mutable std::mutex mLock;
std::map<sp<IVehicleCallback>, sp<HalClient>> mClients;
- std::map<VehicleProperty, sp<HalClientVector>> mPropToClients;
- std::map<VehicleProperty, SubscribeOptions> mHalEventSubscribeOptions;
+ std::map<int32_t, sp<HalClientVector>> mPropToClients;
+ std::map<int32_t, SubscribeOptions> mHalEventSubscribeOptions;
};
} // namespace V2_0
} // namespace vehicle
+} // namespace automotive
} // namespace hardware
} // namespace android
-#endif // android_hardware_vehicle_V2_0_SubscriptionManager_H_
+#endif // android_hardware_automotive_vehicle_V2_0_SubscriptionManager_H_
diff --git a/vehicle/2.0/default/VehicleHal.h b/automotive/vehicle/2.0/default/common/include/vhal_v2_0/VehicleHal.h
similarity index 80%
rename from vehicle/2.0/default/VehicleHal.h
rename to automotive/vehicle/2.0/default/common/include/vhal_v2_0/VehicleHal.h
index 2807f28..8203a1e 100644
--- a/vehicle/2.0/default/VehicleHal.h
+++ b/automotive/vehicle/2.0/default/common/include/vhal_v2_0/VehicleHal.h
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-#ifndef android_hardware_vehicle_V2_0_VehicleHal_H_
-#define android_hardware_vehicle_V2_0_VehicleHal_H_
+#ifndef android_hardware_automotive_vehicle_V2_0_VehicleHal_H
+#define android_hardware_automotive_vehicle_V2_0_VehicleHal_H
-#include <android/hardware/vehicle/2.0/IVehicle.h>
-#include "vehicle_hal_manager/VehicleObjectPool.h"
-
+#include <android/hardware/automotive/vehicle/2.0/IVehicle.h>
+#include "VehicleObjectPool.h"
namespace android {
namespace hardware {
+namespace automotive {
namespace vehicle {
namespace V2_0 {
@@ -36,7 +36,7 @@
using HalEventFunction = std::function<void(VehiclePropValuePtr)>;
using HalErrorFunction = std::function<void(
- StatusCode errorCode, VehicleProperty property, int32_t areaId)>;
+ StatusCode errorCode, int32_t property, int32_t areaId)>;
virtual ~VehicleHal() {}
@@ -57,16 +57,16 @@
* rate, e.g. for properties with
* VehiclePropertyChangeMode::CONTINUOUS
*/
- virtual StatusCode subscribe(VehicleProperty property,
- int32_t areas,
- float sampleRate) = 0;
+ virtual StatusCode subscribe(int32_t property,
+ int32_t areas,
+ float sampleRate) = 0;
/**
* Unsubscribe from HAL events for given property
*
* @param property vehicle property to unsubscribe
*/
- virtual StatusCode unsubscribe(VehicleProperty property) = 0;
+ virtual StatusCode unsubscribe(int32_t property) = 0;
/**
* Override this method if you need to do one-time initialization.
@@ -95,7 +95,8 @@
/* Propagates error during set operation to the vehicle HAL clients. */
void doHalPropertySetError(StatusCode errorCode,
- VehicleProperty propId, int32_t areaId) {
+ int32_t propId,
+ int32_t areaId) {
mOnHalPropertySetError(errorCode, propId, areaId);
}
@@ -107,7 +108,8 @@
} // namespace V2_0
} // namespace vehicle
+} // namespace automotive
} // namespace hardware
} // namespace android
-#endif //android_hardware_vehicle_V2_0_VehicleHal_H_
+#endif //android_hardware_automotive_vehicle_V2_0_VehicleHal_H_
diff --git a/vehicle/2.0/default/vehicle_hal_manager/VehicleHalManager.h b/automotive/vehicle/2.0/default/common/include/vhal_v2_0/VehicleHalManager.h
similarity index 87%
rename from vehicle/2.0/default/vehicle_hal_manager/VehicleHalManager.h
rename to automotive/vehicle/2.0/default/common/include/vhal_v2_0/VehicleHalManager.h
index 6768741..4bff4d1 100644
--- a/vehicle/2.0/default/vehicle_hal_manager/VehicleHalManager.h
+++ b/automotive/vehicle/2.0/default/common/include/vhal_v2_0/VehicleHalManager.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef android_hardware_vehicle_V2_0_VehicleHalManager_H_
-#define android_hardware_vehicle_V2_0_VehicleHalManager_H_
+#ifndef android_hardware_automotive_vehicle_V2_0_VehicleHalManager_H_
+#define android_hardware_automotive_vehicle_V2_0_VehicleHalManager_H_
#include <inttypes.h>
#include <stdint.h>
@@ -26,7 +26,7 @@
#include <memory>
#include <set>
-#include <android/hardware/vehicle/2.0/IVehicle.h>
+#include <android/hardware/automotive/vehicle/2.0/IVehicle.h>
#include <hwbinder/IPCThreadState.h>
#include "AccessControlConfigParser.h"
@@ -38,6 +38,7 @@
namespace android {
namespace hardware {
+namespace automotive {
namespace vehicle {
namespace V2_0 {
@@ -66,7 +67,7 @@
// ---------------------------------------------------------------------------------------------
// Methods derived from IVehicle
Return<void> getAllPropConfigs(getAllPropConfigs_cb _hidl_cb) override;
- Return<void> getPropConfigs(const hidl_vec<VehicleProperty>& properties,
+ Return<void> getPropConfigs(const hidl_vec<int32_t>& properties,
getPropConfigs_cb _hidl_cb) override;
Return<void> get(const VehiclePropValue& requestedPropValue,
get_cb _hidl_cb) override;
@@ -74,7 +75,7 @@
Return<StatusCode> subscribe(const sp<IVehicleCallback>& callback,
const hidl_vec<SubscribeOptions>& options) override;
Return<StatusCode> unsubscribe(const sp<IVehicleCallback>& callback,
- VehicleProperty propId) override;
+ int32_t propId) override;
Return<void> debugDump(debugDump_cb _hidl_cb = nullptr) override;
private:
@@ -85,7 +86,7 @@
// ---------------------------------------------------------------------------------------------
// Events received from VehicleHal
void onHalEvent(VehiclePropValuePtr v);
- void onHalPropertySetError(StatusCode errorCode, VehicleProperty property,
+ void onHalPropertySetError(StatusCode errorCode, int32_t property,
int32_t areaId);
// ---------------------------------------------------------------------------------------------
@@ -94,14 +95,14 @@
void handlePropertySetEvent(const VehiclePropValue& value);
- const VehiclePropConfig* getPropConfigOrNull(VehicleProperty prop) const;
+ const VehiclePropConfig* getPropConfigOrNull(int32_t prop) const;
bool checkWritePermission(const VehiclePropConfig &config,
const Caller& callee) const;
bool checkReadPermission(const VehiclePropConfig &config,
const Caller& caller) const;
bool checkAcl(uid_t callerUid,
- VehicleProperty propertyId,
+ int32_t propertyId,
VehiclePropertyAccess requiredAccess) const;
static bool isSubscribable(const VehiclePropConfig& config,
@@ -130,8 +131,9 @@
} // namespace V2_0
} // namespace vehicle
+} // namespace automotive
} // namespace hardware
} // namespace android
-#endif // android_hardware_vehicle_V2_0_VehicleHalManager_H_
+#endif // android_hardware_automotive_vehicle_V2_0_VehicleHalManager_H_
diff --git a/vehicle/2.0/default/vehicle_hal_manager/VehicleObjectPool.h b/automotive/vehicle/2.0/default/common/include/vhal_v2_0/VehicleObjectPool.h
similarity index 95%
rename from vehicle/2.0/default/vehicle_hal_manager/VehicleObjectPool.h
rename to automotive/vehicle/2.0/default/common/include/vhal_v2_0/VehicleObjectPool.h
index d9231c3..05c649b 100644
--- a/vehicle/2.0/default/vehicle_hal_manager/VehicleObjectPool.h
+++ b/automotive/vehicle/2.0/default/common/include/vhal_v2_0/VehicleObjectPool.h
@@ -15,17 +15,18 @@
*/
-#ifndef android_hardware_vehicle_V2_0_VehicleObjectPool_H_
-#define android_hardware_vehicle_V2_0_VehicleObjectPool_H_
+#ifndef android_hardware_automotive_vehicle_V2_0_VehicleObjectPool_H_
+#define android_hardware_automotive_vehicle_V2_0_VehicleObjectPool_H_
#include <deque>
#include <map>
#include <mutex>
-#include <android/hardware/vehicle/2.0/types.h>
+#include <android/hardware/automotive/vehicle/2.0/types.h>
namespace android {
namespace hardware {
+namespace automotive {
namespace vehicle {
namespace V2_0 {
@@ -238,7 +239,8 @@
} // namespace V2_0
} // namespace vehicle
+} // namespace automotive
} // namespace hardware
} // namespace android
-#endif // android_hardware_vehicle_V2_0_VehicleObjectPool_H_
+#endif // android_hardware_automotive_vehicle_V2_0_VehicleObjectPool_H_
diff --git a/vehicle/2.0/default/vehicle_hal_manager/VehiclePropConfigIndex.h b/automotive/vehicle/2.0/default/common/include/vhal_v2_0/VehiclePropConfigIndex.h
similarity index 78%
rename from vehicle/2.0/default/vehicle_hal_manager/VehiclePropConfigIndex.h
rename to automotive/vehicle/2.0/default/common/include/vhal_v2_0/VehiclePropConfigIndex.h
index 540fc33..0528f68 100644
--- a/vehicle/2.0/default/vehicle_hal_manager/VehiclePropConfigIndex.h
+++ b/automotive/vehicle/2.0/default/common/include/vhal_v2_0/VehiclePropConfigIndex.h
@@ -14,15 +14,16 @@
* limitations under the License.
*/
-#ifndef android_hardware_vehicle_V2_0_VehiclePropConfigIndex_H_
-#define android_hardware_vehicle_V2_0_VehiclePropConfigIndex_H_
+#ifndef android_hardware_automotive_vehicle_V2_0_VehiclePropConfigIndex_H_
+#define android_hardware_automotive_vehicle_V2_0_VehiclePropConfigIndex_H_
#include <utils/KeyedVector.h>
-#include <android/hardware/vehicle/2.0/IVehicle.h>
+#include <android/hardware/automotive/vehicle/2.0/IVehicle.h>
namespace android {
namespace hardware {
+namespace automotive {
namespace vehicle {
namespace V2_0 {
@@ -37,11 +38,11 @@
: mConfigs(properties), mPropToConfig(mConfigs)
{}
- bool hasConfig(VehicleProperty property) const {
+ bool hasConfig(int32_t property) const {
return mPropToConfig.indexOfKey(property) >= 0;
}
- const VehiclePropConfig& getConfig(VehicleProperty property) const {
+ const VehiclePropConfig& getConfig(int32_t property) const {
return *mPropToConfig.valueFor(property);
}
@@ -50,7 +51,7 @@
}
private:
- typedef KeyedVector<VehicleProperty, const VehiclePropConfig*> PropConfigMap;
+ typedef KeyedVector<int32_t, const VehiclePropConfig*> PropConfigMap;
class ImmutablePropConfigMap : private PropConfigMap {
public:
ImmutablePropConfigMap(const std::vector<VehiclePropConfig>& configs) {
@@ -72,7 +73,8 @@
} // namespace V2_0
} // namespace vehicle
+} // namespace automotive
} // namespace hardware
} // namespace android
-#endif // android_hardware_vehicle_V2_0_VehiclePropConfigIndex_H_
+#endif // android_hardware_automotive_vehicle_V2_0_VehiclePropConfigIndex_H_
diff --git a/vehicle/2.0/default/vehicle_hal_manager/VehicleUtils.h b/automotive/vehicle/2.0/default/common/include/vhal_v2_0/VehicleUtils.h
similarity index 68%
rename from vehicle/2.0/default/vehicle_hal_manager/VehicleUtils.h
rename to automotive/vehicle/2.0/default/common/include/vhal_v2_0/VehicleUtils.h
index 1177ddd..ce0b163 100644
--- a/vehicle/2.0/default/vehicle_hal_manager/VehicleUtils.h
+++ b/automotive/vehicle/2.0/default/common/include/vhal_v2_0/VehicleUtils.h
@@ -14,17 +14,18 @@
* limitations under the License.
*/
-#ifndef android_hardware_vehicle_V2_0_VehicleUtils_H_
-#define android_hardware_vehicle_V2_0_VehicleUtils_H_
+#ifndef android_hardware_automotive_vehicle_V2_0_VehicleUtils_H_
+#define android_hardware_automotive_vehicle_V2_0_VehicleUtils_H_
#include <memory>
#include <hidl/HidlSupport.h>
-#include <android/hardware/vehicle/2.0/types.h>
+#include <android/hardware/automotive/vehicle/2.0/types.h>
namespace android {
namespace hardware {
+namespace automotive {
namespace vehicle {
namespace V2_0 {
@@ -33,32 +34,30 @@
/** Returns underlying (integer) value for given enum. */
template<typename ENUM>
-inline typename std::underlying_type<ENUM>::type toInt(ENUM const value) {
+inline constexpr typename std::underlying_type<ENUM>::type toInt(
+ ENUM const value) {
return static_cast<typename std::underlying_type<ENUM>::type>(value);
}
-inline VehiclePropertyType getPropType(VehicleProperty prop) {
+inline constexpr VehiclePropertyType getPropType(int32_t prop) {
return static_cast<VehiclePropertyType>(
- static_cast<int32_t>(prop)
- & static_cast<int32_t>(VehiclePropertyType::MASK));
+ prop & toInt(VehiclePropertyType::MASK));
}
-inline VehiclePropertyGroup getPropGroup(VehicleProperty prop) {
+inline constexpr VehiclePropertyGroup getPropGroup(int32_t prop) {
return static_cast<VehiclePropertyGroup>(
- static_cast<int32_t>(prop)
- & static_cast<int32_t>(VehiclePropertyGroup::MASK));
+ prop & toInt(VehiclePropertyGroup::MASK));
}
-inline VehicleArea getPropArea(VehicleProperty prop) {
- return static_cast<VehicleArea>(
- static_cast<int32_t>(prop) & static_cast<int32_t>(VehicleArea::MASK));
+inline constexpr VehicleArea getPropArea(int32_t prop) {
+ return static_cast<VehicleArea>(prop & toInt(VehicleArea::MASK));
}
-inline bool isGlobalProp(VehicleProperty prop) {
+inline constexpr bool isGlobalProp(int32_t prop) {
return getPropArea(prop) == VehicleArea::GLOBAL;
}
-inline bool isSystemProperty(VehicleProperty prop) {
+inline constexpr bool isSystemProperty(int32_t prop) {
return VehiclePropertyGroup::SYSTEM == getPropGroup(prop);
}
@@ -80,7 +79,8 @@
} // namespace V2_0
} // namespace vehicle
+} // namespace automotive
} // namespace hardware
} // namespace android
-#endif // android_hardware_vehicle_V2_0_VehicleUtils_H_
+#endif // android_hardware_automotive_vehicle_V2_0_VehicleUtils_H_
diff --git a/vehicle/2.0/default/vehicle_hal_manager/AccessControlConfigParser.cpp b/automotive/vehicle/2.0/default/common/src/AccessControlConfigParser.cpp
similarity index 92%
rename from vehicle/2.0/default/vehicle_hal_manager/AccessControlConfigParser.cpp
rename to automotive/vehicle/2.0/default/common/src/AccessControlConfigParser.cpp
index 063a16d..6a3f8e5 100644
--- a/vehicle/2.0/default/vehicle_hal_manager/AccessControlConfigParser.cpp
+++ b/automotive/vehicle/2.0/default/common/src/AccessControlConfigParser.cpp
@@ -14,9 +14,10 @@
* limitations under the License.
*/
-#define LOG_TAG "android.hardware.vehicle@2.0-impl"
+#define LOG_TAG "automotive.vehicle@2.0-impl"
#include "AccessControlConfigParser.h"
+#include "VehicleUtils.h"
#include <fstream>
#include <iostream>
@@ -26,21 +27,22 @@
namespace android {
namespace hardware {
+namespace automotive {
namespace vehicle {
namespace V2_0 {
AccessControlConfigParser::AccessControlConfigParser(
- const std::vector<VehicleProperty>& properties) {
+ const std::vector<int32_t>& properties) {
// Property Id in the config file doesn't include information about
// type and area. So we want to create a map from these kind of
// *stripped* properties to the whole VehicleProperty.
// We also want to filter out ACL to the properties that supported
// by concrete Vehicle HAL implementation.
- for (VehicleProperty vehicleProperty : properties) {
- auto numProp = static_cast<int>(vehicleProperty);
- numProp &= ~static_cast<int>(VehiclePropertyType::MASK)
- & ~static_cast<int>(VehicleArea::MASK);
- mStrippedToVehiclePropertyMap.emplace(numProp, vehicleProperty);
+ for (auto prop : properties) {
+ auto strippedProp = prop
+ & ~toInt(VehiclePropertyType::MASK)
+ & ~toInt(VehicleArea::MASK);
+ mStrippedToVehiclePropertyMap.emplace(strippedProp, prop);
}
}
@@ -130,8 +132,8 @@
bool AccessControlConfigParser::parsePropertyId(
const std::string& strPropId,
VehiclePropertyGroup propertyGroup,
- VehicleProperty* outVehicleProperty) const {
- int propId;
+ int32_t* outVehicleProperty) const {
+ int32_t propId;
if (!parseInt(strPropId.c_str(), &propId)) {
ALOGW("Failed to convert property id to integer: %s",
strPropId.c_str());
@@ -221,5 +223,6 @@
} // namespace V2_0
} // namespace vehicle
+} // namespace automotive
} // namespace hardware
} // namespace android
diff --git a/automotive/vehicle/2.0/default/common/src/Obd2SensorStore.cpp b/automotive/vehicle/2.0/default/common/src/Obd2SensorStore.cpp
new file mode 100644
index 0000000..4ee0a71
--- /dev/null
+++ b/automotive/vehicle/2.0/default/common/src/Obd2SensorStore.cpp
@@ -0,0 +1,117 @@
+/*
+ * Copyright (C) 2017 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.
+ */
+
+#include "Obd2SensorStore.h"
+
+#include <utils/SystemClock.h>
+#include "VehicleUtils.h"
+
+namespace android {
+namespace hardware {
+namespace automotive {
+namespace vehicle {
+namespace V2_0 {
+
+Obd2SensorStore::BitmaskInVector::BitmaskInVector(size_t numBits)
+{
+ resize(numBits);
+}
+
+void Obd2SensorStore::BitmaskInVector::resize(size_t numBits) {
+ mStorage = std::vector<uint8_t>((numBits+7)/8, 0);
+}
+
+void Obd2SensorStore::BitmaskInVector::set(size_t index, bool value) {
+ const size_t byteIndex = index / 8;
+ const size_t bitIndex = index % 8;
+ const uint8_t byte = mStorage[byteIndex];
+ uint8_t newValue = value ? (byte | (1 << bitIndex)) :
+ (byte & ~(1 << bitIndex));
+ mStorage[byteIndex] = newValue;
+}
+
+bool Obd2SensorStore::BitmaskInVector::get(size_t index) const {
+ const size_t byteIndex = index / 8;
+ const size_t bitIndex = index % 8;
+ const uint8_t byte = mStorage[byteIndex];
+ return (byte & (1 << bitIndex)) != 0;
+}
+
+const std::vector<uint8_t>& Obd2SensorStore::BitmaskInVector::getBitmask() const {
+ return mStorage;
+}
+
+Obd2SensorStore::Obd2SensorStore(size_t numVendorIntegerSensors,
+ size_t numVendorFloatSensors) {
+ // because the last index is valid *inclusive*
+ const size_t numSystemIntegerSensors = toInt(Obd2IntegerSensorIndex::LAST_SYSTEM_INDEX)+1;
+ const size_t numSystemFloatSensors = toInt(Obd2FloatSensorIndex::LAST_SYSTEM_INDEX)+1;
+ mIntegerSensors = std::vector<int32_t>(
+ numSystemIntegerSensors+numVendorIntegerSensors, 0);
+ mFloatSensors = std::vector<float>(
+ numSystemFloatSensors+numVendorFloatSensors, 0);
+ mSensorsBitmask.resize(mIntegerSensors.size()+mFloatSensors.size());
+}
+
+StatusCode Obd2SensorStore::setIntegerSensor(Obd2IntegerSensorIndex index,
+ int32_t value) {
+ return setIntegerSensor(toInt(index), value);
+}
+StatusCode Obd2SensorStore::setFloatSensor(Obd2FloatSensorIndex index,
+ float value) {
+ return setFloatSensor(toInt(index), value);
+}
+
+StatusCode Obd2SensorStore::setIntegerSensor(size_t index, int32_t value) {
+ mIntegerSensors[index] = value;
+ mSensorsBitmask.set(index, true);
+ return StatusCode::OK;
+}
+
+StatusCode Obd2SensorStore::setFloatSensor(size_t index, float value) {
+ mFloatSensors[index] = value;
+ mSensorsBitmask.set(index + mIntegerSensors.size(), true);
+ return StatusCode::OK;
+}
+
+const std::vector<int32_t>& Obd2SensorStore::getIntegerSensors() const {
+ return mIntegerSensors;
+}
+
+const std::vector<float>& Obd2SensorStore::getFloatSensors() const {
+ return mFloatSensors;
+}
+
+const std::vector<uint8_t>& Obd2SensorStore::getSensorsBitmask() const {
+ return mSensorsBitmask.getBitmask();
+}
+
+void Obd2SensorStore::fillPropValue(VehiclePropValue *propValue,
+ std::string dtc) const {
+ propValue->timestamp = elapsedRealtimeNano();
+ propValue->value.int32Values = getIntegerSensors();
+ propValue->value.floatValues = getFloatSensors();
+ propValue->value.bytes = getSensorsBitmask();
+ propValue->value.stringValue = dtc;
+}
+
+
+
+} // namespace V2_0
+} // namespace vehicle
+} // namespace automotive
+} // namespace hardware
+} // namespace android
diff --git a/vehicle/2.0/default/vehicle_hal_manager/SubscriptionManager.cpp b/automotive/vehicle/2.0/default/common/src/SubscriptionManager.cpp
similarity index 93%
rename from vehicle/2.0/default/vehicle_hal_manager/SubscriptionManager.cpp
rename to automotive/vehicle/2.0/default/common/src/SubscriptionManager.cpp
index c190c71..f6f2758 100644
--- a/vehicle/2.0/default/vehicle_hal_manager/SubscriptionManager.cpp
+++ b/automotive/vehicle/2.0/default/common/src/SubscriptionManager.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define LOG_TAG "android.hardware.vehicle@2.0-impl"
+#define LOG_TAG "automotive.vehicle@2.0-impl"
#include "SubscriptionManager.h"
@@ -26,6 +26,7 @@
namespace android {
namespace hardware {
+namespace automotive {
namespace vehicle {
namespace V2_0 {
@@ -70,7 +71,9 @@
}
}
-bool HalClient::isSubscribed(VehicleProperty propId, int32_t areaId, SubscribeFlags flags) {
+bool HalClient::isSubscribed(int32_t propId,
+ int32_t areaId,
+ SubscribeFlags flags) {
auto it = mSubscriptions.find(propId);
if (it == mSubscriptions.end()) {
return false;
@@ -136,13 +139,13 @@
}
std::list<sp<HalClient>> SubscriptionManager::getSubscribedClients(
- VehicleProperty propId, int32_t area, SubscribeFlags flags) const {
+ int32_t propId, int32_t area, SubscribeFlags flags) const {
MuxGuard g(mLock);
return getSubscribedClientsLocked(propId, area, flags);
}
std::list<sp<HalClient>> SubscriptionManager::getSubscribedClientsLocked(
- VehicleProperty propId, int32_t area, SubscribeFlags flags) const {
+ int32_t propId, int32_t area, SubscribeFlags flags) const {
std::list<sp<HalClient>> subscribedClients;
sp<HalClientVector> propClients = getClientsForPropertyLocked(propId);
@@ -180,7 +183,7 @@
}
void SubscriptionManager::addClientToPropMapLocked(
- VehicleProperty propId, const sp<HalClient> &client) {
+ int32_t propId, const sp<HalClient> &client) {
auto it = mPropToClients.find(propId);
sp<HalClientVector> propClients;
if (it == mPropToClients.end()) {
@@ -193,7 +196,7 @@
}
sp<HalClientVector> SubscriptionManager::getClientsForPropertyLocked(
- VehicleProperty propId) const {
+ int32_t propId) const {
auto it = mPropToClients.find(propId);
return it == mPropToClients.end() ? nullptr : it->second;
}
@@ -214,7 +217,7 @@
}
bool SubscriptionManager::unsubscribe(const sp<IVehicleCallback>& callback,
- VehicleProperty propId) {
+ int32_t propId) {
MuxGuard g(mLock);
auto propertyClients = getClientsForPropertyLocked(propId);
auto clientIter = mClients.find(callback);
@@ -252,5 +255,6 @@
} // namespace V2_0
} // namespace vehicle
+} // namespace automotive
} // namespace hardware
} // namespace android
diff --git a/vehicle/2.0/default/vehicle_hal_manager/VehicleHalManager.cpp b/automotive/vehicle/2.0/default/common/src/VehicleHalManager.cpp
similarity index 95%
rename from vehicle/2.0/default/vehicle_hal_manager/VehicleHalManager.cpp
rename to automotive/vehicle/2.0/default/common/src/VehicleHalManager.cpp
index 5d2e6fe..3a5e504 100644
--- a/vehicle/2.0/default/vehicle_hal_manager/VehicleHalManager.cpp
+++ b/automotive/vehicle/2.0/default/common/src/VehicleHalManager.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define LOG_TAG "android.hardware.vehicle@2.0-impl"
+#define LOG_TAG "automotive.vehicle@2.0-impl"
#include "VehicleHalManager.h"
@@ -27,6 +27,7 @@
namespace android {
namespace hardware {
+namespace automotive {
namespace vehicle {
namespace V2_0 {
@@ -58,11 +59,11 @@
}
Return<void> VehicleHalManager::getPropConfigs(
- const hidl_vec<VehicleProperty> &properties,
+ const hidl_vec<int32_t> &properties,
getPropConfigs_cb _hidl_cb) {
std::vector<VehiclePropConfig> configs;
for (size_t i = 0; i < properties.size(); i++) {
- VehicleProperty prop = properties[i];
+ auto prop = properties[i];
if (mConfigIndex->hasConfig(prop)) {
configs.push_back(mConfigIndex->getConfig(prop));
} else {
@@ -125,7 +126,7 @@
auto caller = getCaller();
for (size_t i = 0; i < verifiedOptions.size(); i++) {
SubscribeOptions& ops = verifiedOptions[i];
- VehicleProperty prop = ops.propId;
+ auto prop = ops.propId;
const auto* config = getPropConfigOrNull(prop);
if (config == nullptr) {
@@ -168,7 +169,7 @@
}
Return<StatusCode> VehicleHalManager::unsubscribe(
- const sp<IVehicleCallback>& callback, VehicleProperty propId) {
+ const sp<IVehicleCallback>& callback, int32_t propId) {
if (mSubscriptionManager.unsubscribe(callback, propId)) {
mHal->unsubscribe(propId);
}
@@ -200,7 +201,7 @@
auto supportedPropConfigs = mHal->listProperties();
mConfigIndex.reset(new VehiclePropConfigIndex(supportedPropConfigs));
- std::vector<VehicleProperty> supportedProperties(
+ std::vector<int32_t> supportedProperties(
supportedPropConfigs.size());
for (const auto& config : supportedPropConfigs) {
supportedProperties.push_back(config.prop);
@@ -228,7 +229,7 @@
}
void VehicleHalManager::onHalPropertySetError(StatusCode errorCode,
- VehicleProperty property,
+ int32_t property,
int32_t areaId) {
const auto& clients = mSubscriptionManager.getSubscribedClients(
property, 0, SubscribeFlags::HAL_EVENT);
@@ -309,7 +310,7 @@
return true;
}
-bool VehicleHalManager::checkAcl(uid_t callerUid, VehicleProperty propertyId,
+bool VehicleHalManager::checkAcl(uid_t callerUid, int32_t propertyId,
VehiclePropertyAccess requiredAccess) const {
if (callerUid == AID_SYSTEM && isSystemProperty(propertyId)) {
return true;
@@ -353,7 +354,7 @@
}
const VehiclePropConfig* VehicleHalManager::getPropConfigOrNull(
- VehicleProperty prop) const {
+ int32_t prop) const {
return mConfigIndex->hasConfig(prop)
? &mConfigIndex->getConfig(prop) : nullptr;
}
@@ -380,5 +381,6 @@
} // namespace V2_0
} // namespace vehicle
+} // namespace automotive
} // namespace hardware
} // namespace android
diff --git a/vehicle/2.0/default/vehicle_hal_manager/VehicleObjectPool.cpp b/automotive/vehicle/2.0/default/common/src/VehicleObjectPool.cpp
similarity index 95%
rename from vehicle/2.0/default/vehicle_hal_manager/VehicleObjectPool.cpp
rename to automotive/vehicle/2.0/default/common/src/VehicleObjectPool.cpp
index e9dd68d..ac1245a 100644
--- a/vehicle/2.0/default/vehicle_hal_manager/VehicleObjectPool.cpp
+++ b/automotive/vehicle/2.0/default/common/src/VehicleObjectPool.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define LOG_TAG "android.hardware.vehicle@2.0-impl"
+#define LOG_TAG "automotive.vehicle@2.0-impl"
#include "VehicleObjectPool.h"
@@ -24,6 +24,7 @@
namespace android {
namespace hardware {
+namespace automotive {
namespace vehicle {
namespace V2_0 {
@@ -36,7 +37,7 @@
VehiclePropValuePool::RecyclableType VehiclePropValuePool::obtain(
const VehiclePropValue& src) {
- if (src.prop == VehicleProperty::INVALID) {
+ if (src.prop == toInt(VehicleProperty::INVALID)) {
ALOGE("Unable to obtain an object from pool for unknown property");
return RecyclableType();
}
@@ -128,7 +129,7 @@
if (!check(&o->value)) {
ALOGE("Discarding value for prop 0x%x because it contains "
"data that is not consistent with this pool. "
- "Expected type: %d, vector size: %d",
+ "Expected type: %d, vector size: %zu",
o->prop, mPropType, mVectorSize);
delete o;
} else {
@@ -157,5 +158,6 @@
} // namespace V2_0
} // namespace vehicle
+} // namespace automotive
} // namespace hardware
} // namespace android
diff --git a/vehicle/2.0/default/vehicle_hal_manager/VehicleUtils.cpp b/automotive/vehicle/2.0/default/common/src/VehicleUtils.cpp
similarity index 97%
rename from vehicle/2.0/default/vehicle_hal_manager/VehicleUtils.cpp
rename to automotive/vehicle/2.0/default/common/src/VehicleUtils.cpp
index 5a00631..311cdef 100644
--- a/vehicle/2.0/default/vehicle_hal_manager/VehicleUtils.cpp
+++ b/automotive/vehicle/2.0/default/common/src/VehicleUtils.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define LOG_TAG "android.hardware.vehicle@2.0-impl"
+#define LOG_TAG "automotive.vehicle@2.0-impl"
#include "VehicleUtils.h"
@@ -22,6 +22,7 @@
namespace android {
namespace hardware {
+namespace automotive {
namespace vehicle {
namespace V2_0 {
@@ -124,5 +125,6 @@
} // namespace V2_0
} // namespace vehicle
+} // namespace automotive
} // namespace hardware
} // namespace android
diff --git a/vehicle/2.0/default/impl/DefaultConfig.h b/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h
similarity index 71%
rename from vehicle/2.0/default/impl/DefaultConfig.h
rename to automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h
index 12c1c1b..ec08a43 100644
--- a/vehicle/2.0/default/impl/DefaultConfig.h
+++ b/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h
@@ -14,14 +14,15 @@
* limitations under the License.
*/
-#ifndef android_hardware_vehicle_V2_0_impl_DefaultConfig_H_
-#define android_hardware_vehicle_V2_0_impl_DefaultConfig_H_
+#ifndef android_hardware_automotive_vehicle_V2_0_impl_DefaultConfig_H_
+#define android_hardware_automotive_vehicle_V2_0_impl_DefaultConfig_H_
-#include <android/hardware/vehicle/2.0/IVehicle.h>
-#include <vehicle_hal_manager/VehicleUtils.h>
+#include <android/hardware/automotive/vehicle/2.0/IVehicle.h>
+#include <vhal_v2_0/VehicleUtils.h>
namespace android {
namespace hardware {
+namespace automotive {
namespace vehicle {
namespace V2_0 {
@@ -29,20 +30,20 @@
const VehiclePropConfig kVehicleProperties[] = {
{
- .prop = VehicleProperty::INFO_MAKE,
+ .prop = toInt(VehicleProperty::INFO_MAKE),
.access = VehiclePropertyAccess::READ,
.changeMode = VehiclePropertyChangeMode::STATIC,
},
{
- .prop = VehicleProperty::HVAC_POWER_ON,
+ .prop = toInt(VehicleProperty::HVAC_POWER_ON),
.access = VehiclePropertyAccess::READ_WRITE,
.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
.supportedAreas = toInt(VehicleAreaZone::ROW_1)
},
{
- .prop = VehicleProperty::HVAC_DEFROSTER,
+ .prop = toInt(VehicleProperty::HVAC_DEFROSTER),
.access = VehiclePropertyAccess::READ_WRITE,
.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
.supportedAreas =
@@ -51,28 +52,28 @@
},
{
- .prop = VehicleProperty::HVAC_RECIRC_ON,
+ .prop = toInt(VehicleProperty::HVAC_RECIRC_ON),
.access = VehiclePropertyAccess::READ_WRITE,
.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
.supportedAreas = toInt(VehicleAreaZone::ROW_1)
},
{
- .prop = VehicleProperty::HVAC_AC_ON,
+ .prop = toInt(VehicleProperty::HVAC_AC_ON),
.access = VehiclePropertyAccess::READ_WRITE,
.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
.supportedAreas = toInt(VehicleAreaZone::ROW_1)
},
{
- .prop = VehicleProperty::HVAC_AUTO_ON,
+ .prop = toInt(VehicleProperty::HVAC_AUTO_ON),
.access = VehiclePropertyAccess::READ_WRITE,
.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
.supportedAreas = toInt(VehicleAreaZone::ROW_1)
},
{
- .prop = VehicleProperty::HVAC_FAN_SPEED,
+ .prop = toInt(VehicleProperty::HVAC_FAN_SPEED),
.access = VehiclePropertyAccess::READ_WRITE,
.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
.supportedAreas = toInt(VehicleAreaZone::ROW_1),
@@ -86,14 +87,14 @@
},
{
- .prop = VehicleProperty::HVAC_FAN_DIRECTION,
+ .prop = toInt(VehicleProperty::HVAC_FAN_DIRECTION),
.access = VehiclePropertyAccess::READ_WRITE,
.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
.supportedAreas = toInt(VehicleAreaZone::ROW_1),
},
{
- .prop = VehicleProperty::HVAC_TEMPERATURE_SET,
+ .prop = toInt(VehicleProperty::HVAC_TEMPERATURE_SET),
.access = VehiclePropertyAccess::READ_WRITE,
.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
.supportedAreas =
@@ -114,25 +115,25 @@
},
{
- .prop = VehicleProperty::NIGHT_MODE,
+ .prop = toInt(VehicleProperty::NIGHT_MODE),
.access = VehiclePropertyAccess::READ,
.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
},
{
- .prop = VehicleProperty::DRIVING_STATUS,
+ .prop = toInt(VehicleProperty::DRIVING_STATUS),
.access = VehiclePropertyAccess::READ,
.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
},
{
- .prop = VehicleProperty::GEAR_SELECTION,
+ .prop = toInt(VehicleProperty::GEAR_SELECTION),
.access = VehiclePropertyAccess::READ,
.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
},
{
- .prop = VehicleProperty::INFO_FUEL_CAPACITY,
+ .prop = toInt(VehicleProperty::INFO_FUEL_CAPACITY),
.access = VehiclePropertyAccess::READ,
.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
.areaConfigs = {
@@ -144,7 +145,7 @@
},
{
- .prop = VehicleProperty::DISPLAY_BRIGHTNESS,
+ .prop = toInt(VehicleProperty::DISPLAY_BRIGHTNESS),
.access = VehiclePropertyAccess::READ_WRITE,
.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
.areaConfigs = {
@@ -156,21 +157,35 @@
},
{
- .prop = VehicleProperty::IGNITION_STATE,
+ .prop = toInt(VehicleProperty::IGNITION_STATE),
.access = VehiclePropertyAccess::READ,
.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
},
{
- .prop = VehicleProperty::OBD2_LIVE_FRAME,
+ .prop = toInt(VehicleProperty::OBD2_LIVE_FRAME),
.access = VehiclePropertyAccess::READ,
.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
+ .configArray = {0,0}
},
{
- .prop = VehicleProperty::OBD2_FREEZE_FRAME,
+ .prop = toInt(VehicleProperty::OBD2_FREEZE_FRAME),
.access = VehiclePropertyAccess::READ,
.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
+ .configArray = {0,0}
+ },
+
+ {
+ .prop = toInt(VehicleProperty::OBD2_FREEZE_FRAME_INFO),
+ .access = VehiclePropertyAccess::READ,
+ .changeMode = VehiclePropertyChangeMode::ON_CHANGE
+ },
+
+ {
+ .prop = toInt(VehicleProperty::OBD2_FREEZE_FRAME_CLEAR),
+ .access = VehiclePropertyAccess::WRITE,
+ .changeMode = VehiclePropertyChangeMode::ON_CHANGE
}
};
@@ -178,7 +193,8 @@
} // namespace V2_0
} // namespace vehicle
+} // namespace automotive
} // namespace hardware
} // namespace android
-#endif // android_hardware_vehicle_V2_0_impl_DefaultConfig_H_
+#endif // android_hardware_automotive_vehicle_V2_0_impl_DefaultConfig_H_
diff --git a/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultVehicleHal.cpp b/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultVehicleHal.cpp
new file mode 100644
index 0000000..d3d77b6
--- /dev/null
+++ b/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultVehicleHal.cpp
@@ -0,0 +1,844 @@
+/*
+ * Copyright (C) 2016 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.
+ */
+
+#define LOG_TAG "DefaultVehicleHal"
+#include <android/log.h>
+
+#include <algorithm>
+#include <netinet/in.h>
+#include <sys/socket.h>
+
+#include "DefaultVehicleHal.h"
+#include "VehicleHalProto.pb.h"
+
+#define DEBUG_SOCKET (33452)
+
+namespace android {
+namespace hardware {
+namespace automotive {
+namespace vehicle {
+namespace V2_0 {
+
+namespace impl {
+
+void DefaultVehicleHal::doGetConfig(emulator::EmulatorMessage& rxMsg,
+ emulator::EmulatorMessage& respMsg) {
+ std::vector<VehiclePropConfig> configs = listProperties();
+ emulator::VehiclePropGet getProp = rxMsg.prop(0);
+
+ respMsg.set_msg_type(emulator::GET_CONFIG_RESP);
+ respMsg.set_status(emulator::ERROR_INVALID_PROPERTY);
+
+ for (auto& config : configs) {
+ // Find the config we are looking for
+ if (config.prop == getProp.prop()) {
+ emulator::VehiclePropConfig* protoCfg = respMsg.add_config();
+ populateProtoVehicleConfig(protoCfg, config);
+ respMsg.set_status(emulator::RESULT_OK);
+ break;
+ }
+ }
+}
+
+void DefaultVehicleHal::doGetConfigAll(emulator::EmulatorMessage& /* rxMsg */,
+ emulator::EmulatorMessage& respMsg) {
+ std::vector<VehiclePropConfig> configs = listProperties();
+
+ respMsg.set_msg_type(emulator::GET_CONFIG_ALL_RESP);
+ respMsg.set_status(emulator::RESULT_OK);
+
+ for (auto& config : configs) {
+ emulator::VehiclePropConfig* protoCfg = respMsg.add_config();
+ populateProtoVehicleConfig(protoCfg, config);
+ }
+}
+
+void DefaultVehicleHal::doGetProperty(emulator::EmulatorMessage& rxMsg,
+ emulator::EmulatorMessage& respMsg) {
+ int32_t areaId = 0;
+ emulator::VehiclePropGet getProp = rxMsg.prop(0);
+ int32_t propId = getProp.prop();
+ emulator::Status status = emulator::ERROR_INVALID_PROPERTY;
+ VehiclePropValue* val;
+
+ respMsg.set_msg_type(emulator::GET_PROPERTY_RESP);
+
+ if (getProp.has_area_id()) {
+ areaId = getProp.area_id();
+ }
+
+ {
+ std::lock_guard<std::mutex> lock(mPropsMutex);
+
+ val = getVehiclePropValueLocked(propId, areaId);
+ if (val != nullptr) {
+ emulator::VehiclePropValue* protoVal = respMsg.add_value();
+ populateProtoVehiclePropValue(protoVal, val);
+ status = emulator::RESULT_OK;
+ }
+ }
+
+ respMsg.set_status(status);
+}
+
+void DefaultVehicleHal::doGetPropertyAll(emulator::EmulatorMessage& /* rxMsg */,
+ emulator::EmulatorMessage& respMsg) {
+ respMsg.set_msg_type(emulator::GET_PROPERTY_ALL_RESP);
+ respMsg.set_status(emulator::RESULT_OK);
+
+ {
+ std::lock_guard<std::mutex> lock(mPropsMutex);
+
+ for (auto& propVal : mProps) {
+ emulator::VehiclePropValue* protoVal = respMsg.add_value();
+ populateProtoVehiclePropValue(protoVal, propVal.get());
+ }
+ }
+}
+
+void DefaultVehicleHal::doSetProperty(emulator::EmulatorMessage& rxMsg,
+ emulator::EmulatorMessage& respMsg) {
+ emulator::VehiclePropValue protoVal = rxMsg.value(0);
+ VehiclePropValue val;
+
+ respMsg.set_msg_type(emulator::SET_PROPERTY_RESP);
+
+ val.prop = protoVal.prop();
+ val.areaId = protoVal.area_id();
+
+ // Copy value data if it is set. This automatically handles complex data types if needed.
+ if (protoVal.has_string_value()) {
+ val.value.stringValue = protoVal.string_value().c_str();
+ }
+
+ if (protoVal.has_bytes_value()) {
+ std::vector<uint8_t> tmp(protoVal.bytes_value().begin(), protoVal.bytes_value().end());
+ val.value.bytes = tmp;
+ }
+
+ if (protoVal.int32_values_size() > 0) {
+ std::vector<int32_t> int32Values = std::vector<int32_t>(protoVal.int32_values_size());
+ for (int i=0; i<protoVal.int32_values_size(); i++) {
+ int32Values[i] = protoVal.int32_values(i);
+ }
+ val.value.int32Values = int32Values;
+ }
+
+ if (protoVal.int64_values_size() > 0) {
+ std::vector<int64_t> int64Values = std::vector<int64_t>(protoVal.int64_values_size());
+ for (int i=0; i<protoVal.int64_values_size(); i++) {
+ int64Values[i] = protoVal.int64_values(i);
+ }
+ val.value.int64Values = int64Values;
+ }
+
+ if (protoVal.float_values_size() > 0) {
+ std::vector<float> floatValues = std::vector<float>(protoVal.float_values_size());
+ for (int i=0; i<protoVal.float_values_size(); i++) {
+ floatValues[i] = protoVal.float_values(i);
+ }
+ val.value.floatValues = floatValues;
+ }
+
+ if (updateProperty(val) == StatusCode::OK) {
+ // Send property up to VehicleHalManager via callback
+ auto& pool = *getValuePool();
+ VehiclePropValuePtr v = pool.obtain(val);
+
+ doHalEvent(std::move(v));
+ respMsg.set_status(emulator::RESULT_OK);
+ } else {
+ respMsg.set_status(emulator::ERROR_INVALID_PROPERTY);
+ }
+}
+
+// This function should only be called while mPropsMutex is locked.
+VehiclePropValue* DefaultVehicleHal::getVehiclePropValueLocked(int32_t propId, int32_t areaId) {
+ if (getPropArea(propId) == VehicleArea::GLOBAL) {
+ // In VehicleHal, global properties have areaId = -1. We use 0.
+ areaId = 0;
+ }
+
+ for (auto& prop : mProps) {
+ if ((prop->prop == propId) && (prop->areaId == areaId)) {
+ return prop.get();
+ }
+ }
+ ALOGW("%s: Property not found: propId = 0x%x, areaId = 0x%x", __FUNCTION__, propId, areaId);
+ return nullptr;
+}
+
+static std::unique_ptr<Obd2SensorStore> fillDefaultObd2Frame(
+ size_t numVendorIntegerSensors,
+ size_t numVendorFloatSensors) {
+ std::unique_ptr<Obd2SensorStore> sensorStore(new Obd2SensorStore(
+ numVendorIntegerSensors, numVendorFloatSensors));
+
+ sensorStore->setIntegerSensor(
+ Obd2IntegerSensorIndex::FUEL_SYSTEM_STATUS,
+ toInt(FuelSystemStatus::CLOSED_LOOP));
+ sensorStore->setIntegerSensor(
+ Obd2IntegerSensorIndex::MALFUNCTION_INDICATOR_LIGHT_ON, 0);
+ sensorStore->setIntegerSensor(
+ Obd2IntegerSensorIndex::IGNITION_MONITORS_SUPPORTED,
+ toInt(IgnitionMonitorKind::SPARK));
+ sensorStore->setIntegerSensor(Obd2IntegerSensorIndex::IGNITION_SPECIFIC_MONITORS,
+ CommonIgnitionMonitors::COMPONENTS_AVAILABLE |
+ CommonIgnitionMonitors::MISFIRE_AVAILABLE |
+ SparkIgnitionMonitors::AC_REFRIGERANT_AVAILABLE |
+ SparkIgnitionMonitors::EVAPORATIVE_SYSTEM_AVAILABLE);
+ sensorStore->setIntegerSensor(
+ Obd2IntegerSensorIndex::INTAKE_AIR_TEMPERATURE, 35);
+ sensorStore->setIntegerSensor(
+ Obd2IntegerSensorIndex::COMMANDED_SECONDARY_AIR_STATUS,
+ toInt(SecondaryAirStatus::FROM_OUTSIDE_OR_OFF));
+ sensorStore->setIntegerSensor(
+ Obd2IntegerSensorIndex::NUM_OXYGEN_SENSORS_PRESENT, 1);
+ sensorStore->setIntegerSensor(
+ Obd2IntegerSensorIndex::RUNTIME_SINCE_ENGINE_START, 500);
+ sensorStore->setIntegerSensor(
+ Obd2IntegerSensorIndex::DISTANCE_TRAVELED_WITH_MALFUNCTION_INDICATOR_LIGHT_ON, 0);
+ sensorStore->setIntegerSensor(
+ Obd2IntegerSensorIndex::WARMUPS_SINCE_CODES_CLEARED, 51);
+ sensorStore->setIntegerSensor(
+ Obd2IntegerSensorIndex::DISTANCE_TRAVELED_SINCE_CODES_CLEARED, 365);
+ sensorStore->setIntegerSensor(
+ Obd2IntegerSensorIndex::ABSOLUTE_BAROMETRIC_PRESSURE, 30);
+ sensorStore->setIntegerSensor(
+ Obd2IntegerSensorIndex::CONTROL_MODULE_VOLTAGE, 12);
+ sensorStore->setIntegerSensor(
+ Obd2IntegerSensorIndex::AMBIENT_AIR_TEMPERATURE, 18);
+ sensorStore->setIntegerSensor(
+ Obd2IntegerSensorIndex::MAX_FUEL_AIR_EQUIVALENCE_RATIO, 1);
+ sensorStore->setIntegerSensor(
+ Obd2IntegerSensorIndex::FUEL_TYPE, toInt(FuelType::GASOLINE));
+ sensorStore->setFloatSensor(
+ Obd2FloatSensorIndex::CALCULATED_ENGINE_LOAD, 0.153);
+ sensorStore->setFloatSensor(
+ Obd2FloatSensorIndex::SHORT_TERM_FUEL_TRIM_BANK1, -0.16);
+ sensorStore->setFloatSensor(
+ Obd2FloatSensorIndex::LONG_TERM_FUEL_TRIM_BANK1, -0.16);
+ sensorStore->setFloatSensor(
+ Obd2FloatSensorIndex::SHORT_TERM_FUEL_TRIM_BANK2, -0.16);
+ sensorStore->setFloatSensor(
+ Obd2FloatSensorIndex::LONG_TERM_FUEL_TRIM_BANK2, -0.16);
+ sensorStore->setFloatSensor(
+ Obd2FloatSensorIndex::INTAKE_MANIFOLD_ABSOLUTE_PRESSURE, 7.5);
+ sensorStore->setFloatSensor(
+ Obd2FloatSensorIndex::ENGINE_RPM, 1250.);
+ sensorStore->setFloatSensor(
+ Obd2FloatSensorIndex::VEHICLE_SPEED, 40.);
+ sensorStore->setFloatSensor(
+ Obd2FloatSensorIndex::TIMING_ADVANCE, 2.5);
+ sensorStore->setFloatSensor(
+ Obd2FloatSensorIndex::THROTTLE_POSITION, 19.75);
+ sensorStore->setFloatSensor(
+ Obd2FloatSensorIndex::OXYGEN_SENSOR1_VOLTAGE, 0.265);
+ sensorStore->setFloatSensor(
+ Obd2FloatSensorIndex::FUEL_TANK_LEVEL_INPUT, 0.824);
+ sensorStore->setFloatSensor(
+ Obd2FloatSensorIndex::EVAPORATION_SYSTEM_VAPOR_PRESSURE, -0.373);
+ sensorStore->setFloatSensor(
+ Obd2FloatSensorIndex::CATALYST_TEMPERATURE_BANK1_SENSOR1, 190.);
+ sensorStore->setFloatSensor(
+ Obd2FloatSensorIndex::RELATIVE_THROTTLE_POSITION, 3.);
+ sensorStore->setFloatSensor(
+ Obd2FloatSensorIndex::ABSOLUTE_THROTTLE_POSITION_B, 0.306);
+ sensorStore->setFloatSensor(
+ Obd2FloatSensorIndex::ACCELERATOR_PEDAL_POSITION_D, 0.188);
+ sensorStore->setFloatSensor(
+ Obd2FloatSensorIndex::ACCELERATOR_PEDAL_POSITION_E, 0.094);
+ sensorStore->setFloatSensor(
+ Obd2FloatSensorIndex::COMMANDED_THROTTLE_ACTUATOR, 0.024);
+
+ return sensorStore;
+}
+
+void DefaultVehicleHal::initObd2LiveFrame(VehiclePropConfig& propConfig) {
+ auto sensorStore = fillDefaultObd2Frame(propConfig.configArray[0],
+ propConfig.configArray[1]);
+ mLiveObd2Frame = createVehiclePropValue(VehiclePropertyType::COMPLEX, 0);
+ sensorStore->fillPropValue(mLiveObd2Frame.get(), "");
+}
+
+void DefaultVehicleHal::initObd2FreezeFrame(VehiclePropConfig& propConfig) {
+ auto sensorStore = fillDefaultObd2Frame(propConfig.configArray[0],
+ propConfig.configArray[1]);
+
+ mFreezeObd2Frames.push_back(
+ createVehiclePropValue(VehiclePropertyType::COMPLEX,0));
+ mFreezeObd2Frames.push_back(
+ createVehiclePropValue(VehiclePropertyType::COMPLEX,0));
+ mFreezeObd2Frames.push_back(
+ createVehiclePropValue(VehiclePropertyType::COMPLEX,0));
+
+ sensorStore->fillPropValue(mFreezeObd2Frames[0].get(), "P0070");
+ sensorStore->fillPropValue(mFreezeObd2Frames[1].get(), "P0102");
+ sensorStore->fillPropValue(mFreezeObd2Frames[2].get(), "P0123");
+}
+
+void DefaultVehicleHal::parseRxProtoBuf(std::vector<uint8_t>& msg) {
+ emulator::EmulatorMessage rxMsg;
+ emulator::EmulatorMessage respMsg;
+ std::string str(reinterpret_cast<const char*>(msg.data()), msg.size());
+
+ rxMsg.ParseFromString(str);
+
+ switch (rxMsg.msg_type()) {
+ case emulator::GET_CONFIG_CMD:
+ doGetConfig(rxMsg, respMsg);
+ break;
+ case emulator::GET_CONFIG_ALL_CMD:
+ doGetConfigAll(rxMsg, respMsg);
+ break;
+ case emulator::GET_PROPERTY_CMD:
+ doGetProperty(rxMsg, respMsg);
+ break;
+ case emulator::GET_PROPERTY_ALL_CMD:
+ doGetPropertyAll(rxMsg, respMsg);
+ break;
+ case emulator::SET_PROPERTY_CMD:
+ doSetProperty(rxMsg, respMsg);
+ break;
+ default:
+ ALOGW("%s: Unknown message received, type = %d", __FUNCTION__, rxMsg.msg_type());
+ respMsg.set_status(emulator::ERROR_UNIMPLEMENTED_CMD);
+ break;
+ }
+
+ // Send the reply
+ txMsg(respMsg);
+}
+
+// Copies internal VehiclePropConfig data structure to protobuf VehiclePropConfig
+void DefaultVehicleHal::populateProtoVehicleConfig(emulator::VehiclePropConfig* protoCfg,
+ const VehiclePropConfig& cfg) {
+ protoCfg->set_prop(cfg.prop);
+ protoCfg->set_access(toInt(cfg.access));
+ protoCfg->set_change_mode(toInt(cfg.changeMode));
+ protoCfg->set_value_type(toInt(getPropType(cfg.prop)));
+
+ if (!isGlobalProp(cfg.prop)) {
+ protoCfg->set_supported_areas(cfg.supportedAreas);
+ }
+
+ for (auto& configElement : cfg.configArray) {
+ protoCfg->add_config_array(configElement);
+ }
+
+ if (cfg.configString.size() > 0) {
+ protoCfg->set_config_string(cfg.configString.c_str(), cfg.configString.size());
+ }
+
+ // Populate the min/max values based on property type
+ switch (getPropType(cfg.prop)) {
+ case VehiclePropertyType::STRING:
+ case VehiclePropertyType::BOOLEAN:
+ case VehiclePropertyType::INT32_VEC:
+ case VehiclePropertyType::FLOAT_VEC:
+ case VehiclePropertyType::BYTES:
+ case VehiclePropertyType::COMPLEX:
+ // Do nothing. These types don't have min/max values
+ break;
+ case VehiclePropertyType::INT64:
+ if (cfg.areaConfigs.size() > 0) {
+ emulator::VehicleAreaConfig* aCfg = protoCfg->add_area_configs();
+ aCfg->set_min_int64_value(cfg.areaConfigs[0].minInt64Value);
+ aCfg->set_max_int64_value(cfg.areaConfigs[0].maxInt64Value);
+ }
+ break;
+ case VehiclePropertyType::FLOAT:
+ if (cfg.areaConfigs.size() > 0) {
+ emulator::VehicleAreaConfig* aCfg = protoCfg->add_area_configs();
+ aCfg->set_min_float_value(cfg.areaConfigs[0].minFloatValue);
+ aCfg->set_max_float_value(cfg.areaConfigs[0].maxFloatValue);
+ }
+ break;
+ case VehiclePropertyType::INT32:
+ if (cfg.areaConfigs.size() > 0) {
+ emulator::VehicleAreaConfig* aCfg = protoCfg->add_area_configs();
+ aCfg->set_min_int32_value(cfg.areaConfigs[0].minInt32Value);
+ aCfg->set_max_int32_value(cfg.areaConfigs[0].maxInt32Value);
+ }
+ break;
+ default:
+ ALOGW("%s: Unknown property type: 0x%x", __FUNCTION__, toInt(getPropType(cfg.prop)));
+ break;
+ }
+
+ protoCfg->set_min_sample_rate(cfg.minSampleRate);
+ protoCfg->set_max_sample_rate(cfg.maxSampleRate);
+}
+
+// Copies internal VehiclePropValue data structure to protobuf VehiclePropValue
+void DefaultVehicleHal::populateProtoVehiclePropValue(emulator::VehiclePropValue* protoVal,
+ const VehiclePropValue* val) {
+ protoVal->set_prop(val->prop);
+ protoVal->set_value_type(toInt(getPropType(val->prop)));
+ protoVal->set_timestamp(val->timestamp);
+ protoVal->set_area_id(val->areaId);
+
+ // Copy value data if it is set.
+ // - for bytes and strings, this is indicated by size > 0
+ // - for int32, int64, and float, copy the values if vectors have data
+ if (val->value.stringValue.size() > 0) {
+ protoVal->set_string_value(val->value.stringValue.c_str(), val->value.stringValue.size());
+ }
+
+ if (val->value.bytes.size() > 0) {
+ protoVal->set_bytes_value(val->value.bytes.data(), val->value.bytes.size());
+ }
+
+ for (auto& int32Value : val->value.int32Values) {
+ protoVal->add_int32_values(int32Value);
+ }
+
+ for (auto& int64Value : val->value.int64Values) {
+ protoVal->add_int64_values(int64Value);
+ }
+
+ for (auto& floatValue : val->value.floatValues) {
+ protoVal->add_float_values(floatValue);
+ }
+}
+
+void DefaultVehicleHal::rxMsg(void) {
+ int numBytes = 0;
+ int32_t msgSize;
+ do {
+ // This is a variable length message.
+ // Read the number of bytes to rx over the socket
+ numBytes = read(mCurSocket, &msgSize, sizeof(msgSize));
+
+ if (numBytes != sizeof(msgSize)) {
+ // This happens when connection is closed
+ ALOGD("%s: numBytes=%d, expected=4", __FUNCTION__, numBytes);
+ break;
+ }
+
+ std::vector<uint8_t> msg = std::vector<uint8_t>(msgSize);
+
+ numBytes = read(mCurSocket, msg.data(), msgSize);
+
+ if ((numBytes == msgSize) && (msgSize > 0)) {
+ // Received a message.
+ parseRxProtoBuf(msg);
+ } else {
+ // This happens when connection is closed
+ ALOGD("%s: numBytes=%d, msgSize=%d", __FUNCTION__, numBytes, msgSize);
+ break;
+ }
+ } while (mExit == 0);
+}
+
+void DefaultVehicleHal::rxThread(void) {
+ // Initialize the socket
+ {
+ int retVal;
+ struct sockaddr_in servAddr;
+
+ mSocket = socket(AF_INET, SOCK_STREAM, 0);
+ if (mSocket < 0) {
+ ALOGE("%s: socket() failed, mSocket=%d, errno=%d", __FUNCTION__, mSocket, errno);
+ mSocket = -1;
+ return;
+ }
+
+ bzero(&servAddr, sizeof(servAddr));
+ servAddr.sin_family = AF_INET;
+ servAddr.sin_addr.s_addr = INADDR_ANY;
+ servAddr.sin_port = htons(DEBUG_SOCKET);
+
+ retVal = bind(mSocket, reinterpret_cast<struct sockaddr*>(&servAddr), sizeof(servAddr));
+ if(retVal < 0) {
+ ALOGE("%s: Error on binding: retVal=%d, errno=%d", __FUNCTION__, retVal, errno);
+ close(mSocket);
+ mSocket = -1;
+ return;
+ }
+
+ listen(mSocket, 1);
+
+ // Set the socket to be non-blocking so we can poll it continouously
+ fcntl(mSocket, F_SETFL, O_NONBLOCK);
+ }
+
+ while (mExit == 0) {
+ struct sockaddr_in cliAddr;
+ socklen_t cliLen = sizeof(cliAddr);
+ int cSocket = accept(mSocket, reinterpret_cast<struct sockaddr*>(&cliAddr), &cliLen);
+
+ if (cSocket >= 0) {
+ {
+ std::lock_guard<std::mutex> lock(mTxMutex);
+ mCurSocket = cSocket;
+ }
+ ALOGD("%s: Incoming connection received on socket %d", __FUNCTION__, cSocket);
+ rxMsg();
+ ALOGD("%s: Connection terminated on socket %d", __FUNCTION__, cSocket);
+ {
+ std::lock_guard<std::mutex> lock(mTxMutex);
+ mCurSocket = -1;
+ }
+ }
+
+ // TODO: Use a blocking socket?
+ // Check every 100ms for a new socket connection
+ std::this_thread::sleep_for(std::chrono::milliseconds(100));
+ }
+
+ // Shutdown the socket
+ close(mSocket);
+ mSocket = -1;
+}
+
+// This function sets the default value of a property if we are interested in setting it.
+// TODO: Co-locate the default values with the configuration structure, to make it easier to
+// add new properties and their defaults.
+void DefaultVehicleHal::setDefaultValue(VehiclePropValue* prop) {
+ switch (prop->prop) {
+ case toInt(VehicleProperty::INFO_MAKE):
+ prop->value.stringValue = "Default Car";
+ break;
+ case toInt(VehicleProperty::HVAC_POWER_ON):
+ prop->value.int32Values[0] = 1;
+ break;
+ case toInt(VehicleProperty::HVAC_DEFROSTER):
+ prop->value.int32Values[0] = 0;
+ break;
+ case toInt(VehicleProperty::HVAC_RECIRC_ON):
+ prop->value.int32Values[0] = 1;
+ break;
+ case toInt(VehicleProperty::HVAC_AC_ON):
+ prop->value.int32Values[0] = 1;
+ break;
+ case toInt(VehicleProperty::HVAC_AUTO_ON):
+ prop->value.int32Values[0] = 1;
+ break;
+ case toInt(VehicleProperty::HVAC_FAN_SPEED):
+ prop->value.int32Values[0] = 3;
+ break;
+ case toInt(VehicleProperty::HVAC_FAN_DIRECTION):
+ prop->value.int32Values[0] = toInt(VehicleHvacFanDirection::FACE);
+ break;
+ case toInt(VehicleProperty::HVAC_TEMPERATURE_SET):
+ prop->value.floatValues[0] = 16;
+ break;
+ case toInt(VehicleProperty::NIGHT_MODE):
+ prop->value.int32Values[0] = 0;
+ break;
+ case toInt(VehicleProperty::DRIVING_STATUS):
+ prop->value.int32Values[0] = toInt(VehicleDrivingStatus::UNRESTRICTED);
+ break;
+ case toInt(VehicleProperty::GEAR_SELECTION):
+ prop->value.int32Values[0] = toInt(VehicleGear::GEAR_PARK);
+ break;
+ case toInt(VehicleProperty::INFO_FUEL_CAPACITY):
+ prop->value.floatValues[0] = 0.75f;
+ break;
+ case toInt(VehicleProperty::DISPLAY_BRIGHTNESS):
+ prop->value.int32Values[0] = 7;
+ break;
+ case toInt(VehicleProperty::IGNITION_STATE):
+ prop->value.int32Values[0] = toInt(VehicleIgnitionState::ON);
+ break;
+ case toInt(VehicleProperty::OBD2_LIVE_FRAME):
+ // OBD2 is handled separately
+ break;
+ case toInt(VehicleProperty::OBD2_FREEZE_FRAME):
+ // OBD2 is handled separately
+ break;
+ default:
+ ALOGW("%s: propId=0x%x not found", __FUNCTION__, prop->prop);
+ break;
+ }
+}
+
+// Transmit a reply back to the emulator
+void DefaultVehicleHal::txMsg(emulator::EmulatorMessage& txMsg) {
+ std::string msgString;
+
+ if (txMsg.SerializeToString(&msgString)) {
+ int32_t msgLen = msgString.length();
+ int retVal = 0;
+
+ // TODO: Prepend the message length to the string without a copy
+ msgString.insert(0, reinterpret_cast<char*>(&msgLen), 4);
+
+ // Send the message
+ {
+ std::lock_guard<std::mutex> lock(mTxMutex);
+ if (mCurSocket != -1) {
+ retVal = write(mCurSocket, msgString.data(), msgString.size());
+ }
+ }
+
+ if (retVal < 0) {
+ ALOGE("%s: Failed to tx message: retval=%d, errno=%d", __FUNCTION__, retVal, errno);
+ }
+ } else {
+ ALOGE("%s: SerializeToString failed!", __FUNCTION__);
+ }
+}
+
+// Updates the property value held in the HAL
+StatusCode DefaultVehicleHal::updateProperty(const VehiclePropValue& propValue) {
+ auto propId = propValue.prop;
+ auto areaId = propValue.areaId;
+ StatusCode status = StatusCode::INVALID_ARG;
+
+ {
+ std::lock_guard<std::mutex> lock(mPropsMutex);
+
+ VehiclePropValue* internalPropValue = getVehiclePropValueLocked(propId, areaId);
+ if (internalPropValue != nullptr) {
+ internalPropValue->value = propValue.value;
+ internalPropValue->timestamp = elapsedRealtimeNano();
+ status = StatusCode::OK;
+ }
+ }
+ return status;
+}
+
+VehicleHal::VehiclePropValuePtr DefaultVehicleHal::get(
+ const VehiclePropValue& requestedPropValue, StatusCode* outStatus) {
+ auto areaId = requestedPropValue.areaId;
+ auto& pool = *getValuePool();
+ auto propId = requestedPropValue.prop;
+ StatusCode status;
+ VehiclePropValuePtr v = nullptr;
+
+ switch (propId) {
+ case toInt(VehicleProperty::OBD2_LIVE_FRAME):
+ v = pool.obtainComplex();
+ status = fillObd2LiveFrame(v.get());
+ break;
+ case toInt(VehicleProperty::OBD2_FREEZE_FRAME):
+ v = pool.obtainComplex();
+ status = fillObd2FreezeFrame(requestedPropValue, v.get());
+ break;
+ case toInt(VehicleProperty::OBD2_FREEZE_FRAME_INFO):
+ v = pool.obtainComplex();
+ status = fillObd2DtcInfo(v.get());
+ break;
+ default:
+ {
+ std::lock_guard<std::mutex> lock(mPropsMutex);
+
+ VehiclePropValue *internalPropValue = getVehiclePropValueLocked(propId, areaId);
+ if (internalPropValue != nullptr) {
+ v = pool.obtain(*internalPropValue);
+ }
+ }
+
+ if (v != nullptr) {
+ status = StatusCode::OK;
+ } else {
+ status = StatusCode::INVALID_ARG;
+ }
+ break;
+ }
+
+ *outStatus = status;
+ return v;
+}
+
+StatusCode DefaultVehicleHal::set(const VehiclePropValue& propValue) {
+ auto propId = propValue.prop;
+ StatusCode status;
+ switch (propId) {
+ case toInt(VehicleProperty::OBD2_FREEZE_FRAME_CLEAR):
+ status = clearObd2FreezeFrames(propValue);
+ break;
+ default:
+ status = updateProperty(propValue);
+ if (status == StatusCode::OK) {
+ // Send property update to emulator
+ emulator::EmulatorMessage msg;
+ emulator::VehiclePropValue *val = msg.add_value();
+ populateProtoVehiclePropValue(val, &propValue);
+ msg.set_status(emulator::RESULT_OK);
+ msg.set_msg_type(emulator::SET_PROPERTY_ASYNC);
+ txMsg(msg);
+ }
+ break;
+ }
+
+ return status;
+}
+
+// Parse supported properties list and generate vector of property values to hold current values.
+void DefaultVehicleHal::onCreate() {
+ // Initialize member variables
+ mCurSocket = -1;
+ mExit = 0;
+ mSocket = -1;
+
+ // Get the list of configurations supported by this HAL
+ std::vector<VehiclePropConfig> configs = listProperties();
+
+ for (auto& cfg : configs) {
+ VehiclePropertyType propType = getPropType(cfg.prop);
+ int32_t supportedAreas = cfg.supportedAreas;
+ int32_t vecSize;
+
+ // Set the vector size based on property type
+ switch (propType) {
+ case VehiclePropertyType::BOOLEAN:
+ case VehiclePropertyType::INT32:
+ case VehiclePropertyType::INT64:
+ case VehiclePropertyType::FLOAT:
+ vecSize = 1;
+ break;
+ case VehiclePropertyType::INT32_VEC:
+ case VehiclePropertyType::FLOAT_VEC:
+ case VehiclePropertyType::BYTES:
+ // TODO: Add proper support for these types
+ vecSize = 1;
+ break;
+ case VehiclePropertyType::STRING:
+ // Require individual handling
+ vecSize = 0;
+ break;
+ case VehiclePropertyType::COMPLEX:
+ switch (cfg.prop) {
+ case toInt(VehicleProperty::OBD2_LIVE_FRAME):
+ initObd2LiveFrame(cfg);
+ break;
+ case toInt(VehicleProperty::OBD2_FREEZE_FRAME):
+ initObd2FreezeFrame(cfg);
+ break;
+ default:
+ // Need to handle each complex property separately
+ break;
+ }
+ continue;
+ break;
+ case VehiclePropertyType::MASK:
+ default:
+ ALOGW("%s: propType=0x%x not found", __FUNCTION__, propType);
+ vecSize = 0;
+ break;
+ }
+
+ // A global property will have supportedAreas = 0
+ if (getPropArea(cfg.prop) == VehicleArea::GLOBAL) {
+ supportedAreas = 0;
+ }
+
+ // This loop is a do-while so it executes at least once to handle global properties
+ do {
+ int32_t curArea = supportedAreas;
+
+ // Clear the right-most bit of supportedAreas
+ supportedAreas &= supportedAreas - 1;
+
+ // Set curArea to the previously cleared bit
+ curArea ^= supportedAreas;
+
+ // Create a separate instance for each individual zone
+ std::unique_ptr<VehiclePropValue> prop = createVehiclePropValue(propType, vecSize);
+ prop->areaId = curArea;
+ prop->prop = cfg.prop;
+ setDefaultValue(prop.get());
+ mProps.push_back(std::move(prop));
+ } while (supportedAreas != 0);
+ }
+
+ // Start rx thread
+ mThread = std::thread(&DefaultVehicleHal::rxThread, this);
+}
+
+StatusCode DefaultVehicleHal::fillObd2LiveFrame(VehiclePropValue* v) {
+ v->prop = toInt(VehicleProperty::OBD2_LIVE_FRAME);
+ v->value.int32Values = mLiveObd2Frame->value.int32Values;
+ v->value.floatValues = mLiveObd2Frame->value.floatValues;
+ v->value.bytes = mLiveObd2Frame->value.bytes;
+ return StatusCode::OK;
+}
+
+template<typename Iterable>
+typename Iterable::const_iterator findPropValueAtTimestamp(
+ const Iterable& frames,
+ int64_t timestamp) {
+ return std::find_if(frames.begin(),
+ frames.end(),
+ [timestamp] (const std::unique_ptr<VehiclePropValue>&
+ propValue) -> bool {
+ return propValue->timestamp == timestamp;
+ });
+}
+
+StatusCode DefaultVehicleHal::fillObd2FreezeFrame(
+ const VehiclePropValue& requestedPropValue, VehiclePropValue* v) {
+ if (requestedPropValue.value.int64Values.size() != 1) {
+ ALOGE("asked for OBD2_FREEZE_FRAME without valid timestamp");
+ return StatusCode::INVALID_ARG;
+ }
+ auto timestamp = requestedPropValue.value.int64Values[0];
+ auto freezeFrameIter = findPropValueAtTimestamp(mFreezeObd2Frames,
+ timestamp);
+ if(mFreezeObd2Frames.end() == freezeFrameIter) {
+ ALOGE("asked for OBD2_FREEZE_FRAME at invalid timestamp");
+ return StatusCode::INVALID_ARG;
+ }
+ const std::unique_ptr<VehiclePropValue>& freezeFrame = *freezeFrameIter;
+ v->prop = toInt(VehicleProperty::OBD2_FREEZE_FRAME);
+ v->value.int32Values = freezeFrame->value.int32Values;
+ v->value.floatValues = freezeFrame->value.floatValues;
+ v->value.bytes = freezeFrame->value.bytes;
+ v->value.stringValue = freezeFrame->value.stringValue;
+ v->timestamp = freezeFrame->timestamp;
+ return StatusCode::OK;
+}
+
+StatusCode DefaultVehicleHal::clearObd2FreezeFrames(
+ const VehiclePropValue& propValue) {
+ if (propValue.value.int64Values.size() == 0) {
+ mFreezeObd2Frames.clear();
+ return StatusCode::OK;
+ } else {
+ for(int64_t timestamp: propValue.value.int64Values) {
+ auto freezeFrameIter = findPropValueAtTimestamp(mFreezeObd2Frames,
+ timestamp);
+ if(mFreezeObd2Frames.end() == freezeFrameIter) {
+ ALOGE("asked for OBD2_FREEZE_FRAME at invalid timestamp");
+ return StatusCode::INVALID_ARG;
+ }
+ mFreezeObd2Frames.erase(freezeFrameIter);
+ }
+ }
+ return StatusCode::OK;
+}
+
+StatusCode DefaultVehicleHal::fillObd2DtcInfo(VehiclePropValue* v) {
+ std::vector<int64_t> timestamps;
+ for(const auto& freezeFrame: mFreezeObd2Frames) {
+ timestamps.push_back(freezeFrame->timestamp);
+ }
+ v->value.int64Values = timestamps;
+ return StatusCode::OK;
+}
+
+
+
+} // impl
+
+} // namespace V2_0
+} // namespace vehicle
+} // namespace automotive
+} // namespace hardware
+} // namespace android
diff --git a/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultVehicleHal.h b/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultVehicleHal.h
new file mode 100644
index 0000000..51f7ba3
--- /dev/null
+++ b/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultVehicleHal.h
@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2016 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.
+ */
+
+#ifndef android_hardware_automotive_vehicle_V2_0_impl_DefaultVehicleHal_H_
+#define android_hardware_automotive_vehicle_V2_0_impl_DefaultVehicleHal_H_
+
+#include <memory>
+#include <sys/socket.h>
+#include <thread>
+
+#include <utils/SystemClock.h>
+
+#include <vhal_v2_0/VehicleHal.h>
+#include <vhal_v2_0/Obd2SensorStore.h>
+
+#include "DefaultConfig.h"
+#include "VehicleHalProto.pb.h"
+
+namespace android {
+namespace hardware {
+namespace automotive {
+namespace vehicle {
+namespace V2_0 {
+
+namespace impl {
+
+class DefaultVehicleHal : public VehicleHal {
+public:
+ DefaultVehicleHal() : mThread() {}
+ ~DefaultVehicleHal() override {
+ // Notify thread to finish and wait for it to terminate
+ mExit = 1;
+
+ // Close emulator socket if it is open
+ {
+ std::lock_guard<std::mutex> lock(mTxMutex);
+ if (mCurSocket != -1) {
+ close(mCurSocket);
+ mCurSocket = -1;
+ }
+ }
+
+ mThread.join();
+ }
+
+ std::vector<VehiclePropConfig> listProperties() override {
+ return std::vector<VehiclePropConfig>(std::begin(kVehicleProperties),
+ std::end(kVehicleProperties));
+ }
+
+ VehiclePropValuePtr get(const VehiclePropValue& requestedPropValue,
+ StatusCode* outStatus) override;
+
+ void onCreate() override;
+
+ StatusCode set(const VehiclePropValue& propValue) override;
+
+ StatusCode subscribe(int32_t property, int32_t areas, float sampleRate) {
+ ALOGD("%s: not implemented: prop=0x%x, areas=0x%x, rate=%f", __FUNCTION__, property,
+ areas, sampleRate);
+ return StatusCode::OK;
+ }
+
+ StatusCode unsubscribe(int32_t property) {
+ ALOGD("%s: not implemented: prop=0x%x", __FUNCTION__, property);
+ return StatusCode::OK;
+ }
+
+private:
+ void doGetConfig(emulator::EmulatorMessage& rxMsg, emulator::EmulatorMessage& respMsg);
+ void doGetConfigAll(emulator::EmulatorMessage& rxMsg, emulator::EmulatorMessage& respMsg);
+ void doGetProperty(emulator::EmulatorMessage& rxMsg, emulator::EmulatorMessage& respMsg);
+ void doGetPropertyAll(emulator::EmulatorMessage& rxMsg, emulator::EmulatorMessage& respMsg);
+ void doSetProperty(emulator::EmulatorMessage& rxMsg, emulator::EmulatorMessage& respMsg);
+ VehiclePropValue* getVehiclePropValueLocked(int32_t propId, int32_t areaId);
+ void initObd2LiveFrame(VehiclePropConfig& propConfig);
+ void initObd2FreezeFrame(VehiclePropConfig& propConfig);
+ void parseRxProtoBuf(std::vector<uint8_t>& msg);
+ void populateProtoVehicleConfig(emulator::VehiclePropConfig* protoCfg,
+ const VehiclePropConfig& cfg);
+ void populateProtoVehiclePropValue(emulator::VehiclePropValue* protoVal,
+ const VehiclePropValue* val);
+ void setDefaultValue(VehiclePropValue* prop);
+ void rxMsg(void);
+ void rxThread(void);
+ void txMsg(emulator::EmulatorMessage& txMsg);
+ StatusCode updateProperty(const VehiclePropValue& propValue);
+ StatusCode fillObd2LiveFrame(VehiclePropValue* v);
+ StatusCode fillObd2FreezeFrame(const VehiclePropValue& requestedPropValue,
+ VehiclePropValue* v);
+ StatusCode fillObd2DtcInfo(VehiclePropValue *v);
+ StatusCode clearObd2FreezeFrames(const VehiclePropValue& propValue);
+private:
+ // TODO: Use a hashtable to support indexing props
+ std::vector<std::unique_ptr<VehiclePropValue>> mProps;
+ std::atomic<int> mCurSocket;
+ std::atomic<int> mExit;
+ std::unique_ptr<VehiclePropValue> mLiveObd2Frame {nullptr};
+ std::vector<std::unique_ptr<VehiclePropValue>> mFreezeObd2Frames;
+ std::mutex mPropsMutex;
+ int mSocket;
+ std::mutex mTxMutex;
+ std::thread mThread;
+};
+
+} // impl
+
+} // namespace V2_0
+} // namespace vehicle
+} // namespace automotive
+} // namespace hardware
+} // namespace android
+
+
+#endif // android_hardware_automotive_vehicle_V2_0_impl_DefaultVehicleHal_H_
diff --git a/automotive/vehicle/2.0/default/impl/vhal_v2_0/proto/VehicleHalProto.proto b/automotive/vehicle/2.0/default/impl/vhal_v2_0/proto/VehicleHalProto.proto
new file mode 100644
index 0000000..86433f5
--- /dev/null
+++ b/automotive/vehicle/2.0/default/impl/vhal_v2_0/proto/VehicleHalProto.proto
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2015 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.
+ */
+
+syntax = "proto2";
+option optimize_for = LITE_RUNTIME;
+
+package emulator;
+
+// CMD messages are from workstation --> VHAL
+// RESP messages are from VHAL --> workstation
+enum MsgType {
+ GET_CONFIG_CMD = 0;
+ GET_CONFIG_RESP = 1;
+ GET_CONFIG_ALL_CMD = 2;
+ GET_CONFIG_ALL_RESP = 3;
+ GET_PROPERTY_CMD = 4;
+ GET_PROPERTY_RESP = 5;
+ GET_PROPERTY_ALL_CMD = 6;
+ GET_PROPERTY_ALL_RESP = 7;
+ SET_PROPERTY_CMD = 8;
+ SET_PROPERTY_RESP = 9;
+ SET_PROPERTY_ASYNC = 10;
+}
+enum Status {
+ RESULT_OK = 0;
+ ERROR_UNKNOWN = 1;
+ ERROR_UNIMPLEMENTED_CMD = 2;
+ ERROR_INVALID_PROPERTY = 3;
+ ERROR_INVALID_AREA_ID = 4;
+ ERROR_PROPERTY_UNINITIALIZED = 5;
+ ERROR_WRITE_ONLY_PROPERTY = 6;
+ ERROR_MEMORY_ALLOC_FAILED = 7;
+ ERROR_INVALID_OPERATION = 8;
+}
+
+message VehicleAreaConfig {
+ required int32 area_id = 1;
+ optional sint32 min_int32_value = 2;
+ optional sint32 max_int32_value = 3;
+ optional sint64 min_int64_value = 4;
+ optional sint64 max_int64_value = 5;
+ optional float min_float_value = 6;
+ optional float max_float_value = 7;
+}
+
+message VehiclePropConfig {
+ required int32 prop = 1;
+ optional int32 access = 2;
+ optional int32 change_mode = 3;
+ optional int32 value_type = 4;
+ optional int32 supported_areas = 5;
+ repeated VehicleAreaConfig area_configs = 6;
+ optional int32 config_flags = 7;
+ repeated int32 config_array = 8;
+ optional string config_string = 9;
+ optional float min_sample_rate = 10;
+ optional float max_sample_rate = 11;
+};
+
+message VehiclePropValue {
+ // common data
+ required int32 prop = 1;
+ optional int32 value_type = 2;
+ optional int64 timestamp = 3; // required for valid data from HAL, skipped for set
+
+ // values
+ optional int32 area_id = 4;
+ repeated sint32 int32_values = 5; // this also covers boolean value.
+ repeated sint64 int64_values = 6;
+ repeated float float_values = 7;
+ optional string string_value = 8;
+ optional bytes bytes_value = 9;
+};
+
+// This structure is used to notify what values to get from the Vehicle HAL
+message VehiclePropGet {
+ required int32 prop = 1;
+ optional int32 area_id = 2;
+};
+
+message EmulatorMessage {
+ required MsgType msg_type = 1;
+ optional Status status = 2; // Only for RESP messages
+ repeated VehiclePropGet prop = 3; // Provided for getConfig, getProperty commands
+ repeated VehiclePropConfig config = 4;
+ repeated VehiclePropValue value = 5;
+};
diff --git a/vehicle/2.0/default/tests/AccessControlConfigParser_test.cpp b/automotive/vehicle/2.0/default/tests/AccessControlConfigParser_test.cpp
similarity index 75%
rename from vehicle/2.0/default/tests/AccessControlConfigParser_test.cpp
rename to automotive/vehicle/2.0/default/tests/AccessControlConfigParser_test.cpp
index 92d7e39..d9611c0 100644
--- a/vehicle/2.0/default/tests/AccessControlConfigParser_test.cpp
+++ b/automotive/vehicle/2.0/default/tests/AccessControlConfigParser_test.cpp
@@ -19,10 +19,12 @@
#include <fstream>
#include <unordered_set>
-#include "vehicle_hal_manager/AccessControlConfigParser.h"
+#include "vhal_v2_0/AccessControlConfigParser.h"
+#include "vhal_v2_0/VehicleUtils.h"
namespace android {
namespace hardware {
+namespace automotive {
namespace vehicle {
namespace V2_0 {
@@ -31,9 +33,9 @@
class AccessControlConfigParserTest : public ::testing::Test {
protected:
void SetUp() override {
- std::vector<VehicleProperty> supportedProperties {
- VehicleProperty::HVAC_FAN_SPEED,
- VehicleProperty::HVAC_FAN_DIRECTION,
+ std::vector<int32_t> supportedProperties {
+ toInt(VehicleProperty::HVAC_FAN_SPEED),
+ toInt(VehicleProperty::HVAC_FAN_DIRECTION),
};
parser.reset(new AccessControlConfigParser(supportedProperties));
}
@@ -48,11 +50,11 @@
ASSERT_TRUE(parser->parseFromStream(&file, &aclMap));
- ASSERT_EQ(1, aclMap.size());
- auto it = aclMap.find(VehicleProperty::HVAC_FAN_SPEED);
+ ASSERT_EQ(1u, aclMap.size());
+ auto it = aclMap.find(toInt(VehicleProperty::HVAC_FAN_SPEED));
ASSERT_NE(aclMap.end(), it);
ASSERT_EQ(VehiclePropertyAccess::READ_WRITE, it->second.access);
- ASSERT_EQ(VehicleProperty::HVAC_FAN_SPEED, it->second.propId);
+ ASSERT_EQ(toInt(VehicleProperty::HVAC_FAN_SPEED), it->second.propId);
ASSERT_EQ(1000u, it->second.uid);
}
@@ -68,11 +70,11 @@
ASSERT_TRUE(parser->parseFromStream(&file, &aclMap));
- auto range = aclMap.equal_range(VehicleProperty::HVAC_FAN_SPEED);
+ auto range = aclMap.equal_range(toInt(VehicleProperty::HVAC_FAN_SPEED));
for (auto it = range.first; it != range.second; ++it) {
auto& acl = it->second;
- ASSERT_EQ(1, expectedUids.count(acl.uid))
+ ASSERT_EQ(1u, expectedUids.count(acl.uid))
<< " uid: " << std::hex << acl.uid;
if (acl.uid == 0xbeef) {
@@ -91,12 +93,12 @@
ASSERT_FALSE(parser->parseFromStream(&file, &aclMap));
- ASSERT_EQ(1, aclMap.size());
- auto it = aclMap.find(VehicleProperty::HVAC_FAN_SPEED);
+ ASSERT_EQ(1u, aclMap.size());
+ auto it = aclMap.find(toInt(VehicleProperty::HVAC_FAN_SPEED));
ASSERT_NE(aclMap.end(), it);
ASSERT_EQ(VehiclePropertyAccess::READ, it->second.access);
- ASSERT_EQ(VehicleProperty::HVAC_FAN_SPEED, it->second.propId);
- ASSERT_EQ(0xbeef, it->second.uid);
+ ASSERT_EQ(toInt(VehicleProperty::HVAC_FAN_SPEED), it->second.propId);
+ ASSERT_EQ(0xBEEFu, it->second.uid);
}
TEST_F(AccessControlConfigParserTest, badIntegerFormat) {
@@ -104,7 +106,7 @@
file << "S:0x0500 A12 RW " << std::endl;
ASSERT_FALSE(parser->parseFromStream(&file, &aclMap));
- ASSERT_EQ(0, aclMap.size());
+ ASSERT_EQ(0u, aclMap.size());
}
TEST_F(AccessControlConfigParserTest, ignoreNotSupportedProperties) {
@@ -112,7 +114,7 @@
file << "S:0x0666 1000 RW " << std::endl;
ASSERT_FALSE(parser->parseFromStream(&file, &aclMap));
- ASSERT_EQ(0, aclMap.size());
+ ASSERT_EQ(0u, aclMap.size());
}
TEST_F(AccessControlConfigParserTest, multipleCalls) {
@@ -120,23 +122,23 @@
configFile << "S:0x0500 1000 RW" << std::endl;
ASSERT_TRUE(parser->parseFromStream(&configFile, &aclMap));
- ASSERT_EQ(1, aclMap.size());
+ ASSERT_EQ(1u, aclMap.size());
std::stringstream configFile2;
configFile2 << "S:0x0501 1004 RW" << std::endl;
ASSERT_TRUE(parser->parseFromStream(&configFile2, &aclMap));
- ASSERT_EQ(2, aclMap.size());
+ ASSERT_EQ(2u, aclMap.size());
- auto it = aclMap.find(VehicleProperty::HVAC_FAN_SPEED);
+ auto it = aclMap.find(toInt(VehicleProperty::HVAC_FAN_SPEED));
ASSERT_NE(aclMap.end(), it);
ASSERT_EQ(VehiclePropertyAccess::READ_WRITE, it->second.access);
- ASSERT_EQ(VehicleProperty::HVAC_FAN_SPEED, it->second.propId);
+ ASSERT_EQ(toInt(VehicleProperty::HVAC_FAN_SPEED), it->second.propId);
ASSERT_EQ(1000u, it->second.uid);
- it = aclMap.find(VehicleProperty::HVAC_FAN_DIRECTION);
+ it = aclMap.find(toInt(VehicleProperty::HVAC_FAN_DIRECTION));
ASSERT_NE(aclMap.end(), it);
ASSERT_EQ(VehiclePropertyAccess::READ_WRITE, it->second.access);
- ASSERT_EQ(VehicleProperty::HVAC_FAN_DIRECTION, it->second.propId);
+ ASSERT_EQ(toInt(VehicleProperty::HVAC_FAN_DIRECTION), it->second.propId);
ASSERT_EQ(1004u, it->second.uid);
}
@@ -145,5 +147,6 @@
} // namespace V2_0
} // namespace vehicle
+} // namespace automotive
} // namespace hardware
} // namespace android
diff --git a/automotive/vehicle/2.0/default/tests/Obd2SensorStore_test.cpp b/automotive/vehicle/2.0/default/tests/Obd2SensorStore_test.cpp
new file mode 100644
index 0000000..a01c0f4
--- /dev/null
+++ b/automotive/vehicle/2.0/default/tests/Obd2SensorStore_test.cpp
@@ -0,0 +1,285 @@
+/*
+ * Copyright (C) 2017 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.
+ */
+
+ #include <gtest/gtest.h>
+
+#include "vhal_v2_0/Obd2SensorStore.h"
+#include "vhal_v2_0/VehicleUtils.h"
+
+namespace android {
+namespace hardware {
+namespace automotive {
+namespace vehicle {
+namespace V2_0 {
+
+namespace {
+
+static constexpr size_t getNumVendorIntegerSensors() {
+ return 5;
+}
+static constexpr size_t getNumVendorFloatSensors() {
+ return 3;
+}
+
+// this struct holds information necessary for a test to be able to validate
+// that the sensor bitmask contains the right data:
+// - the index of the byte at which the bit for a given sensor lives
+// - the expected value of that byte given that a certain sensor is present
+class BitmaskIndexingInfo {
+public:
+ size_t mByteIndex;
+ uint8_t mExpectedByteValue;
+
+ // Returns the information required to validate the bitmask for an
+ // integer-valued sensor.
+ static BitmaskIndexingInfo getForIntegerSensor(size_t index) {
+ const size_t indexInBitstream = index;
+ return getForBitstreamIndex(indexInBitstream);
+ }
+
+ // Returns the information required to validate the bitmask for a
+ // float-valued sensor.
+ static BitmaskIndexingInfo getForFloatSensor(size_t index) {
+ const size_t indexInBitstream = toInt(Obd2IntegerSensorIndex::LAST_SYSTEM_INDEX) +
+ 1 + getNumVendorIntegerSensors() + index;
+ return getForBitstreamIndex(indexInBitstream);
+ }
+
+private:
+ static BitmaskIndexingInfo getForBitstreamIndex(size_t indexInBitstream) {
+ BitmaskIndexingInfo indexingInfo;
+ indexingInfo.mByteIndex = indexInBitstream / 8;
+ indexingInfo.mExpectedByteValue = 1 << (indexInBitstream % 8);
+ return indexingInfo;
+ }
+};
+
+static Obd2SensorStore getSensorStore() {
+ return Obd2SensorStore(getNumVendorIntegerSensors(),
+ getNumVendorFloatSensors());
+}
+
+// Test that one can set and retrieve a value for the first integer sensor.
+TEST(Obd2SensorStoreTest, setFirstIntegerSensor) {
+ Obd2SensorStore sensorStore(getSensorStore());
+ sensorStore.setIntegerSensor(
+ Obd2IntegerSensorIndex::FUEL_SYSTEM_STATUS,
+ toInt(FuelSystemStatus::CLOSED_LOOP));
+ const auto& integerSensors(sensorStore.getIntegerSensors());
+ const auto& sensorBitmask(sensorStore.getSensorsBitmask());
+ ASSERT_EQ(
+ toInt(FuelSystemStatus::CLOSED_LOOP),
+ integerSensors[toInt(Obd2IntegerSensorIndex::FUEL_SYSTEM_STATUS)]);
+ const BitmaskIndexingInfo indexingInfo(BitmaskIndexingInfo::getForIntegerSensor(
+ toInt(Obd2IntegerSensorIndex::FUEL_SYSTEM_STATUS)));
+ ASSERT_EQ(
+ indexingInfo.mExpectedByteValue,
+ sensorBitmask[indexingInfo.mByteIndex]);
+}
+
+// Test that one can set and retrieve a value for the first float sensor.
+TEST(Obd2SensorStoreTest, setFirstFloatSensor) {
+ Obd2SensorStore sensorStore(getSensorStore());
+ sensorStore.setFloatSensor(
+ Obd2FloatSensorIndex::CALCULATED_ENGINE_LOAD,
+ 1.25f);
+ const auto& floatSensors(sensorStore.getFloatSensors());
+ const auto& sensorBitmask(sensorStore.getSensorsBitmask());
+ ASSERT_EQ(
+ 1.25f,
+ floatSensors[toInt(Obd2FloatSensorIndex::CALCULATED_ENGINE_LOAD)]);
+ const BitmaskIndexingInfo indexingInfo(BitmaskIndexingInfo::getForFloatSensor(
+ toInt(Obd2FloatSensorIndex::CALCULATED_ENGINE_LOAD)));
+ ASSERT_EQ(
+ indexingInfo.mExpectedByteValue,
+ sensorBitmask[indexingInfo.mByteIndex]);
+}
+
+// Test that one can set and retrieve a value for an integer sensor.
+TEST(Obd2SensorStoreTest, setAnyIntegerSensor) {
+ Obd2SensorStore sensorStore(getSensorStore());
+ sensorStore.setIntegerSensor(
+ Obd2IntegerSensorIndex::ABSOLUTE_BAROMETRIC_PRESSURE,
+ 4000);
+ const auto& integerSensors(sensorStore.getIntegerSensors());
+ const auto& sensorBitmask(sensorStore.getSensorsBitmask());
+ ASSERT_EQ(4000,
+ integerSensors[toInt(Obd2IntegerSensorIndex::ABSOLUTE_BAROMETRIC_PRESSURE)]);
+ const BitmaskIndexingInfo indexingInfo(BitmaskIndexingInfo::getForIntegerSensor(
+ toInt(Obd2IntegerSensorIndex::ABSOLUTE_BAROMETRIC_PRESSURE)));
+ ASSERT_EQ(
+ indexingInfo.mExpectedByteValue,
+ sensorBitmask[indexingInfo.mByteIndex]);
+}
+
+// Test that one can set and retrieve a value for a float sensor.
+TEST(Obd2SensorStoreTest, setAnyFloatSensor) {
+ Obd2SensorStore sensorStore(getSensorStore());
+ sensorStore.setFloatSensor(
+ Obd2FloatSensorIndex::OXYGEN_SENSOR3_VOLTAGE,
+ 2.5f);
+ const auto& floatSensors(sensorStore.getFloatSensors());
+ const auto& sensorBitmask(sensorStore.getSensorsBitmask());
+ ASSERT_EQ(2.5f,
+ floatSensors[toInt(Obd2FloatSensorIndex::OXYGEN_SENSOR3_VOLTAGE)]);
+ const BitmaskIndexingInfo indexingInfo(BitmaskIndexingInfo::getForFloatSensor(
+ toInt(Obd2FloatSensorIndex::OXYGEN_SENSOR3_VOLTAGE)));
+ ASSERT_EQ(
+ indexingInfo.mExpectedByteValue,
+ sensorBitmask[indexingInfo.mByteIndex]);
+}
+
+// Test that one can set and retrieve a value for the last system integer sensor.
+TEST(Obd2SensorStoreTest, setLastSystemIntegerSensor) {
+ Obd2SensorStore sensorStore(getSensorStore());
+ sensorStore.setIntegerSensor(
+ Obd2IntegerSensorIndex::LAST_SYSTEM_INDEX,
+ 30);
+ const auto& integerSensors(sensorStore.getIntegerSensors());
+ const auto& sensorBitmask(sensorStore.getSensorsBitmask());
+ ASSERT_EQ(30,
+ integerSensors[toInt(Obd2IntegerSensorIndex::LAST_SYSTEM_INDEX)]);
+ const BitmaskIndexingInfo indexingInfo(BitmaskIndexingInfo::getForIntegerSensor(
+ toInt(Obd2IntegerSensorIndex::LAST_SYSTEM_INDEX)));
+ ASSERT_EQ(
+ indexingInfo.mExpectedByteValue,
+ sensorBitmask[indexingInfo.mByteIndex]);
+}
+
+// Test that one can set and retrieve a value for the last system float sensor.
+TEST(Obd2SensorStoreTest, setLastSystemFloatSensor) {
+ Obd2SensorStore sensorStore(getSensorStore());
+ sensorStore.setFloatSensor(
+ Obd2FloatSensorIndex::LAST_SYSTEM_INDEX,
+ 2.5f);
+ const auto& floatSensors(sensorStore.getFloatSensors());
+ const auto& sensorBitmask(sensorStore.getSensorsBitmask());
+ ASSERT_EQ(2.5f,
+ floatSensors[toInt(Obd2FloatSensorIndex::LAST_SYSTEM_INDEX)]);
+ const BitmaskIndexingInfo indexingInfo(BitmaskIndexingInfo::getForFloatSensor(
+ toInt(Obd2FloatSensorIndex::LAST_SYSTEM_INDEX)));
+ ASSERT_EQ(
+ indexingInfo.mExpectedByteValue,
+ sensorBitmask[indexingInfo.mByteIndex]);
+}
+
+// Test that one can set and retrieve a value for two integer sensors at once.
+TEST(Obd2SensorStoreTest, setTwoIntegerSensors) {
+ Obd2SensorStore sensorStore(getSensorStore());
+ sensorStore.setIntegerSensor(
+ Obd2IntegerSensorIndex::CONTROL_MODULE_VOLTAGE,
+ 6);
+ sensorStore.setIntegerSensor(
+ Obd2IntegerSensorIndex::TIME_SINCE_TROUBLE_CODES_CLEARED,
+ 1245);
+ const auto& integerSensors(sensorStore.getIntegerSensors());
+ const auto& sensorBitmask(sensorStore.getSensorsBitmask());
+ ASSERT_EQ(6,
+ integerSensors[toInt(Obd2IntegerSensorIndex::CONTROL_MODULE_VOLTAGE)]);
+ ASSERT_EQ(1245,
+ integerSensors[toInt(Obd2IntegerSensorIndex::TIME_SINCE_TROUBLE_CODES_CLEARED)]);
+ const BitmaskIndexingInfo voltageIndexingInfo(BitmaskIndexingInfo::getForIntegerSensor(
+ toInt(Obd2IntegerSensorIndex::CONTROL_MODULE_VOLTAGE)));
+ const BitmaskIndexingInfo timeIndexingInfo(BitmaskIndexingInfo::getForIntegerSensor(
+ toInt(Obd2IntegerSensorIndex::TIME_SINCE_TROUBLE_CODES_CLEARED)));
+ if (voltageIndexingInfo.mByteIndex == timeIndexingInfo.mByteIndex) {
+ ASSERT_EQ(
+ voltageIndexingInfo.mExpectedByteValue |
+ timeIndexingInfo.mExpectedByteValue,
+ sensorBitmask[timeIndexingInfo.mByteIndex]);
+ }
+ else {
+ ASSERT_EQ(
+ timeIndexingInfo.mExpectedByteValue,
+ sensorBitmask[timeIndexingInfo.mByteIndex]);
+ ASSERT_EQ(
+ voltageIndexingInfo.mExpectedByteValue,
+ sensorBitmask[voltageIndexingInfo.mByteIndex]);
+ }
+}
+
+// Test that one can set and retrieve a value for two float sensors at once.
+TEST(Obd2SensorStoreTest, setTwoFloatSensors) {
+ Obd2SensorStore sensorStore(getSensorStore());
+ sensorStore.setFloatSensor(
+ Obd2FloatSensorIndex::VEHICLE_SPEED,
+ 1.25f);
+ sensorStore.setFloatSensor(
+ Obd2FloatSensorIndex::MAF_AIR_FLOW_RATE,
+ 2.5f);
+ const auto& floatSensors(sensorStore.getFloatSensors());
+ const auto& sensorBitmask(sensorStore.getSensorsBitmask());
+ ASSERT_EQ(1.25f,
+ floatSensors[toInt(Obd2FloatSensorIndex::VEHICLE_SPEED)]);
+ ASSERT_EQ(2.5f,
+ floatSensors[toInt(Obd2FloatSensorIndex::MAF_AIR_FLOW_RATE)]);
+ const BitmaskIndexingInfo speedIndexingInfo(BitmaskIndexingInfo::getForFloatSensor(
+ toInt(Obd2FloatSensorIndex::VEHICLE_SPEED)));
+ const BitmaskIndexingInfo airflowIndexingInfo(BitmaskIndexingInfo::getForFloatSensor(
+ toInt(Obd2FloatSensorIndex::MAF_AIR_FLOW_RATE)));
+ if (speedIndexingInfo.mByteIndex == airflowIndexingInfo.mByteIndex) {
+ ASSERT_EQ(
+ speedIndexingInfo.mExpectedByteValue |
+ airflowIndexingInfo.mExpectedByteValue,
+ sensorBitmask[airflowIndexingInfo.mByteIndex]);
+ }
+ else {
+ ASSERT_EQ(
+ speedIndexingInfo.mExpectedByteValue,
+ sensorBitmask[speedIndexingInfo.mByteIndex]);
+ ASSERT_EQ(
+ airflowIndexingInfo.mExpectedByteValue,
+ sensorBitmask[airflowIndexingInfo.mByteIndex]);
+ }
+}
+
+// Test that one can set and retrieve a value for a vendor integer sensor.
+TEST(Obd2SensorStoreTest, setVendorIntegerSensor) {
+ const size_t sensorIndex = toInt(Obd2IntegerSensorIndex::LAST_SYSTEM_INDEX) + 2;
+ Obd2SensorStore sensorStore(getSensorStore());
+ sensorStore.setIntegerSensor(sensorIndex, 22);
+ const auto& integerSensors(sensorStore.getIntegerSensors());
+ const auto& sensorBitmask(sensorStore.getSensorsBitmask());
+ ASSERT_EQ(22, integerSensors[sensorIndex]);
+ const BitmaskIndexingInfo indexingInfo(BitmaskIndexingInfo::getForIntegerSensor(
+ sensorIndex));
+ ASSERT_EQ(
+ indexingInfo.mExpectedByteValue,
+ sensorBitmask[indexingInfo.mByteIndex]);
+}
+
+// Test that one can set and retrieve a value for a vendor float sensor.
+TEST(Obd2SensorStoreTest, setVendorFloatSensor) {
+ const size_t sensorIndex = toInt(Obd2FloatSensorIndex::LAST_SYSTEM_INDEX) + 2;
+ Obd2SensorStore sensorStore(getSensorStore());
+ sensorStore.setFloatSensor(sensorIndex, 1.25f);
+ const auto& floatSensors(sensorStore.getFloatSensors());
+ const auto& sensorBitmask(sensorStore.getSensorsBitmask());
+ ASSERT_EQ(1.25f, floatSensors[sensorIndex]);
+ const BitmaskIndexingInfo indexingInfo(BitmaskIndexingInfo::getForFloatSensor(
+ sensorIndex));
+ ASSERT_EQ(
+ indexingInfo.mExpectedByteValue,
+ sensorBitmask[indexingInfo.mByteIndex]);
+}
+
+} // namespace anonymous
+
+} // namespace V2_0
+} // namespace vehicle
+} // namespace automotive
+} // namespace hardware
+} // namespace android
diff --git a/vehicle/2.0/default/tests/SubscriptionManager_test.cpp b/automotive/vehicle/2.0/default/tests/SubscriptionManager_test.cpp
similarity index 94%
rename from vehicle/2.0/default/tests/SubscriptionManager_test.cpp
rename to automotive/vehicle/2.0/default/tests/SubscriptionManager_test.cpp
index 863142e..e13d003 100644
--- a/vehicle/2.0/default/tests/SubscriptionManager_test.cpp
+++ b/automotive/vehicle/2.0/default/tests/SubscriptionManager_test.cpp
@@ -19,12 +19,13 @@
#include <gtest/gtest.h>
-#include "vehicle_hal_manager/SubscriptionManager.h"
+#include "vhal_v2_0/SubscriptionManager.h"
#include "VehicleHalTestUtils.h"
namespace android {
namespace hardware {
+namespace automotive {
namespace vehicle {
namespace V2_0 {
@@ -36,8 +37,8 @@
public:
SubscriptionManager manager;
- const VehicleProperty PROP1 = VehicleProperty::HVAC_FAN_SPEED;
- const VehicleProperty PROP2 = VehicleProperty::DISPLAY_BRIGHTNESS;
+ static constexpr int32_t PROP1 = toInt(VehicleProperty::HVAC_FAN_SPEED);
+ static constexpr int32_t PROP2 = toInt(VehicleProperty::DISPLAY_BRIGHTNESS);
sp<IVehicleCallback> cb1 = new MockedVehicleCallback();
sp<IVehicleCallback> cb2 = new MockedVehicleCallback();
@@ -116,7 +117,7 @@
// Wrong prop
clients = manager.getSubscribedClients(
- VehicleProperty::AP_POWER_BOOTUP_REASON,
+ toInt(VehicleProperty::AP_POWER_BOOTUP_REASON),
toInt(VehicleAreaZone::ROW_1_LEFT),
SubscribeFlags::HAL_EVENT);
ASSERT_TRUE(clients.empty());
@@ -192,5 +193,6 @@
} // namespace V2_0
} // namespace vehicle
+} // namespace automotive
} // namespace hardware
} // namespace android
diff --git a/vehicle/2.0/default/tests/VehicleHalManager_test.cpp b/automotive/vehicle/2.0/default/tests/VehicleHalManager_test.cpp
similarity index 86%
rename from vehicle/2.0/default/tests/VehicleHalManager_test.cpp
rename to automotive/vehicle/2.0/default/tests/VehicleHalManager_test.cpp
index dc32252..f637344 100644
--- a/vehicle/2.0/default/tests/VehicleHalManager_test.cpp
+++ b/automotive/vehicle/2.0/default/tests/VehicleHalManager_test.cpp
@@ -21,12 +21,13 @@
#include <gtest/gtest.h>
-#include "vehicle_hal_manager/VehicleHalManager.h"
+#include "vhal_v2_0/VehicleHalManager.h"
#include "VehicleHalTestUtils.h"
namespace android {
namespace hardware {
+namespace automotive {
namespace vehicle {
namespace V2_0 {
@@ -52,7 +53,7 @@
StatusCode* outStatus) override {
*outStatus = StatusCode::OK;
VehiclePropValuePtr pValue;
- VehicleProperty property = requestedPropValue.prop;
+ auto property = static_cast<VehicleProperty>(requestedPropValue.prop);
int32_t areaId = requestedPropValue.areaId;
switch (property) {
@@ -76,7 +77,7 @@
pValue->value.stringValue = kCarMake;
break;
default:
- auto key = makeKey(property, areaId);
+ auto key = makeKey(toInt(property), areaId);
if (mValues.count(key) == 0) {
ALOGW("");
}
@@ -84,7 +85,7 @@
}
if (*outStatus == StatusCode::OK && pValue.get() != nullptr) {
- pValue->prop = property;
+ pValue->prop = toInt(property);
pValue->areaId = areaId;
pValue->timestamp = elapsedRealtimeNano();
}
@@ -93,7 +94,7 @@
}
StatusCode set(const VehiclePropValue& propValue) override {
- if (VehicleProperty::MIRROR_FOLD == propValue.prop
+ if (toInt(VehicleProperty::MIRROR_FOLD) == propValue.prop
&& mirrorFoldAttemptsLeft-- > 0) {
return StatusCode::TRY_AGAIN;
}
@@ -102,13 +103,13 @@
return StatusCode::OK;
}
- StatusCode subscribe(VehicleProperty property,
- int32_t areas,
- float sampleRate) override {
+ StatusCode subscribe(int32_t /* property */,
+ int32_t /* areas */,
+ float /* sampleRate */) override {
return StatusCode::OK;
}
- StatusCode unsubscribe(VehicleProperty property) override {
+ StatusCode unsubscribe(int32_t /* property */) override {
return StatusCode::OK;
}
@@ -116,8 +117,7 @@
doHalEvent(std::move(value));
}
- void sendHalError(StatusCode error, VehicleProperty property,
- int32_t areaId) {
+ void sendHalError(StatusCode error, int32_t property, int32_t areaId) {
doHalPropertySetError(error, property, areaId);
}
@@ -130,7 +130,7 @@
return makeKey(v.prop, v.areaId);
}
- int64_t makeKey(VehicleProperty prop, int32_t area) const {
+ int64_t makeKey(int32_t prop, int32_t area) const {
return (static_cast<int64_t>(prop) << 32) | area;
}
@@ -153,7 +153,7 @@
hal.reset(nullptr);
}
public:
- void invokeGet(VehicleProperty property, int32_t areaId) {
+ void invokeGet(int32_t property, int32_t areaId) {
VehiclePropValue requestedValue {};
requestedValue.prop = property;
requestedValue.areaId = areaId;
@@ -174,7 +174,7 @@
called = true;
});
ASSERT_TRUE(called) << "callback wasn't called for prop: "
- << enumToHexString(requestedPropValue.prop);
+ << hexString(requestedPropValue.prop);
actualValue = refValue;
actualStatusCode = refStatus;
@@ -190,8 +190,9 @@
};
TEST_F(VehicleHalManagerTest, getPropConfigs) {
- hidl_vec<VehicleProperty> properties =
- { VehicleProperty::HVAC_FAN_SPEED, VehicleProperty::INFO_MAKE };
+ hidl_vec<int32_t> properties =
+ { toInt(VehicleProperty::HVAC_FAN_SPEED),
+ toInt(VehicleProperty::INFO_MAKE) };
bool called = false;
manager->getPropConfigs(properties,
@@ -205,7 +206,7 @@
ASSERT_TRUE(called); // Verify callback received.
called = false;
- manager->getPropConfigs({ VehicleProperty::HVAC_FAN_SPEED },
+ manager->getPropConfigs({ toInt(VehicleProperty::HVAC_FAN_SPEED) },
[&called] (StatusCode status,
const hidl_vec<VehiclePropConfig>& c) {
ASSERT_EQ(StatusCode::OK, status);
@@ -234,7 +235,7 @@
}
TEST_F(VehicleHalManagerTest, halErrorEvent) {
- const VehicleProperty PROP = VehicleProperty::DISPLAY_BRIGHTNESS;
+ const auto PROP = toInt(VehicleProperty::DISPLAY_BRIGHTNESS);
sp<MockedVehicleCallback> cb = new MockedVehicleCallback();
@@ -252,7 +253,7 @@
}
TEST_F(VehicleHalManagerTest, subscribe) {
- const VehicleProperty PROP = VehicleProperty::DISPLAY_BRIGHTNESS;
+ const auto PROP = toInt(VehicleProperty::DISPLAY_BRIGHTNESS);
sp<MockedVehicleCallback> cb = new MockedVehicleCallback();
@@ -267,7 +268,7 @@
ASSERT_EQ(StatusCode::OK, res);
auto unsubscribedValue = objectPool->obtain(VehiclePropertyType::INT32);
- unsubscribedValue->prop = VehicleProperty::HVAC_FAN_SPEED;
+ unsubscribedValue->prop = toInt(VehicleProperty::HVAC_FAN_SPEED);
hal->sendPropEvent(std::move(unsubscribedValue));
auto& receivedEnvents = cb->getReceivedEvents();
@@ -293,7 +294,7 @@
}
TEST_F(VehicleHalManagerTest, subscribe_WriteOnly) {
- const VehicleProperty PROP = VehicleProperty::HVAC_SEAT_TEMPERATURE;
+ const auto PROP = toInt(VehicleProperty::HVAC_SEAT_TEMPERATURE);
sp<MockedVehicleCallback> cb = new MockedVehicleCallback();
@@ -317,25 +318,25 @@
}
TEST_F(VehicleHalManagerTest, get_Complex) {
- invokeGet(VehicleProperty::VEHICLE_MAP_SERVICE, 0);
+ invokeGet(toInt(VehicleProperty::VEHICLE_MAP_SERVICE), 0);
ASSERT_EQ(StatusCode::OK, actualStatusCode);
- ASSERT_EQ(VehicleProperty::VEHICLE_MAP_SERVICE, actualValue.prop);
+ ASSERT_EQ(toInt(VehicleProperty::VEHICLE_MAP_SERVICE), actualValue.prop);
- ASSERT_EQ(3, actualValue.value.bytes.size());
+ ASSERT_EQ(3u, actualValue.value.bytes.size());
ASSERT_EQ(1, actualValue.value.bytes[0]);
ASSERT_EQ(2, actualValue.value.bytes[1]);
ASSERT_EQ(3, actualValue.value.bytes[2]);
- ASSERT_EQ(2, actualValue.value.int32Values.size());
+ ASSERT_EQ(2u, actualValue.value.int32Values.size());
ASSERT_EQ(10, actualValue.value.int32Values[0]);
ASSERT_EQ(20, actualValue.value.int32Values[1]);
- ASSERT_EQ(2, actualValue.value.floatValues.size());
+ ASSERT_EQ(2u, actualValue.value.floatValues.size());
ASSERT_FLOAT_EQ(1.1, actualValue.value.floatValues[0]);
ASSERT_FLOAT_EQ(2.2, actualValue.value.floatValues[1]);
- ASSERT_EQ(2, actualValue.value.int64Values.size());
+ ASSERT_EQ(2u, actualValue.value.int64Values.size());
ASSERT_FLOAT_EQ(30, actualValue.value.int64Values[0]);
ASSERT_FLOAT_EQ(40, actualValue.value.int64Values[1]);
@@ -343,20 +344,20 @@
}
TEST_F(VehicleHalManagerTest, get_StaticString) {
- invokeGet(VehicleProperty::INFO_MAKE, 0);
+ invokeGet(toInt(VehicleProperty::INFO_MAKE), 0);
ASSERT_EQ(StatusCode::OK, actualStatusCode);
- ASSERT_EQ(VehicleProperty::INFO_MAKE, actualValue.prop);
+ ASSERT_EQ(toInt(VehicleProperty::INFO_MAKE), actualValue.prop);
ASSERT_STREQ(kCarMake, actualValue.value.stringValue.c_str());
}
TEST_F(VehicleHalManagerTest, get_NegativeCases) {
// Write-only property must fail.
- invokeGet(VehicleProperty::HVAC_SEAT_TEMPERATURE, 0);
+ invokeGet(toInt(VehicleProperty::HVAC_SEAT_TEMPERATURE), 0);
ASSERT_EQ(StatusCode::ACCESS_DENIED, actualStatusCode);
// Unknown property must fail.
- invokeGet(VehicleProperty::MIRROR_Z_MOVE, 0);
+ invokeGet(toInt(VehicleProperty::MIRROR_Z_MOVE), 0);
ASSERT_EQ(StatusCode::INVALID_ARG, actualStatusCode);
}
@@ -364,7 +365,7 @@
actualStatusCode = StatusCode::TRY_AGAIN;
int attempts = 0;
while (StatusCode::TRY_AGAIN == actualStatusCode && ++attempts < 10) {
- invokeGet(VehicleProperty::INFO_FUEL_CAPACITY, 0);
+ invokeGet(toInt(VehicleProperty::INFO_FUEL_CAPACITY), 0);
}
ASSERT_EQ(StatusCode::OK, actualStatusCode);
@@ -373,7 +374,7 @@
}
TEST_F(VehicleHalManagerTest, set_Basic) {
- const auto PROP = VehicleProperty::DISPLAY_BRIGHTNESS;
+ const auto PROP = toInt(VehicleProperty::DISPLAY_BRIGHTNESS);
const auto VAL = 7;
auto expectedValue = hal->getValuePool()->obtainInt32(VAL);
@@ -390,7 +391,7 @@
}
TEST_F(VehicleHalManagerTest, set_DifferentAreas) {
- const auto PROP = VehicleProperty::HVAC_FAN_SPEED;
+ const auto PROP = toInt(VehicleProperty::HVAC_FAN_SPEED);
const auto VAL1 = 1;
const auto VAL2 = 2;
const auto AREA1 = toInt(VehicleAreaZone::ROW_1_LEFT);
@@ -426,7 +427,7 @@
}
TEST_F(VehicleHalManagerTest, set_Retriable) {
- const auto PROP = VehicleProperty::MIRROR_FOLD;
+ const auto PROP = toInt(VehicleProperty::MIRROR_FOLD);
auto v = hal->getValuePool()->obtainBoolean(true);
v->prop = PROP;
@@ -471,5 +472,6 @@
} // namespace V2_0
} // namespace vehicle
+} // namespace automotive
} // namespace hardware
} // namespace android
diff --git a/vehicle/2.0/default/tests/VehicleHalTestUtils.h b/automotive/vehicle/2.0/default/tests/VehicleHalTestUtils.h
similarity index 86%
rename from vehicle/2.0/default/tests/VehicleHalTestUtils.h
rename to automotive/vehicle/2.0/default/tests/VehicleHalTestUtils.h
index 538c022..ce1ed7d 100644
--- a/vehicle/2.0/default/tests/VehicleHalTestUtils.h
+++ b/automotive/vehicle/2.0/default/tests/VehicleHalTestUtils.h
@@ -14,29 +14,31 @@
* limitations under the License.
*/
-#ifndef android_hardware_vehicle_V2_0_VehicleDebugUtils_H_
-#define android_hardware_vehicle_V2_0_VehicleDebugUtils_H_
+#ifndef android_hardware_automotive_vehicle_V2_0_VehicleDebugUtils_H_
+#define android_hardware_automotive_vehicle_V2_0_VehicleDebugUtils_H_
-#include <android/hardware/vehicle/2.0/types.h>
-#include <vehicle_hal_manager/VehicleUtils.h>
+#include <android/hardware/automotive/vehicle/2.0/types.h>
#include <ios>
#include <sstream>
+#include "vhal_v2_0/VehicleUtils.h"
+
namespace android {
namespace hardware {
+namespace automotive {
namespace vehicle {
namespace V2_0 {
const VehiclePropConfig kVehicleProperties[] = {
{
- .prop = VehicleProperty::INFO_MAKE,
+ .prop = toInt(VehicleProperty::INFO_MAKE),
.access = VehiclePropertyAccess::READ,
.changeMode = VehiclePropertyChangeMode::STATIC,
.configString = "Some=config,options=if,you=have_any",
},
{
- .prop = VehicleProperty::HVAC_FAN_SPEED,
+ .prop = toInt(VehicleProperty::HVAC_FAN_SPEED),
.access = VehiclePropertyAccess::READ_WRITE,
.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
.supportedAreas = static_cast<int32_t>(
@@ -56,7 +58,7 @@
// Write-only property
{
- .prop = VehicleProperty::HVAC_SEAT_TEMPERATURE,
+ .prop = toInt(VehicleProperty::HVAC_SEAT_TEMPERATURE),
.access = VehiclePropertyAccess::WRITE,
.changeMode = VehiclePropertyChangeMode::ON_SET,
.supportedAreas = static_cast<int32_t>(
@@ -75,7 +77,7 @@
},
{
- .prop = VehicleProperty::INFO_FUEL_CAPACITY,
+ .prop = toInt(VehicleProperty::INFO_FUEL_CAPACITY),
.access = VehiclePropertyAccess::READ,
.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
.areaConfigs = {
@@ -87,7 +89,7 @@
},
{
- .prop = VehicleProperty::DISPLAY_BRIGHTNESS,
+ .prop = toInt(VehicleProperty::DISPLAY_BRIGHTNESS),
.access = VehiclePropertyAccess::READ_WRITE,
.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
.areaConfigs = {
@@ -99,7 +101,7 @@
},
{
- .prop = VehicleProperty::MIRROR_FOLD,
+ .prop = toInt(VehicleProperty::MIRROR_FOLD),
.access = VehiclePropertyAccess::READ_WRITE,
.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
@@ -107,7 +109,7 @@
// Complex data type.
{
- .prop = VehicleProperty::VEHICLE_MAP_SERVICE,
+ .prop = toInt(VehicleProperty::VEHICLE_MAP_SERVICE),
.access = VehiclePropertyAccess::READ_WRITE,
.changeMode = VehiclePropertyChangeMode::ON_CHANGE
}
@@ -120,7 +122,7 @@
using MuxGuard = std::lock_guard<std::mutex>;
using HidlVecOfValues = hidl_vec<VehiclePropValue>;
public:
- // Methods from ::android::hardware::vehicle::V2_0::IVehicleCallback follow.
+ // Methods from ::android::hardware::automotive::vehicle::V2_0::IVehicleCallback follow.
Return<void> onPropertyEvent(
const hidl_vec<VehiclePropValue>& values) override {
{
@@ -130,12 +132,12 @@
mEventCond.notify_one();
return Return<void>();
}
- Return<void> onPropertySet(const VehiclePropValue& value) override {
+ Return<void> onPropertySet(const VehiclePropValue& /* value */) override {
return Return<void>();
}
- Return<void> onPropertySetError(StatusCode errorCode,
- VehicleProperty propId,
- int32_t areaId) override {
+ Return<void> onPropertySetError(StatusCode /* errorCode */,
+ int32_t /* propId */,
+ int32_t /* areaId */) override {
return Return<void>();
}
@@ -218,7 +220,7 @@
inline std::string toString(const VehiclePropValue &v) {
std::stringstream ss;
ss << "VehiclePropValue {n"
- << " prop: " << enumToHexString(v.prop) << ",\n"
+ << " prop: " << hexString(v.prop) << ",\n"
<< " areaId: " << hexString(v.areaId) << ",\n"
<< " timestamp: " << v.timestamp << ",\n"
<< " value {\n"
@@ -236,7 +238,7 @@
inline std::string toString(const VehiclePropConfig &config) {
std::stringstream ss;
ss << "VehiclePropConfig {\n"
- << " prop: " << enumToHexString(config.prop) << ",\n"
+ << " prop: " << hexString(config.prop) << ",\n"
<< " supportedAreas: " << hexString(config.supportedAreas) << ",\n"
<< " access: " << enumToHexString(config.access) << ",\n"
<< " changeMode: " << enumToHexString(config.changeMode) << ",\n"
@@ -265,8 +267,9 @@
} // namespace V2_0
} // namespace vehicle
+} // namespace automotive
} // namespace hardware
} // namespace android
-#endif //VEHICLEHALDEBUGUTILS_H
+#endif //android_hardware_automotive_vehicle_V2_0_VehicleDebugUtils_H_
diff --git a/vehicle/2.0/default/tests/VehicleObjectPool_test.cpp b/automotive/vehicle/2.0/default/tests/VehicleObjectPool_test.cpp
similarity index 91%
rename from vehicle/2.0/default/tests/VehicleObjectPool_test.cpp
rename to automotive/vehicle/2.0/default/tests/VehicleObjectPool_test.cpp
index 135f9fa..a291351 100644
--- a/vehicle/2.0/default/tests/VehicleObjectPool_test.cpp
+++ b/automotive/vehicle/2.0/default/tests/VehicleObjectPool_test.cpp
@@ -20,10 +20,11 @@
#include <utils/SystemClock.h>
-#include "vehicle_hal_manager/VehicleObjectPool.h"
+#include "vhal_v2_0/VehicleObjectPool.h"
namespace android {
namespace hardware {
+namespace automotive {
namespace vehicle {
namespace V2_0 {
@@ -84,9 +85,9 @@
// In this test we have T threads that concurrently in C cycles
// obtain and release O VehiclePropValue objects of FLOAT / INT32 types.
- const auto T = 2;
- const auto C = 500;
- const auto O = 100;
+ const int T = 2;
+ const int C = 500;
+ const int O = 100;
auto poolPtr = valuePool.get();
@@ -111,10 +112,10 @@
}
auto finish = elapsedRealtimeNano();
- ASSERT_EQ(T * C * O, stats->Obtained);
- ASSERT_EQ(T * C * O, stats->Recycled);
+ ASSERT_EQ(static_cast<uint32_t>(T * C * O), stats->Obtained);
+ ASSERT_EQ(static_cast<uint32_t>(T * C * O), stats->Recycled);
// Created less than obtained.
- ASSERT_GE(T * O, stats->Created);
+ ASSERT_GE(static_cast<uint32_t>(T * O), stats->Created);
auto elapsedMs = (finish - start) / 1000000;
ASSERT_GE(1000, elapsedMs); // Less a second to access 100K objects.
@@ -125,5 +126,6 @@
} // namespace V2_0
} // namespace vehicle
+} // namespace automotive
} // namespace hardware
} // namespace android
diff --git a/vehicle/2.0/default/tests/VehiclePropConfigIndex_test.cpp b/automotive/vehicle/2.0/default/tests/VehiclePropConfigIndex_test.cpp
similarity index 78%
rename from vehicle/2.0/default/tests/VehiclePropConfigIndex_test.cpp
rename to automotive/vehicle/2.0/default/tests/VehiclePropConfigIndex_test.cpp
index 28cdcbb..0f65820 100644
--- a/vehicle/2.0/default/tests/VehiclePropConfigIndex_test.cpp
+++ b/automotive/vehicle/2.0/default/tests/VehiclePropConfigIndex_test.cpp
@@ -16,12 +16,13 @@
#include <gtest/gtest.h>
-#include "vehicle_hal_manager/VehiclePropConfigIndex.h"
+#include "vhal_v2_0/VehiclePropConfigIndex.h"
#include "VehicleHalTestUtils.h"
namespace android {
namespace hardware {
+namespace automotive {
namespace vehicle {
namespace V2_0 {
@@ -43,11 +44,11 @@
TEST_F(PropConfigTest, hasConfig) {
VehiclePropConfigIndex index(configs);
- ASSERT_TRUE(index.hasConfig(VehicleProperty::HVAC_FAN_SPEED));
- ASSERT_TRUE(index.hasConfig(VehicleProperty::INFO_MAKE));
- ASSERT_TRUE(index.hasConfig(VehicleProperty::INFO_FUEL_CAPACITY));
+ ASSERT_TRUE(index.hasConfig(toInt(VehicleProperty::HVAC_FAN_SPEED)));
+ ASSERT_TRUE(index.hasConfig(toInt(VehicleProperty::INFO_MAKE)));
+ ASSERT_TRUE(index.hasConfig(toInt(VehicleProperty::INFO_FUEL_CAPACITY)));
- ASSERT_FALSE(index.hasConfig(VehicleProperty::INVALID));
+ ASSERT_FALSE(index.hasConfig(toInt(VehicleProperty::INVALID)));
}
TEST_F(PropConfigTest, getAllConfig) {
@@ -63,7 +64,7 @@
TEST_F(PropConfigTest, getConfigs) {
VehiclePropConfigIndex index(configs);
- auto actualConfig = index.getConfig(VehicleProperty::HVAC_FAN_SPEED);
+ auto actualConfig = index.getConfig(toInt(VehicleProperty::HVAC_FAN_SPEED));
ASSERT_EQ(toString(configs[1]), toString(actualConfig));
}
@@ -71,5 +72,6 @@
} // namespace V2_0
} // namespace vehicle
+} // namespace automotive
} // namespace hardware
-} // namespace android
\ No newline at end of file
+} // namespace android
diff --git a/vehicle/2.0/types.hal b/automotive/vehicle/2.0/types.hal
similarity index 95%
rename from vehicle/2.0/types.hal
rename to automotive/vehicle/2.0/types.hal
index 9fda4fd..5e22364 100644
--- a/vehicle/2.0/types.hal
+++ b/automotive/vehicle/2.0/types.hal
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.hardware.vehicle@2.0;
+package android.hardware.automotive.vehicle@2.0;
/*
* Enumerates supported data types for VehicleProperty.
@@ -226,28 +226,6 @@
| VehicleArea:GLOBAL),
/*
- * Reports wheel rotational distance in meters since last wheel tick
- * event
- *
- * The value is a vector each element represents distance for individual
- * wheel in the following order: left front, right front, left rear,
- * right rear. VehiclePropValue.timestamp must be correctly filled in.
- *
- * Vendors must specify wheels that support this sensor in
- * VehiclePropConfig.configFlags. The format of this field is a bitset of
- * values from Wheel enum.
- *
- * @change_mode VehiclePropertyChangeMode:ON_CHANGE|VehiclePropertyChangeMode:CONTINUOUS
- * @access VehiclePropertyAccess:READ
- * @unit VehicleUnit:METER
- */
- WHEEL_TICK = (
- 0x0306
- | VehiclePropertyGroup:SYSTEM
- | VehiclePropertyType:FLOAT_VEC
- | VehicleArea:GLOBAL),
-
- /*
* Currently selected gear
*
* @change_mode VehiclePropertyChangeMode:ON_CHANGE
@@ -1042,7 +1020,7 @@
* Property to report bootup reason for the current power on. This is a
* static property that will not change for the whole duration until power
* off. For example, even if user presses power on button after automatic
- * power on with door unlock, bootup reason must stay with
+ * power on with door unlock, bootup reason must stay with
* VehicleApPowerBootupReason#USER_UNLOCK.
*
* int32Values[0] must be VehicleApPowerBootupReason.
@@ -1764,7 +1742,7 @@
* Its contents are to be interpreted as follows:
* the indices defined in VmsMessageIntegerValuesIndex are to be used to
* read from int32Values;
- * stringValue is a serialized VMS message as defined in the vms protocol
+ * bytes is a serialized VMS message as defined in the vms protocol
* which is opaque to the framework;
*
* @change_mode VehiclePropertyChangeMode:ON_CHANGE
@@ -1782,14 +1760,30 @@
* This property uses COMPLEX data to send a snapshot of the current (live)
* values of the OBD2 sensors provided by the vehicle.
*
- * Its contents are to be interpreted as follows:
+ * VehiclePropConfig
+ * configArray[0] : number of vendor-specific integer-valued sensors
+ * that can be returned in a frame.
+ * configArray[1] : number of vendor-specific float-valued sensors
+ * that can be returned in a frame.
+ *
+ * The values are to be interpreted as follows:
* the indices defined in Obd2IntegerSensorIndex are to be used to
* read from int32Values;
* the indices defined in Obd2FloatSensorIndex are to be used to
* read from floatValues.
+ * the elements of bytes are to be interpreted as a bitmask, such that
+ * the bits 0 thru the integer value of
+ * Obd2IntegerSensorIndex.LAST_SYSTEM_INDEX + the value of configArray[0]
+ * are 1 if the corresponding index is a valid sensor index whose value can
+ * be read in the returned int32Values vector, 0 otherwise.
+ * the bits Obd2IntegerSensorIndex.LAST_SYSTEM_INDEX+1 thru
+ * Obd2FloatingSensorIndex.LAST_SYSTEM_INDEX + the value of configArray[1]
+ * are 1 if the corresponding index is a valid sensor index whose value
+ * can be read in the returned floatValues vector, 0 otherwise.
*
* For example, int32Values[0] corresponds to FUEL_SYSTEM_STATUS, and
- * floatValues[0] corresponds to CALCULATED_ENGINE_LOAD.
+ * floatValues[0] corresponds to CALCULATED_ENGINE_LOAD, but that mapping
+ * is only valid if the corresponding bits in the bytes vector are set to 1.
*
* @change_mode VehiclePropertyChangeMode:ON_CHANGE
* @access VehiclePropertyAccess:READ
@@ -1807,17 +1801,37 @@
* OBD2 sensors provided by the vehicle at the time that a diagnostic
* troubleshooting code (DTC) was recorded by the vehicle.
*
- * Its contents are to be interpreted as follows:
+ * VehiclePropConfig
+ * configArray[0] : number of vendor-specific integer-valued sensors
+ * that can be returned in a frame.
+ * configArray[1] : number of vendor-specific float-valued sensors
+ * that can be returned in a frame.
+ *
+ * A get of this property must take the following form:
+ * int64Values[0]: timestamp of the freeze frame to retrieve.
+ * Valid timestamps are given by OBD2_DTC_INFO.
+ *
+ * The values are to be interpreted as follows:
* the indices defined in Obd2IntegerSensorIndex are to be used to
* read from int32Values;
* the indices defined in Obd2FloatSensorIndex are to be used to
* read from floatValues;
+ * the elements of bytes are to be interpreted as a bitmask, such that
+ * the bits 0 thru the integer value of
+ * Obd2IntegerSensorIndex.LAST_SYSTEM_INDEX + the value of configArray[0]
+ * are 1 if the corresponding index is a valid sensor index whose value can
+ * be read in the returned int32Values vector, 0 otherwise.
+ * the bits Obd2IntegerSensorIndex.LAST_SYSTEM_INDEX+1 thru
+ * Obd2FloatingSensorIndex.LAST_SYSTEM_INDEX + the value of configArray[1]
+ * are 1 if the corresponding index is a valid sensor index whose value
+ * can be read in the returned floatValues vector, 0 otherwise.
* stringValue is the DTC that caused this freeze frame to be recorded.
*
* For example, int32Values[0] corresponds to FUEL_SYSTEM_STATUS, and
- * floatValues[0] corresponds to CALCULATED_ENGINE_LOAD, and a possible
- * valid stringValue is "P0176" to indicate a malfunction of the fuel
- * composition sensor circuit.
+ * floatValues[0] corresponds to CALCULATED_ENGINE_LOAD, but that mapping
+ * is only valid if the corresponding bits in the bytes vector are set to 1,
+ * and a possible valid stringValue is "P0176" to indicate a malfunction
+ * of the fuel composition sensor circuit.
*
* @change_mode VehiclePropertyChangeMode:ON_CHANGE
* @access VehiclePropertyAccess:READ
@@ -1828,8 +1842,49 @@
| VehiclePropertyType:COMPLEX
| VehicleArea:GLOBAL),
-};
+ /*
+ * OBD2 Freeze Frame Information
+ *
+ * This property describes the current freeze frames stored in vehicle
+ * memory and available for retrieval via OBD2_FREEZE_FRAME.
+ *
+ * The values are to be interpreted as follows:
+ * each element of int64Values is the timestamp at which a a fault code
+ * has been detected and the corresponding freeze frame stored, and each
+ * such element can be used as the key to OBD2_FREEZE_FRAME to retrieve
+ * the corresponding freeze frame.
+ *
+ * @change_mode VehiclePropertyChangeMode:ON_CHANGE
+ * @access VehiclePropertyAccess:READ
+ */
+ OBD2_FREEZE_FRAME_INFO = (
+ 0x0D02
+ | VehiclePropertyGroup:SYSTEM
+ | VehiclePropertyType:COMPLEX
+ | VehicleArea:GLOBAL),
+ /*
+ * OBD2 Freeze Frame Clear
+ *
+ * This property allows deletion of any of the freeze frames stored in
+ * vehicle memory, as described by OBD2_DTC_INFO.
+ *
+ * A set of this property is to be interpreted as follows:
+ * if int64Values contains no elements, then all DTCs stored will be cleared;
+ * if int64Values contains one or more elements, then DTCs at the timestamps
+ * stored in int64Values will be cleared, and the others not cleared, except
+ * the memory will be compacted so that all remaining DTCs are stored
+ * contiguously.
+ *
+ * @change_mode VehiclePropertyChangeMode:ON_CHANGE
+ * @access VehiclePropertyAccess:WRITE
+ */
+ OBD2_FREEZE_FRAME_CLEAR = (
+ 0x0D03
+ | VehiclePropertyGroup:SYSTEM
+ | VehiclePropertyType:COMPLEX
+ | VehicleArea:GLOBAL),
+};
/*
* Bit flags for fan direction
*/
@@ -2488,7 +2543,8 @@
};
struct VehiclePropConfig {
- VehicleProperty prop;
+ /* Property identifier */
+ int32_t prop;
/*
* Defines if the property is read or write or both.
@@ -2549,7 +2605,7 @@
*/
struct VehiclePropValue {
/* Property identifier */
- VehicleProperty prop;
+ int32_t prop;
/* Time is elapsed nanoseconds since boot */
int64_t timestamp;
@@ -2669,7 +2725,7 @@
*/
struct SubscribeOptions {
/* Property to subscribe */
- VehicleProperty propId;
+ int32_t propId;
/*
* Area ids - this must be a bit mask of areas to subscribe or 0 to subscribe
@@ -3125,11 +3181,14 @@
*/
enum VmsMessageIntegerValuesIndex : int32_t {
/* The message type as enumerated by VmsMessageType enum. */
- VMS_MESSAGE_TYPE = 1,
+ VMS_MESSAGE_TYPE = 0,
/* The layer ID as defined in the vms protocol. */
- VMS_LAYER_ID = 2,
+ VMS_LAYER_ID = 1,
/* The version of the VMS layer. */
- VMS_LAYER_VERSION = 3,
+ VMS_LAYER_VERSION = 2,
+
+ /* The number of bytes in the payload */
+ VMS_PAYLOAD_SIZE_BYTES = 3,
};
diff --git a/automotive/vehicle/2.0/vts/Vehicle.vts b/automotive/vehicle/2.0/vts/Vehicle.vts
new file mode 100644
index 0000000..aa12f0c
--- /dev/null
+++ b/automotive/vehicle/2.0/vts/Vehicle.vts
@@ -0,0 +1,115 @@
+component_class: HAL_HIDL
+component_type_version: 2.0
+component_name: "IVehicle"
+
+package: "android.hardware.automotive.vehicle"
+
+import: "android.hardware.automotive.vehicle@2.0::IVehicleCallback"
+import: "android.hardware.automotive.vehicle@2.0::types"
+import: "android.hidl.base@1.0::types"
+
+interface: {
+ api: {
+ name: "getAllPropConfigs"
+ return_type_hidl: {
+ type: TYPE_VECTOR
+ vector_value: {
+ type: TYPE_STRUCT
+ predefined_type: "::android::hardware::automotive::vehicle::V2_0::VehiclePropConfig"
+ }
+ }
+ }
+
+ api: {
+ name: "getPropConfigs"
+ return_type_hidl: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::automotive::vehicle::V2_0::StatusCode"
+ }
+ return_type_hidl: {
+ type: TYPE_VECTOR
+ vector_value: {
+ type: TYPE_STRUCT
+ predefined_type: "::android::hardware::automotive::vehicle::V2_0::VehiclePropConfig"
+ }
+ }
+ arg: {
+ type: TYPE_VECTOR
+ vector_value: {
+ type: TYPE_SCALAR
+ scalar_type: "int32_t"
+ }
+ }
+ }
+
+ api: {
+ name: "get"
+ return_type_hidl: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::automotive::vehicle::V2_0::StatusCode"
+ }
+ return_type_hidl: {
+ type: TYPE_STRUCT
+ predefined_type: "::android::hardware::automotive::vehicle::V2_0::VehiclePropValue"
+ }
+ arg: {
+ type: TYPE_STRUCT
+ predefined_type: "::android::hardware::automotive::vehicle::V2_0::VehiclePropValue"
+ }
+ }
+
+ api: {
+ name: "set"
+ return_type_hidl: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::automotive::vehicle::V2_0::StatusCode"
+ }
+ arg: {
+ type: TYPE_STRUCT
+ predefined_type: "::android::hardware::automotive::vehicle::V2_0::VehiclePropValue"
+ }
+ }
+
+ api: {
+ name: "subscribe"
+ return_type_hidl: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::automotive::vehicle::V2_0::StatusCode"
+ }
+ arg: {
+ type: TYPE_HIDL_CALLBACK
+ predefined_type: "::android::hardware::automotive::vehicle::V2_0::IVehicleCallback"
+ }
+ arg: {
+ type: TYPE_VECTOR
+ vector_value: {
+ type: TYPE_STRUCT
+ predefined_type: "::android::hardware::automotive::vehicle::V2_0::SubscribeOptions"
+ }
+ }
+ }
+
+ api: {
+ name: "unsubscribe"
+ return_type_hidl: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::automotive::vehicle::V2_0::StatusCode"
+ }
+ arg: {
+ type: TYPE_HIDL_CALLBACK
+ predefined_type: "::android::hardware::automotive::vehicle::V2_0::IVehicleCallback"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "int32_t"
+ }
+ }
+
+ api: {
+ name: "debugDump"
+ return_type_hidl: {
+ type: TYPE_STRING
+ }
+ }
+
+}
diff --git a/automotive/vehicle/2.0/vts/VehicleCallback.vts b/automotive/vehicle/2.0/vts/VehicleCallback.vts
new file mode 100644
index 0000000..e4815d5
--- /dev/null
+++ b/automotive/vehicle/2.0/vts/VehicleCallback.vts
@@ -0,0 +1,46 @@
+component_class: HAL_HIDL
+component_type_version: 2.0
+component_name: "IVehicleCallback"
+
+package: "android.hardware.automotive.vehicle"
+
+import: "android.hardware.automotive.vehicle@2.0::types"
+import: "android.hidl.base@1.0::types"
+
+interface: {
+ api: {
+ name: "onPropertyEvent"
+ arg: {
+ type: TYPE_VECTOR
+ vector_value: {
+ type: TYPE_STRUCT
+ predefined_type: "::android::hardware::automotive::vehicle::V2_0::VehiclePropValue"
+ }
+ }
+ }
+
+ api: {
+ name: "onPropertySet"
+ arg: {
+ type: TYPE_STRUCT
+ predefined_type: "::android::hardware::automotive::vehicle::V2_0::VehiclePropValue"
+ }
+ }
+
+ api: {
+ name: "onPropertySetError"
+ arg: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::automotive::vehicle::V2_0::StatusCode"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "int32_t"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "int32_t"
+ }
+ }
+
+}
diff --git a/vehicle/2.0/vts/types.vts b/automotive/vehicle/2.0/vts/types.vts
similarity index 87%
rename from vehicle/2.0/vts/types.vts
rename to automotive/vehicle/2.0/vts/types.vts
index 067a7d6..3868c99 100644
--- a/vehicle/2.0/vts/types.vts
+++ b/automotive/vehicle/2.0/vts/types.vts
@@ -2,11 +2,11 @@
component_type_version: 2.0
component_name: "types"
-package: "android.hardware.vehicle"
+package: "android.hardware.automotive.vehicle"
attribute: {
- name: "::android::hardware::vehicle::V2_0::VehiclePropertyType"
+ name: "::android::hardware::automotive::vehicle::V2_0::VehiclePropertyType"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -55,7 +55,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::VehicleArea"
+ name: "::android::hardware::automotive::vehicle::V2_0::VehicleArea"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -92,7 +92,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::VehiclePropertyGroup"
+ name: "::android::hardware::automotive::vehicle::V2_0::VehiclePropertyGroup"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -113,7 +113,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::VehicleProperty"
+ name: "::android::hardware::automotive::vehicle::V2_0::VehicleProperty"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -162,6 +162,10 @@
scalar_value: {
int32_t: 291504901
}
+ enumerator: "WHEEL_TICK"
+ scalar_value: {
+ int32_t: 291570438
+ }
enumerator: "GEAR_SELECTION"
scalar_value: {
int32_t: 289408000
@@ -282,10 +286,18 @@
scalar_value: {
int32_t: 289474816
}
+ enumerator: "AUDIO_FOCUS_EXT_SYNC"
+ scalar_value: {
+ int32_t: 289474832
+ }
enumerator: "AUDIO_VOLUME"
scalar_value: {
int32_t: 289474817
}
+ enumerator: "AUDIO_VOLUME_EXT_SYNC"
+ scalar_value: {
+ int32_t: 289474833
+ }
enumerator: "AUDIO_VOLUME_LIMIT"
scalar_value: {
int32_t: 289474818
@@ -302,9 +314,17 @@
scalar_value: {
int32_t: 289474821
}
+ enumerator: "AUDIO_STREAM_STATE"
+ scalar_value: {
+ int32_t: 289474822
+ }
+ enumerator: "AUDIO_PARAMETERS"
+ scalar_value: {
+ int32_t: 286263559
+ }
enumerator: "AP_POWER_STATE"
scalar_value: {
- int32_t: 2560
+ int32_t: 289475072
}
enumerator: "DISPLAY_BRIGHTNESS"
scalar_value: {
@@ -506,11 +526,19 @@
scalar_value: {
int32_t: 299896065
}
+ enumerator: "OBD2_FREEZE_FRAME_INFO"
+ scalar_value: {
+ int32_t: 299896066
+ }
+ enumerator: "OBD2_FREEZE_FRAME_CLEAR"
+ scalar_value: {
+ int32_t: 299896067
+ }
}
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::VehicleHvacFanDirection"
+ name: "::android::hardware::automotive::vehicle::V2_0::VehicleHvacFanDirection"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -539,7 +567,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::VehicleRadioConstants"
+ name: "::android::hardware::automotive::vehicle::V2_0::VehicleRadioConstants"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -552,7 +580,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::VehicleAudioFocusRequest"
+ name: "::android::hardware::automotive::vehicle::V2_0::VehicleAudioFocusRequest"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -581,7 +609,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::VehicleAudioFocusState"
+ name: "::android::hardware::automotive::vehicle::V2_0::VehicleAudioFocusState"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -614,7 +642,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::VehicleAudioStreamFlag"
+ name: "::android::hardware::automotive::vehicle::V2_0::VehicleAudioStreamFlag"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -635,7 +663,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::VehicleAudioStream"
+ name: "::android::hardware::automotive::vehicle::V2_0::VehicleAudioStream"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -652,7 +680,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::VehicleAudioExtFocusFlag"
+ name: "::android::hardware::automotive::vehicle::V2_0::VehicleAudioExtFocusFlag"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -681,7 +709,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::VehicleAudioFocusIndex"
+ name: "::android::hardware::automotive::vehicle::V2_0::VehicleAudioFocusIndex"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -706,7 +734,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::VehicleAudioContextFlag"
+ name: "::android::hardware::automotive::vehicle::V2_0::VehicleAudioContextFlag"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -767,7 +795,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::VehicleAudioVolumeCapabilityFlag"
+ name: "::android::hardware::automotive::vehicle::V2_0::VehicleAudioVolumeCapabilityFlag"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -784,7 +812,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::VehicleAudioVolumeState"
+ name: "::android::hardware::automotive::vehicle::V2_0::VehicleAudioVolumeState"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -801,7 +829,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::VehicleAudioVolumeIndex"
+ name: "::android::hardware::automotive::vehicle::V2_0::VehicleAudioVolumeIndex"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -822,7 +850,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::VehicleAudioVolumeLimitIndex"
+ name: "::android::hardware::automotive::vehicle::V2_0::VehicleAudioVolumeLimitIndex"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -839,7 +867,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::VehicleAudioRoutingPolicyIndex"
+ name: "::android::hardware::automotive::vehicle::V2_0::VehicleAudioRoutingPolicyIndex"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -856,7 +884,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::VehicleAudioHwVariantConfigFlag"
+ name: "::android::hardware::automotive::vehicle::V2_0::VehicleAudioHwVariantConfigFlag"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -869,7 +897,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::VehicleApPowerStateConfigFlag"
+ name: "::android::hardware::automotive::vehicle::V2_0::VehicleApPowerStateConfigFlag"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -886,7 +914,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::VehicleApPowerState"
+ name: "::android::hardware::automotive::vehicle::V2_0::VehicleApPowerState"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -915,7 +943,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::VehicleApPowerStateShutdownParam"
+ name: "::android::hardware::automotive::vehicle::V2_0::VehicleApPowerStateShutdownParam"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -936,7 +964,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::VehicleApPowerSetState"
+ name: "::android::hardware::automotive::vehicle::V2_0::VehicleApPowerSetState"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -973,7 +1001,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::VehicleApPowerStateIndex"
+ name: "::android::hardware::automotive::vehicle::V2_0::VehicleApPowerStateIndex"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -990,7 +1018,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::VehicleApPowerBootupReason"
+ name: "::android::hardware::automotive::vehicle::V2_0::VehicleApPowerBootupReason"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -1011,7 +1039,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::VehicleHwKeyInputAction"
+ name: "::android::hardware::automotive::vehicle::V2_0::VehicleHwKeyInputAction"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -1028,7 +1056,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::VehicleDisplay"
+ name: "::android::hardware::automotive::vehicle::V2_0::VehicleDisplay"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -1045,7 +1073,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::VehicleInstrumentClusterType"
+ name: "::android::hardware::automotive::vehicle::V2_0::VehicleInstrumentClusterType"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -1066,7 +1094,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::VehicleUnit"
+ name: "::android::hardware::automotive::vehicle::V2_0::VehicleUnit"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -1135,7 +1163,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::VehiclePropertyChangeMode"
+ name: "::android::hardware::automotive::vehicle::V2_0::VehiclePropertyChangeMode"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -1164,7 +1192,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::VehiclePropertyAccess"
+ name: "::android::hardware::automotive::vehicle::V2_0::VehiclePropertyAccess"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -1189,7 +1217,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::VehicleDrivingStatus"
+ name: "::android::hardware::automotive::vehicle::V2_0::VehicleDrivingStatus"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -1222,7 +1250,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::VehicleGear"
+ name: "::android::hardware::automotive::vehicle::V2_0::VehicleGear"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -1287,7 +1315,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::VehicleAreaZone"
+ name: "::android::hardware::automotive::vehicle::V2_0::VehicleAreaZone"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -1364,7 +1392,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::VehicleAreaSeat"
+ name: "::android::hardware::automotive::vehicle::V2_0::VehicleAreaSeat"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -1409,7 +1437,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::VehicleAreaWindow"
+ name: "::android::hardware::automotive::vehicle::V2_0::VehicleAreaWindow"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -1454,7 +1482,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::VehicleAreaDoor"
+ name: "::android::hardware::automotive::vehicle::V2_0::VehicleAreaDoor"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -1495,7 +1523,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::VehicleAreaMirror"
+ name: "::android::hardware::automotive::vehicle::V2_0::VehicleAreaMirror"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -1516,7 +1544,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::VehicleTurnSignal"
+ name: "::android::hardware::automotive::vehicle::V2_0::VehicleTurnSignal"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -1541,7 +1569,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::VehicleAreaConfig"
+ name: "::android::hardware::automotive::vehicle::V2_0::VehicleAreaConfig"
type: TYPE_STRUCT
struct_value: {
name: "areaId"
@@ -1581,22 +1609,22 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::VehiclePropConfig"
+ name: "::android::hardware::automotive::vehicle::V2_0::VehiclePropConfig"
type: TYPE_STRUCT
struct_value: {
name: "prop"
- type: TYPE_ENUM
- predefined_type: "::android::hardware::vehicle::V2_0::VehicleProperty"
+ type: TYPE_SCALAR
+ scalar_type: "int32_t"
}
struct_value: {
name: "access"
type: TYPE_ENUM
- predefined_type: "::android::hardware::vehicle::V2_0::VehiclePropertyAccess"
+ predefined_type: "::android::hardware::automotive::vehicle::V2_0::VehiclePropertyAccess"
}
struct_value: {
name: "changeMode"
type: TYPE_ENUM
- predefined_type: "::android::hardware::vehicle::V2_0::VehiclePropertyChangeMode"
+ predefined_type: "::android::hardware::automotive::vehicle::V2_0::VehiclePropertyChangeMode"
}
struct_value: {
name: "supportedAreas"
@@ -1608,7 +1636,7 @@
type: TYPE_VECTOR
vector_value: {
type: TYPE_STRUCT
- predefined_type: "::android::hardware::vehicle::V2_0::VehicleAreaConfig"
+ predefined_type: "::android::hardware::automotive::vehicle::V2_0::VehicleAreaConfig"
}
}
struct_value: {
@@ -1641,10 +1669,10 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::VehiclePropValue"
+ name: "::android::hardware::automotive::vehicle::V2_0::VehiclePropValue"
type: TYPE_STRUCT
sub_struct: {
- name: "::android::hardware::vehicle::V2_0::VehiclePropValue::RawValue"
+ name: "::android::hardware::automotive::vehicle::V2_0::VehiclePropValue::RawValue"
type: TYPE_STRUCT
struct_value: {
name: "int32Values"
@@ -1685,8 +1713,8 @@
}
struct_value: {
name: "prop"
- type: TYPE_ENUM
- predefined_type: "::android::hardware::vehicle::V2_0::VehicleProperty"
+ type: TYPE_SCALAR
+ scalar_type: "int32_t"
}
struct_value: {
name: "timestamp"
@@ -1701,12 +1729,12 @@
struct_value: {
name: "value"
type: TYPE_STRUCT
- predefined_type: "::android::hardware::vehicle::V2_0::VehiclePropValue::RawValue"
+ predefined_type: "::android::hardware::automotive::vehicle::V2_0::VehiclePropValue::RawValue"
}
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::VehicleIgnitionState"
+ name: "::android::hardware::automotive::vehicle::V2_0::VehicleIgnitionState"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -1739,7 +1767,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::VehiclePropertyOperation"
+ name: "::android::hardware::automotive::vehicle::V2_0::VehiclePropertyOperation"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -1764,7 +1792,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::SubscribeFlags"
+ name: "::android::hardware::automotive::vehicle::V2_0::SubscribeFlags"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -1789,12 +1817,12 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::SubscribeOptions"
+ name: "::android::hardware::automotive::vehicle::V2_0::SubscribeOptions"
type: TYPE_STRUCT
struct_value: {
name: "propId"
- type: TYPE_ENUM
- predefined_type: "::android::hardware::vehicle::V2_0::VehicleProperty"
+ type: TYPE_SCALAR
+ scalar_type: "int32_t"
}
struct_value: {
name: "vehicleAreas"
@@ -1809,12 +1837,12 @@
struct_value: {
name: "flags"
type: TYPE_ENUM
- predefined_type: "::android::hardware::vehicle::V2_0::SubscribeFlags"
+ predefined_type: "::android::hardware::automotive::vehicle::V2_0::SubscribeFlags"
}
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::StatusCode"
+ name: "::android::hardware::automotive::vehicle::V2_0::StatusCode"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -1847,7 +1875,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::FuelSystemStatus"
+ name: "::android::hardware::automotive::vehicle::V2_0::FuelSystemStatus"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -1876,7 +1904,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::IgnitionMonitorKind"
+ name: "::android::hardware::automotive::vehicle::V2_0::IgnitionMonitorKind"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -1893,7 +1921,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::CommonIgnitionMonitors"
+ name: "::android::hardware::automotive::vehicle::V2_0::CommonIgnitionMonitors"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -1926,7 +1954,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::SparkIgnitionMonitors"
+ name: "::android::hardware::automotive::vehicle::V2_0::SparkIgnitionMonitors"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -2023,7 +2051,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::CompressionIgnitionMonitors"
+ name: "::android::hardware::automotive::vehicle::V2_0::CompressionIgnitionMonitors"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -2104,7 +2132,36 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::SecondaryAirStatus"
+ name: "::android::hardware::automotive::vehicle::V2_0::Wheel"
+ type: TYPE_ENUM
+ enum_value: {
+ scalar_type: "int32_t"
+
+ enumerator: "UNKNOWN"
+ scalar_value: {
+ int32_t: 0
+ }
+ enumerator: "LEFT_FRONT"
+ scalar_value: {
+ int32_t: 1
+ }
+ enumerator: "RIGHT_FRONT"
+ scalar_value: {
+ int32_t: 2
+ }
+ enumerator: "LEFT_REAR"
+ scalar_value: {
+ int32_t: 4
+ }
+ enumerator: "RIGHT_REAR"
+ scalar_value: {
+ int32_t: 8
+ }
+ }
+}
+
+attribute: {
+ name: "::android::hardware::automotive::vehicle::V2_0::SecondaryAirStatus"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -2129,7 +2186,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::FuelType"
+ name: "::android::hardware::automotive::vehicle::V2_0::FuelType"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -2234,7 +2291,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::Obd2IntegerSensorIndex"
+ name: "::android::hardware::automotive::vehicle::V2_0::Obd2IntegerSensorIndex"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -2251,6 +2308,14 @@
scalar_value: {
int32_t: 2
}
+ enumerator: "IGNITION_SPECIFIC_MONITORS"
+ scalar_value: {
+ int32_t: 3
+ }
+ enumerator: "INTAKE_AIR_TEMPERATURE"
+ scalar_value: {
+ int32_t: 4
+ }
enumerator: "COMMANDED_SECONDARY_AIR_STATUS"
scalar_value: {
int32_t: 5
@@ -2371,7 +2436,7 @@
}
attribute: {
- name: "::android::hardware::vehicle::V2_0::Obd2FloatSensorIndex"
+ name: "::android::hardware::automotive::vehicle::V2_0::Obd2FloatSensorIndex"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -2671,3 +2736,45 @@
}
}
+attribute: {
+ name: "::android::hardware::automotive::vehicle::V2_0::VmsMessageType"
+ type: TYPE_ENUM
+ enum_value: {
+ scalar_type: "int32_t"
+
+ enumerator: "SUBSCRIBE"
+ scalar_value: {
+ int32_t: 1
+ }
+ enumerator: "UNSUBSCRIBE"
+ scalar_value: {
+ int32_t: 2
+ }
+ enumerator: "DATA"
+ scalar_value: {
+ int32_t: 3
+ }
+ }
+}
+
+attribute: {
+ name: "::android::hardware::automotive::vehicle::V2_0::VmsMessageIntegerValuesIndex"
+ type: TYPE_ENUM
+ enum_value: {
+ scalar_type: "int32_t"
+
+ enumerator: "VMS_MESSAGE_TYPE"
+ scalar_value: {
+ int32_t: 1
+ }
+ enumerator: "VMS_LAYER_ID"
+ scalar_value: {
+ int32_t: 2
+ }
+ enumerator: "VMS_LAYER_VERSION"
+ scalar_value: {
+ int32_t: 3
+ }
+ }
+}
+
diff --git a/automotive/vehicle/2.1/Android.bp b/automotive/vehicle/2.1/Android.bp
new file mode 100644
index 0000000..12bb4ed
--- /dev/null
+++ b/automotive/vehicle/2.1/Android.bp
@@ -0,0 +1,64 @@
+// This file is autogenerated by hidl-gen. Do not edit manually.
+
+filegroup {
+ name: "android.hardware.automotive.vehicle@2.1_hal",
+ srcs: [
+ "types.hal",
+ "IVehicle.hal",
+ ],
+}
+
+genrule {
+ name: "android.hardware.automotive.vehicle@2.1_genc++",
+ tools: ["hidl-gen"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.vehicle@2.1",
+ srcs: [
+ "types.hal",
+ "IVehicle.hal",
+ ],
+ out: [
+ "android/hardware/automotive/vehicle/2.1/types.cpp",
+ "android/hardware/automotive/vehicle/2.1/VehicleAll.cpp",
+ ],
+}
+
+genrule {
+ name: "android.hardware.automotive.vehicle@2.1_genc++_headers",
+ tools: ["hidl-gen"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.vehicle@2.1",
+ srcs: [
+ "types.hal",
+ "IVehicle.hal",
+ ],
+ out: [
+ "android/hardware/automotive/vehicle/2.1/types.h",
+ "android/hardware/automotive/vehicle/2.1/IVehicle.h",
+ "android/hardware/automotive/vehicle/2.1/IHwVehicle.h",
+ "android/hardware/automotive/vehicle/2.1/BnHwVehicle.h",
+ "android/hardware/automotive/vehicle/2.1/BpHwVehicle.h",
+ "android/hardware/automotive/vehicle/2.1/BsVehicle.h",
+ ],
+}
+
+cc_library_shared {
+ name: "android.hardware.automotive.vehicle@2.1",
+ generated_sources: ["android.hardware.automotive.vehicle@2.1_genc++"],
+ generated_headers: ["android.hardware.automotive.vehicle@2.1_genc++_headers"],
+ export_generated_headers: ["android.hardware.automotive.vehicle@2.1_genc++_headers"],
+ shared_libs: [
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "liblog",
+ "libutils",
+ "libcutils",
+ "android.hardware.automotive.vehicle@2.0",
+ ],
+ export_shared_lib_headers: [
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "libutils",
+ "android.hardware.automotive.vehicle@2.0",
+ ],
+}
diff --git a/automotive/vehicle/2.1/Android.mk b/automotive/vehicle/2.1/Android.mk
new file mode 100644
index 0000000..f618268
--- /dev/null
+++ b/automotive/vehicle/2.1/Android.mk
@@ -0,0 +1,116 @@
+# This file is autogenerated by hidl-gen. Do not edit manually.
+
+LOCAL_PATH := $(call my-dir)
+
+################################################################################
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := android.hardware.automotive.vehicle@2.1-java
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+
+intermediates := $(local-generated-sources-dir)
+
+HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
+
+LOCAL_JAVA_LIBRARIES := \
+ android.hardware.automotive.vehicle@2.0-java \
+ android.hidl.base@1.0-java \
+
+
+#
+# Build types.hal (VehicleProperty)
+#
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_1/VehicleProperty.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
+ android.hardware.automotive.vehicle@2.1::types.VehicleProperty
+
+$(GEN): $(LOCAL_PATH)/types.hal
+ $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+
+#
+# Build IVehicle.hal
+#
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_1/IVehicle.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IVehicle.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
+ android.hardware.automotive.vehicle@2.1::IVehicle
+
+$(GEN): $(LOCAL_PATH)/IVehicle.hal
+ $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+include $(BUILD_JAVA_LIBRARY)
+
+
+################################################################################
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := android.hardware.automotive.vehicle@2.1-java-static
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+
+intermediates := $(local-generated-sources-dir)
+
+HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+ android.hardware.automotive.vehicle@2.0-java-static \
+ android.hidl.base@1.0-java-static \
+
+
+#
+# Build types.hal (VehicleProperty)
+#
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_1/VehicleProperty.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
+ android.hardware.automotive.vehicle@2.1::types.VehicleProperty
+
+$(GEN): $(LOCAL_PATH)/types.hal
+ $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+
+#
+# Build IVehicle.hal
+#
+GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_1/IVehicle.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IVehicle.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
+ android.hardware.automotive.vehicle@2.1::IVehicle
+
+$(GEN): $(LOCAL_PATH)/IVehicle.hal
+ $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+include $(BUILD_STATIC_JAVA_LIBRARY)
+
+
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/automotive/vehicle/2.1/IVehicle.hal b/automotive/vehicle/2.1/IVehicle.hal
new file mode 100644
index 0000000..5b6a23f
--- /dev/null
+++ b/automotive/vehicle/2.1/IVehicle.hal
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.1 (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.1
+ *
+ * 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.automotive.vehicle@2.1;
+
+import android.hardware.automotive.vehicle@2.0;
+
+/*
+ * New revision of IVehicle interface that supports properties defined in
+ * VehicleProperty enum version 2.1.
+ *
+ * NOTE: this HAL interface is under development and shouldn't be used in
+ * production.
+ *
+ * TODO(pavelm): update comment when this interface is ready for prod.
+ */
+interface IVehicle extends @2.0::IVehicle {
+};
diff --git a/automotive/vehicle/2.1/default/Android.mk b/automotive/vehicle/2.1/default/Android.mk
new file mode 100644
index 0000000..1874cb3
--- /dev/null
+++ b/automotive/vehicle/2.1/default/Android.mk
@@ -0,0 +1,84 @@
+# Copyright (C) 2016 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.
+
+LOCAL_PATH := $(call my-dir)
+
+vhal_v2_0 = android.hardware.automotive.vehicle@2.0
+vhal_v2_1 = android.hardware.automotive.vehicle@2.1
+
+###############################################################################
+# Vehicle default VehicleHAL implementation
+###############################################################################
+include $(CLEAR_VARS)
+
+LOCAL_MODULE:= $(vhal_v2_1)-default-impl-lib
+
+LOCAL_C_INCLUDES := \
+ $(LOCAL_PATH)/impl/vhal_v2_1
+
+LOCAL_EXPORT_C_INCLUDE_DIRS := \
+ $(LOCAL_PATH)/impl
+
+
+# LOCAL_WHOLE_STATIC_LIBRARIES := \
+
+LOCAL_STATIC_LIBRARIES := \
+ $(vhal_v2_0)-default-impl-lib \
+ $(vhal_v2_0)-manager-lib \
+ $(vhal_v2_0)-libproto-native
+
+LOCAL_SHARED_LIBRARIES := \
+ libbinder \
+ libhidlbase \
+ libhidltransport \
+ libhwbinder \
+ liblog \
+ libutils \
+ libprotobuf-cpp-lite \
+ $(vhal_v2_0) \
+ $(vhal_v2_1) \
+
+include $(BUILD_STATIC_LIBRARY)
+
+###############################################################################
+# Vehicle HAL service
+###############################################################################
+include $(CLEAR_VARS)
+LOCAL_MODULE := $(vhal_v2_1)-service
+LOCAL_INIT_RC := $(vhal_v2_1)-service.rc
+LOCAL_MODULE_RELATIVE_PATH := hw
+
+LOCAL_SRC_FILES := \
+ service.cpp
+
+LOCAL_WHOLE_STATIC_LIBRARIES := \
+ $(vhal_v2_0)-libproto-native \
+
+LOCAL_STATIC_LIBRARIES := \
+ $(vhal_v2_0)-manager-lib \
+ $(vhal_v2_0)-default-impl-lib \
+ $(vhal_v2_1)-default-impl-lib \
+
+LOCAL_SHARED_LIBRARIES := \
+ libbinder \
+ libhidlbase \
+ libhidltransport \
+ libhwbinder \
+ liblog \
+ libutils \
+ libprotobuf-cpp-lite \
+ $(vhal_v2_0) \
+ $(vhal_v2_1) \
+
+include $(BUILD_EXECUTABLE)
diff --git a/automotive/vehicle/2.1/default/android.hardware.automotive.vehicle@2.1-service.rc b/automotive/vehicle/2.1/default/android.hardware.automotive.vehicle@2.1-service.rc
new file mode 100644
index 0000000..0b642d5
--- /dev/null
+++ b/automotive/vehicle/2.1/default/android.hardware.automotive.vehicle@2.1-service.rc
@@ -0,0 +1,4 @@
+service vehicle-hal-2.1 /system/bin/hw/android.hardware.automotive.vehicle@2.1-service
+ class hal
+ user vehicle_network
+ group system inet
diff --git a/automotive/vehicle/2.1/default/impl/vhal_v2_1/DefaultConfig.h b/automotive/vehicle/2.1/default/impl/vhal_v2_1/DefaultConfig.h
new file mode 100644
index 0000000..ab08cec
--- /dev/null
+++ b/automotive/vehicle/2.1/default/impl/vhal_v2_1/DefaultConfig.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2016 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.
+ */
+
+#ifndef android_hardware_automotive_vehicle_V2_1_impl_DefaultConfig_H_
+#define android_hardware_automotive_vehicle_V2_1_impl_DefaultConfig_H_
+
+#include <android/hardware/automotive/vehicle/2.1/types.h>
+#include <vhal_v2_0/VehicleUtils.h>
+
+namespace android {
+namespace hardware {
+namespace automotive {
+namespace vehicle {
+namespace V2_1 {
+
+namespace impl {
+
+const V2_0::VehiclePropConfig kVehicleProperties[] = {
+ {
+ .prop = V2_0::toInt(V2_1::VehicleProperty::WHEEL_TICK),
+ .access = V2_0::VehiclePropertyAccess::READ,
+ .changeMode = V2_0::VehiclePropertyChangeMode::CONTINUOUS,
+ }
+};
+
+} // impl
+
+} // namespace V2_1
+} // namespace vehicle
+} // namespace automotive
+} // namespace hardware
+} // namespace android
+
+#endif // android_hardware_automotive_vehicle_V2_1_impl_DefaultConfig_H_
diff --git a/automotive/vehicle/2.1/default/impl/vhal_v2_1/DefaultVehicleHal.h b/automotive/vehicle/2.1/default/impl/vhal_v2_1/DefaultVehicleHal.h
new file mode 100644
index 0000000..7ccb354
--- /dev/null
+++ b/automotive/vehicle/2.1/default/impl/vhal_v2_1/DefaultVehicleHal.h
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2016 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.
+ */
+
+#ifndef android_hardware_automotive_vehicle_V2_1_impl_DefaultVehicleHal_H_
+#define android_hardware_automotive_vehicle_V2_1_impl_DefaultVehicleHal_H_
+
+#include <memory>
+
+#include <utils/SystemClock.h>
+
+#include <vhal_v2_0/VehicleHal.h>
+#include <vhal_v2_0/DefaultVehicleHal.h>
+
+#include "DefaultConfig.h"
+
+namespace android {
+namespace hardware {
+namespace automotive {
+namespace vehicle {
+namespace V2_1 {
+
+namespace impl {
+
+using namespace std::placeholders;
+
+class DefaultVehicleHal : public V2_0::VehicleHal {
+public:
+ DefaultVehicleHal(V2_0::VehicleHal* vhal20) : mVehicleHal20(vhal20) {}
+
+ std::vector<V2_0::VehiclePropConfig> listProperties() override {
+ std::vector<V2_0::VehiclePropConfig> propConfigs(mVehicleHal20->listProperties());
+
+ // Join Vehicle Hal 2.0 and 2.1 configs.
+ propConfigs.insert(propConfigs.end(),
+ std::begin(kVehicleProperties),
+ std::end(kVehicleProperties));
+
+ return propConfigs;
+ }
+
+ VehiclePropValuePtr get(const V2_0::VehiclePropValue& requestedPropValue,
+ V2_0::StatusCode* outStatus) override {
+ // TODO(pavelm): put logic related to VHAL 2.1 here (OBD, VMS, etc)
+ return mVehicleHal20->get(requestedPropValue, outStatus);
+ }
+
+ V2_0::StatusCode set(const V2_0::VehiclePropValue& propValue) override {
+ return mVehicleHal20->set(propValue);
+ }
+
+ V2_0::StatusCode subscribe(int32_t property,
+ int32_t areas,
+ float sampleRate) override {
+ return mVehicleHal20->subscribe(property, areas, sampleRate);
+ }
+
+ V2_0::StatusCode unsubscribe(int32_t property) override {
+ return mVehicleHal20->unsubscribe(property);
+ }
+
+ void onCreate() override {
+ mVehicleHal20->init(getValuePool(),
+ std::bind(&DefaultVehicleHal::doHalEvent, this, _1),
+ std::bind(&DefaultVehicleHal::doHalPropertySetError, this, _1, _2, _3));
+ }
+
+private:
+ V2_0::VehicleHal* mVehicleHal20;
+};
+
+} // impl
+
+} // namespace V2_1
+} // namespace vehicle
+} // namespace automotive
+} // namespace hardware
+} // namespace android
+
+
+#endif // android_hardware_automotive_vehicle_V2_0_impl_DefaultVehicleHal_H_
diff --git a/automotive/vehicle/2.1/default/service.cpp b/automotive/vehicle/2.1/default/service.cpp
new file mode 100644
index 0000000..aaadf17
--- /dev/null
+++ b/automotive/vehicle/2.1/default/service.cpp
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2016 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.
+ */
+
+#define LOG_TAG "automotive.vehicle@2.1-service"
+#include <android/log.h>
+#include <hidl/HidlTransportSupport.h>
+
+#include <iostream>
+
+#include <android/hardware/automotive/vehicle/2.1/IVehicle.h>
+
+#include <vhal_v2_0/VehicleHalManager.h>
+#include <vhal_v2_0/DefaultVehicleHal.h>
+
+#include <vhal_v2_1/DefaultVehicleHal.h>
+
+using namespace android;
+using namespace android::hardware;
+
+namespace V2_1 = ::android::hardware::automotive::vehicle::V2_1;
+namespace V2_0 = ::android::hardware::automotive::vehicle::V2_0;
+
+using StatusCode = V2_0::StatusCode;
+using VehiclePropValue = V2_0::VehiclePropValue;
+
+/* Just wrapper that passes all calls to the provided V2_0::IVehicle object */
+struct Vehicle_V2_1 : public V2_1::IVehicle {
+
+ Vehicle_V2_1(V2_0::IVehicle* vehicle20) : mVehicle20(vehicle20) {}
+
+ // Methods derived from IVehicle
+ Return<void> getAllPropConfigs(getAllPropConfigs_cb _hidl_cb) override {
+ return mVehicle20->getAllPropConfigs(_hidl_cb);
+ }
+
+ Return<void> getPropConfigs(const hidl_vec<int32_t>& properties,
+ getPropConfigs_cb _hidl_cb) override {
+ return mVehicle20->getPropConfigs(properties, _hidl_cb);
+ }
+
+ Return<void> get(const V2_0::VehiclePropValue& requestedPropValue,
+ get_cb _hidl_cb) override {
+ return mVehicle20->get(requestedPropValue, _hidl_cb);
+ }
+
+ Return<StatusCode> set(const VehiclePropValue& value) override {
+ return mVehicle20->set(value);
+ }
+
+ Return<StatusCode> subscribe(const sp<V2_0::IVehicleCallback>& callback,
+ const hidl_vec<V2_0::SubscribeOptions>&
+ options) override {
+ return mVehicle20->subscribe(callback, options);
+ }
+
+ Return<StatusCode> unsubscribe(const sp<V2_0::IVehicleCallback>& callback,
+ int32_t propId) override {
+ return mVehicle20->unsubscribe(callback, propId);
+ }
+
+ Return<void> debugDump(debugDump_cb _hidl_cb = nullptr) override {
+ return mVehicle20->debugDump(_hidl_cb);
+ }
+
+private:
+ V2_0::IVehicle* mVehicle20;
+};
+
+int main(int /* argc */, char* /* argv */ []) {
+ auto halImpl20 = std::make_unique<V2_0::impl::DefaultVehicleHal>();
+ auto halImpl21 = std::make_unique<V2_1::impl::DefaultVehicleHal>(halImpl20.get());
+
+ auto vehicleManager = std::make_unique<V2_0::VehicleHalManager>(halImpl21.get());
+
+ Vehicle_V2_1 vehicle21(vehicleManager.get());
+
+ ALOGI("Registering as service...");
+ vehicle21.registerAsService("Vehicle");
+
+ configureRpcThreadpool(1, true /* callerWillJoin */);
+
+ ALOGI("Ready");
+ joinRpcThreadpool();
+}
diff --git a/automotive/vehicle/2.1/types.hal b/automotive/vehicle/2.1/types.hal
new file mode 100644
index 0000000..5df1fbc
--- /dev/null
+++ b/automotive/vehicle/2.1/types.hal
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.1 (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.1
+ *
+ * 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.automotive.vehicle@2.1;
+
+import android.hardware.automotive.vehicle@2.0;
+
+/*
+ * Extension of VehicleProperty enum declared in Vehicle HAL 2.0
+ */
+enum VehicleProperty: @2.0::VehicleProperty {
+ /*
+ * Reports wheel rotational distance in meters since last wheel tick
+ * event
+ *
+ * The value is a vector each element represents distance for individual
+ * wheel in the following order: left front, right front, left rear,
+ * right rear. VehiclePropValue.timestamp must be correctly filled in.
+ *
+ * Vendors must specify wheels that support this sensor in
+ * VehiclePropConfig.configFlags. The format of this field is a bitset of
+ * values from Wheel enum.
+ *
+ * @change_mode VehiclePropertyChangeMode:ON_CHANGE |VehiclePropertyChangeMode:CONTINUOUS
+ * @access VehiclePropertyAccess:READ
+ * @unit VehicleUnit:METER
+ */
+ WHEEL_TICK = (
+ 0x0306
+ | VehiclePropertyGroup:SYSTEM
+ | VehiclePropertyType:FLOAT_VEC
+ | VehicleArea:GLOBAL),
+};
diff --git a/vehicle/Android.bp b/automotive/vehicle/Android.bp
similarity index 100%
rename from vehicle/Android.bp
rename to automotive/vehicle/Android.bp
diff --git a/benchmarks/msgq/1.0/Android.bp b/benchmarks/msgq/1.0/Android.bp
index b6f4bfd..7f8ea99 100644
--- a/benchmarks/msgq/1.0/Android.bp
+++ b/benchmarks/msgq/1.0/Android.bp
@@ -1,11 +1,18 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
+filegroup {
+ name: "android.hardware.benchmarks.msgq@1.0_hal",
+ srcs: [
+ "IBenchmarkMsgQ.hal",
+ ],
+}
+
genrule {
name: "android.hardware.benchmarks.msgq@1.0_genc++",
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.benchmarks.msgq@1.0",
srcs: [
- "IBenchmarkMsgQ.hal",
+ ":android.hardware.benchmarks.msgq@1.0_hal",
],
out: [
"android/hardware/benchmarks/msgq/1.0/BenchmarkMsgQAll.cpp",
@@ -17,7 +24,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.benchmarks.msgq@1.0",
srcs: [
- "IBenchmarkMsgQ.hal",
+ ":android.hardware.benchmarks.msgq@1.0_hal",
],
out: [
"android/hardware/benchmarks/msgq/1.0/IBenchmarkMsgQ.h",
diff --git a/biometrics/Android.bp b/biometrics/Android.bp
index eea4604..b4681e4 100644
--- a/biometrics/Android.bp
+++ b/biometrics/Android.bp
@@ -1,4 +1,5 @@
// This is an autogenerated file, do not edit.
subdirs = [
"fingerprint/2.1",
+ "fingerprint/2.1/vts/functional"
]
diff --git a/biometrics/fingerprint/2.1/Android.bp b/biometrics/fingerprint/2.1/Android.bp
index 2a252dc..586e1b3 100644
--- a/biometrics/fingerprint/2.1/Android.bp
+++ b/biometrics/fingerprint/2.1/Android.bp
@@ -1,13 +1,20 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
+filegroup {
+ name: "android.hardware.biometrics.fingerprint@2.1_hal",
+ srcs: [
+ "types.hal",
+ "IBiometricsFingerprint.hal",
+ "IBiometricsFingerprintClientCallback.hal",
+ ],
+}
+
genrule {
name: "android.hardware.biometrics.fingerprint@2.1_genc++",
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.biometrics.fingerprint@2.1",
srcs: [
- "types.hal",
- "IBiometricsFingerprint.hal",
- "IBiometricsFingerprintClientCallback.hal",
+ ":android.hardware.biometrics.fingerprint@2.1_hal",
],
out: [
"android/hardware/biometrics/fingerprint/2.1/types.cpp",
@@ -21,9 +28,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.biometrics.fingerprint@2.1",
srcs: [
- "types.hal",
- "IBiometricsFingerprint.hal",
- "IBiometricsFingerprintClientCallback.hal",
+ ":android.hardware.biometrics.fingerprint@2.1_hal",
],
out: [
"android/hardware/biometrics/fingerprint/2.1/types.h",
@@ -62,155 +67,3 @@
"android.hidl.base@1.0",
],
}
-
-genrule {
- name: "android.hardware.biometrics.fingerprint.vts.driver@2.1_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.biometrics.fingerprint@2.1 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/biometrics/fingerprint/2.1/ $(genDir)/android/hardware/biometrics/fingerprint/2.1/",
- srcs: [
- "types.hal",
- "IBiometricsFingerprint.hal",
- "IBiometricsFingerprintClientCallback.hal",
- ],
- out: [
- "android/hardware/biometrics/fingerprint/2.1/types.vts.cpp",
- "android/hardware/biometrics/fingerprint/2.1/BiometricsFingerprint.vts.cpp",
- "android/hardware/biometrics/fingerprint/2.1/BiometricsFingerprintClientCallback.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.biometrics.fingerprint.vts.driver@2.1_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.biometrics.fingerprint@2.1 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/biometrics/fingerprint/2.1/ $(genDir)/android/hardware/biometrics/fingerprint/2.1/",
- srcs: [
- "types.hal",
- "IBiometricsFingerprint.hal",
- "IBiometricsFingerprintClientCallback.hal",
- ],
- out: [
- "android/hardware/biometrics/fingerprint/2.1/types.vts.h",
- "android/hardware/biometrics/fingerprint/2.1/BiometricsFingerprint.vts.h",
- "android/hardware/biometrics/fingerprint/2.1/BiometricsFingerprintClientCallback.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.biometrics.fingerprint.vts.driver@2.1",
- generated_sources: ["android.hardware.biometrics.fingerprint.vts.driver@2.1_genc++"],
- generated_headers: ["android.hardware.biometrics.fingerprint.vts.driver@2.1_genc++_headers"],
- export_generated_headers: ["android.hardware.biometrics.fingerprint.vts.driver@2.1_genc++_headers"],
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libvts_common",
- "libvts_datatype",
- "libvts_measurement",
- "libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
- "android.hidl.base@1.0",
- "android.hardware.biometrics.fingerprint@2.1",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "android.hidl.base@1.0",
- ],
-}
-
-genrule {
- name: "android.hardware.biometrics.fingerprint@2.1-IBiometricsFingerprint-vts.profiler_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.biometrics.fingerprint@2.1 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/biometrics/fingerprint/2.1/ $(genDir)/android/hardware/biometrics/fingerprint/2.1/",
- srcs: [
- "IBiometricsFingerprint.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/biometrics/fingerprint/2.1/BiometricsFingerprint.vts.cpp",
- "android/hardware/biometrics/fingerprint/2.1/types.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.biometrics.fingerprint@2.1-IBiometricsFingerprint-vts.profiler_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.biometrics.fingerprint@2.1 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/biometrics/fingerprint/2.1/ $(genDir)/android/hardware/biometrics/fingerprint/2.1/",
- srcs: [
- "IBiometricsFingerprint.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/biometrics/fingerprint/2.1/BiometricsFingerprint.vts.h",
- "android/hardware/biometrics/fingerprint/2.1/types.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.biometrics.fingerprint@2.1-IBiometricsFingerprint-vts.profiler",
- generated_sources: ["android.hardware.biometrics.fingerprint@2.1-IBiometricsFingerprint-vts.profiler_genc++"],
- generated_headers: ["android.hardware.biometrics.fingerprint@2.1-IBiometricsFingerprint-vts.profiler_genc++_headers"],
- export_generated_headers: ["android.hardware.biometrics.fingerprint@2.1-IBiometricsFingerprint-vts.profiler_genc++_headers"],
- shared_libs: [
- "libbase",
- "libhidlbase",
- "libhidltransport",
- "libvts_profiling",
- "libvts_multidevice_proto",
- "libprotobuf-cpp-full",
- "android.hidl.base@1.0",
- "android.hardware.biometrics.fingerprint@2.1",
- ],
-}
-
-genrule {
- name: "android.hardware.biometrics.fingerprint@2.1-IBiometricsFingerprintClientCallback-vts.profiler_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.biometrics.fingerprint@2.1 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/biometrics/fingerprint/2.1/ $(genDir)/android/hardware/biometrics/fingerprint/2.1/",
- srcs: [
- "IBiometricsFingerprintClientCallback.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/biometrics/fingerprint/2.1/BiometricsFingerprintClientCallback.vts.cpp",
- "android/hardware/biometrics/fingerprint/2.1/types.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.biometrics.fingerprint@2.1-IBiometricsFingerprintClientCallback-vts.profiler_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.biometrics.fingerprint@2.1 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/biometrics/fingerprint/2.1/ $(genDir)/android/hardware/biometrics/fingerprint/2.1/",
- srcs: [
- "IBiometricsFingerprintClientCallback.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/biometrics/fingerprint/2.1/BiometricsFingerprintClientCallback.vts.h",
- "android/hardware/biometrics/fingerprint/2.1/types.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.biometrics.fingerprint@2.1-IBiometricsFingerprintClientCallback-vts.profiler",
- generated_sources: ["android.hardware.biometrics.fingerprint@2.1-IBiometricsFingerprintClientCallback-vts.profiler_genc++"],
- generated_headers: ["android.hardware.biometrics.fingerprint@2.1-IBiometricsFingerprintClientCallback-vts.profiler_genc++_headers"],
- export_generated_headers: ["android.hardware.biometrics.fingerprint@2.1-IBiometricsFingerprintClientCallback-vts.profiler_genc++_headers"],
- shared_libs: [
- "libbase",
- "libhidlbase",
- "libhidltransport",
- "libvts_profiling",
- "libvts_multidevice_proto",
- "libprotobuf-cpp-full",
- "android.hidl.base@1.0",
- "android.hardware.biometrics.fingerprint@2.1",
- ],
-}
diff --git a/biometrics/fingerprint/2.1/Android.mk b/biometrics/fingerprint/2.1/Android.mk
index 22da268..567b38a 100644
--- a/biometrics/fingerprint/2.1/Android.mk
+++ b/biometrics/fingerprint/2.1/Android.mk
@@ -8,7 +8,7 @@
LOCAL_MODULE := android.hardware.biometrics.fingerprint@2.1-java
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -239,7 +239,7 @@
LOCAL_MODULE := android.hardware.biometrics.fingerprint@2.1-java-static
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
diff --git a/biometrics/fingerprint/2.1/default/Android.mk b/biometrics/fingerprint/2.1/default/Android.mk
index e5c79fe..ea20130 100644
--- a/biometrics/fingerprint/2.1/default/Android.mk
+++ b/biometrics/fingerprint/2.1/default/Android.mk
@@ -3,6 +3,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.biometrics.fingerprint@2.1-service
LOCAL_INIT_RC := android.hardware.biometrics.fingerprint@2.1-service.rc
+LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_SRC_FILES := \
BiometricsFingerprint.cpp \
diff --git a/biometrics/fingerprint/2.1/default/BiometricsFingerprint.cpp b/biometrics/fingerprint/2.1/default/BiometricsFingerprint.cpp
index 154b7a6..b106481 100644
--- a/biometrics/fingerprint/2.1/default/BiometricsFingerprint.cpp
+++ b/biometrics/fingerprint/2.1/default/BiometricsFingerprint.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2017 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.
@@ -50,7 +50,7 @@
}
BiometricsFingerprint::~BiometricsFingerprint() {
- ALOGV(LOG_VERBOSE, LOG_TAG, "~BiometricsFingerprint()\n");
+ ALOGV("~BiometricsFingerprint()");
if (mDevice == nullptr) {
ALOGE("No valid device");
return;
diff --git a/biometrics/fingerprint/2.1/default/BiometricsFingerprint.h b/biometrics/fingerprint/2.1/default/BiometricsFingerprint.h
index 652a3e0..5923c84 100644
--- a/biometrics/fingerprint/2.1/default/BiometricsFingerprint.h
+++ b/biometrics/fingerprint/2.1/default/BiometricsFingerprint.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2017 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.
diff --git a/biometrics/fingerprint/2.1/default/android.hardware.biometrics.fingerprint@2.1-service.rc b/biometrics/fingerprint/2.1/default/android.hardware.biometrics.fingerprint@2.1-service.rc
index 3de52ad..aa767a6 100644
--- a/biometrics/fingerprint/2.1/default/android.hardware.biometrics.fingerprint@2.1-service.rc
+++ b/biometrics/fingerprint/2.1/default/android.hardware.biometrics.fingerprint@2.1-service.rc
@@ -1,4 +1,4 @@
-service fps_hal /system/bin/hw/android.hardware.biometrics.fingerprint@2.1-service
+service fps_hal /vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service
# "class hal" causes a race condition on some devices due to files created
# in /data. As a workaround, postpone startup until later in boot once
# /data is mounted.
diff --git a/biometrics/fingerprint/2.1/default/service.cpp b/biometrics/fingerprint/2.1/default/service.cpp
index 0563acb..d6b91c6 100644
--- a/biometrics/fingerprint/2.1/default/service.cpp
+++ b/biometrics/fingerprint/2.1/default/service.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2017 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.
diff --git a/biometrics/fingerprint/2.1/types.hal b/biometrics/fingerprint/2.1/types.hal
index f462906..e389773 100644
--- a/biometrics/fingerprint/2.1/types.hal
+++ b/biometrics/fingerprint/2.1/types.hal
@@ -49,6 +49,8 @@
* followed by ERROR_CANCELED.
*/
enum FingerprintError : int32_t {
+ /* Used for testing, no error returned */
+ ERROR_NO_ERROR = 0,
/* The hardware has an error that can't be resolved. */
ERROR_HW_UNAVAILABLE = 1,
/* Bad data; operation can't continue */
diff --git a/biometrics/fingerprint/2.1/vts/BiometricsFingerprint.vts b/biometrics/fingerprint/2.1/vts/BiometricsFingerprint.vts
new file mode 100644
index 0000000..0581da0
--- /dev/null
+++ b/biometrics/fingerprint/2.1/vts/BiometricsFingerprint.vts
@@ -0,0 +1,191 @@
+component_class: HAL_HIDL
+component_type_version: 2.1
+component_name: "IBiometricsFingerprint"
+
+package: "android.hardware.biometrics.fingerprint"
+
+import: "android.hardware.biometrics.fingerprint@2.1::IBiometricsFingerprintClientCallback"
+import: "android.hardware.biometrics.fingerprint@2.1::types"
+import: "android.hidl.base@1.0::types"
+
+interface: {
+ api: {
+ name: "setNotify"
+ return_type_hidl: {
+ type: TYPE_SCALAR
+ scalar_type: "uint64_t"
+ }
+ arg: {
+ type: TYPE_HIDL_CALLBACK
+ predefined_type: "::android::hardware::biometrics::fingerprint::V2_1::IBiometricsFingerprintClientCallback"
+ }
+ callflow: {
+ next: "setActiveGroup"
+ }
+ callflow: {
+ entry: true
+ }
+ }
+
+ api: {
+ name: "preEnroll"
+ return_type_hidl: {
+ type: TYPE_SCALAR
+ scalar_type: "uint64_t"
+ }
+ callflow: {
+ next: "enroll"
+ next: "postEnroll"
+ }
+ }
+
+ api: {
+ name: "enroll"
+ return_type_hidl: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::biometrics::fingerprint::V2_1::RequestStatus"
+ }
+ arg: {
+ type: TYPE_ARRAY
+ vector_size: 69
+ vector_value: {
+ type: TYPE_SCALAR
+ scalar_type: "uint8_t"
+ }
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+ callflow: {
+ next: "cancel"
+ next: "enroll"
+ next: "postEnroll"
+ next: "remove"
+ }
+ }
+
+ api: {
+ name: "postEnroll"
+ return_type_hidl: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::biometrics::fingerprint::V2_1::RequestStatus"
+ }
+ callflow: {
+ next: "authenticate"
+ next: "setActiveGroup"
+ next: "enumerate"
+ next: "remove"
+ }
+ }
+
+ api: {
+ name: "getAuthenticatorId"
+ return_type_hidl: {
+ type: TYPE_SCALAR
+ scalar_type: "uint64_t"
+ }
+ callflow: {
+ next: "authenticate"
+ }
+ }
+
+ api: {
+ name: "cancel"
+ return_type_hidl: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::biometrics::fingerprint::V2_1::RequestStatus"
+ }
+ callflow: {
+ next: "authenticate"
+ next: "enroll"
+ next: "enumerate"
+ next: "remove"
+ next: "setActiveGroup"
+ }
+ }
+
+ api: {
+ name: "enumerate"
+ return_type_hidl: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::biometrics::fingerprint::V2_1::RequestStatus"
+ }
+ callflow: {
+ next: "remove"
+ next: "enroll"
+ next: "authenticate"
+ next: "setActiveGroup"
+ }
+ }
+
+ api: {
+ name: "remove"
+ return_type_hidl: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::biometrics::fingerprint::V2_1::RequestStatus"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+ callflow: {
+ next: "enumerate"
+ next: "authenticate"
+ next: "cancel"
+ next: "getAuthenticatorId"
+ next: "setActiveGroup"
+ }
+ }
+
+ api: {
+ name: "setActiveGroup"
+ return_type_hidl: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::biometrics::fingerprint::V2_1::RequestStatus"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+ arg: {
+ type: TYPE_STRING
+ }
+ callflow: {
+ next: "authenticate"
+ next: "preEnroll"
+ next: "enumerate"
+ next: "remove"
+ }
+ }
+
+ api: {
+ name: "authenticate"
+ return_type_hidl: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::biometrics::fingerprint::V2_1::RequestStatus"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint64_t"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+ callflow: {
+ next: "cancel"
+ next: "preEnroll"
+ next: "remove"
+ }
+ }
+
+}
diff --git a/biometrics/fingerprint/2.1/vts/BiometricsFingerprintClientCallback.vts b/biometrics/fingerprint/2.1/vts/BiometricsFingerprintClientCallback.vts
new file mode 100644
index 0000000..dedda65
--- /dev/null
+++ b/biometrics/fingerprint/2.1/vts/BiometricsFingerprintClientCallback.vts
@@ -0,0 +1,126 @@
+component_class: HAL_HIDL
+component_type_version: 2.1
+component_name: "IBiometricsFingerprintClientCallback"
+
+package: "android.hardware.biometrics.fingerprint"
+
+import: "android.hardware.biometrics.fingerprint@2.1::types"
+import: "android.hidl.base@1.0::types"
+
+interface: {
+ api: {
+ name: "onEnrollResult"
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint64_t"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+ }
+
+ api: {
+ name: "onAcquired"
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint64_t"
+ }
+ arg: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintAcquiredInfo"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "int32_t"
+ }
+ }
+
+ api: {
+ name: "onAuthenticated"
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint64_t"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+ arg: {
+ type: TYPE_VECTOR
+ vector_value: {
+ type: TYPE_SCALAR
+ scalar_type: "uint8_t"
+ }
+ }
+ }
+
+ api: {
+ name: "onError"
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint64_t"
+ }
+ arg: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintError"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "int32_t"
+ }
+ }
+
+ api: {
+ name: "onRemoved"
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint64_t"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+ }
+
+ api: {
+ name: "onEnumerate"
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint64_t"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+ }
+
+}
diff --git a/biometrics/fingerprint/2.1/vts/functional/Android.bp b/biometrics/fingerprint/2.1/vts/functional/Android.bp
new file mode 100644
index 0000000..25f7cc0
--- /dev/null
+++ b/biometrics/fingerprint/2.1/vts/functional/Android.bp
@@ -0,0 +1,37 @@
+//
+// Copyright (C) 2017 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.
+//
+
+cc_test {
+ name: "fingerprint_hidl_hal_test",
+ gtest: true,
+ srcs: ["fingerprint_hidl_hal_test.cpp"],
+ shared_libs: [
+ "libbase",
+ "libhidltransport",
+ "libhardware",
+ "libhwbinder",
+ "libhidlbase",
+ "liblog",
+ "libutils",
+ "android.hardware.biometrics.fingerprint@2.1",
+ ],
+ static_libs: ["libgtest"],
+ cflags: [
+ "-O0",
+ "-g",
+ ]
+}
+
diff --git a/biometrics/fingerprint/2.1/vts/functional/fingerprint_hidl_hal_test.cpp b/biometrics/fingerprint/2.1/vts/functional/fingerprint_hidl_hal_test.cpp
new file mode 100644
index 0000000..9138000
--- /dev/null
+++ b/biometrics/fingerprint/2.1/vts/functional/fingerprint_hidl_hal_test.cpp
@@ -0,0 +1,158 @@
+/*
+ * Copyright (C) 2017 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.
+ */
+
+#define LOG_TAG "fingerprint_hidl_hal_test"
+
+#include <android-base/logging.h>
+#include <android/hardware/biometrics/fingerprint/2.1/IBiometricsFingerprint.h>
+#include <android/hardware/biometrics/fingerprint/2.1/IBiometricsFingerprintClientCallback.h>
+#include <chrono>
+#include <gtest/gtest.h>
+#include <hidl/HidlSupport.h>
+#include <hidl/HidlTransportSupport.h>
+
+using android::hardware::biometrics::fingerprint::V2_1::IBiometricsFingerprint;
+using android::hardware::biometrics::fingerprint::V2_1::IBiometricsFingerprintClientCallback;
+using android::hardware::biometrics::fingerprint::V2_1::FingerprintAcquiredInfo;
+using android::hardware::biometrics::fingerprint::V2_1::FingerprintError;
+using android::hardware::biometrics::fingerprint::V2_1::RequestStatus;
+using android::hardware::hidl_vec;
+using android::hardware::Return;
+
+#define SERVICE_NAME "fingerprint_hal"
+
+class FingerprintHidlTest : public ::testing::Test,
+ public IBiometricsFingerprintClientCallback {
+
+protected:
+ android::sp<IBiometricsFingerprint> service;
+ FingerprintError err;
+ // State changes should occur within this threshold, otherwise the
+ // framework' will assume things have broken.
+ std::chrono::seconds threshold;
+
+public:
+ FingerprintHidlTest ():
+ err(FingerprintError::ERROR_NO_ERROR), threshold(1) {}
+
+ virtual void SetUp() override {
+ service = IBiometricsFingerprint::getService(SERVICE_NAME);
+
+ ASSERT_NE(service, nullptr);
+ clearErr();
+
+ // TODO: instantly fail any test that receives a death notification
+ }
+
+ virtual void TearDown() override {}
+
+ // implement methods of IBiometricsFingerprintClientCallback
+ virtual Return<void> onEnrollResult(uint64_t, uint32_t, uint32_t, uint32_t)
+ override {
+ return Return<void>();
+ }
+ virtual Return<void> onAcquired(uint64_t, FingerprintAcquiredInfo, int32_t)
+ override {
+ return Return<void>();
+ }
+
+ virtual Return<void> onAuthenticated(uint64_t, uint32_t, uint32_t, const
+ hidl_vec<uint8_t>&) override {
+ return Return<void>();
+ }
+
+ virtual Return<void> onError(uint64_t, FingerprintError error, int32_t)
+ override {
+ err = error;
+ return Return<void>();
+ }
+
+ virtual Return<void> onRemoved(uint64_t, uint32_t, uint32_t, uint32_t)
+ override {
+ return Return<void>();
+ }
+
+ virtual Return<void> onEnumerate(uint64_t, uint32_t, uint32_t, uint32_t)
+ override {
+ return Return<void>();
+ }
+
+ void clearErr () {
+ err = FingerprintError::ERROR_NO_ERROR;
+ }
+};
+
+class FingerprintHidlEnvironment : public ::testing::Environment {
+public:
+ virtual void SetUp() {}
+ virtual void TearDown() {}
+};
+
+// The service should be reachable.
+TEST_F(FingerprintHidlTest, ConnectTest) {
+ Return<uint64_t> rc = service->setNotify(this);
+ EXPECT_NE(rc, 0UL);
+}
+
+// Cancel should always return ERROR_CANCELED from any starting state including
+// the IDLE state.
+TEST_F(FingerprintHidlTest, CancelTest) {
+ Return<uint64_t> rc = service->setNotify(this);
+ EXPECT_NE(rc, 0UL);
+
+ auto start = std::chrono::system_clock::now();
+ Return<RequestStatus> res = service->cancel();
+ auto end = std::chrono::system_clock::now();
+ auto diff = end - start;
+
+ // check that we were able to make an IPC request successfully
+ EXPECT_EQ(RequestStatus::SYS_OK, res);
+ // check error should be ERROR_CANCELED
+ EXPECT_EQ(FingerprintError::ERROR_CANCELED, err);
+ // check that this did not take longer than a threshold
+ EXPECT_TRUE(diff <= threshold);
+}
+
+// A call to cancel should after any other method call should set the error
+// state to canceled.
+TEST_F(FingerprintHidlTest, AuthTest) {
+ Return<uint64_t> rc = service->setNotify(this);
+ EXPECT_NE(rc, 0UL);
+
+ Return<RequestStatus> res = service->authenticate(0, 0);
+ // check that we were able to make an IPC request successfully
+ EXPECT_EQ(RequestStatus::SYS_OK, res);
+
+ auto start = std::chrono::system_clock::now();
+ res = service->cancel();
+ auto end = std::chrono::system_clock::now();
+ auto diff = end - start;
+
+ // check that we were able to make an IPC request successfully
+ EXPECT_EQ(RequestStatus::SYS_OK, res);
+ // check error should be ERROR_CANCELED
+ EXPECT_EQ(FingerprintError::ERROR_CANCELED, err);
+ // check that this did not take longer than a threshold
+ EXPECT_TRUE(diff <= threshold);
+}
+
+int main(int argc, char **argv) {
+ ::testing::AddGlobalTestEnvironment(new FingerprintHidlEnvironment);
+ ::testing::InitGoogleTest(&argc, argv);
+ int status = RUN_ALL_TESTS();
+ LOG(INFO) << "Test result = " << status;
+ return status;
+}
diff --git a/biometrics/fingerprint/2.1/vts/types.vts b/biometrics/fingerprint/2.1/vts/types.vts
new file mode 100644
index 0000000..9f9fd37
--- /dev/null
+++ b/biometrics/fingerprint/2.1/vts/types.vts
@@ -0,0 +1,262 @@
+component_class: HAL_HIDL
+component_type_version: 2.1
+component_name: "types"
+
+package: "android.hardware.biometrics.fingerprint"
+
+
+attribute: {
+ name: "::android::hardware::biometrics::fingerprint::V2_1::RequestStatus"
+ type: TYPE_ENUM
+ enum_value: {
+ scalar_type: "int32_t"
+
+ enumerator: "SYS_UNKNOWN"
+ scalar_value: {
+ int32_t: 1
+ }
+ enumerator: "SYS_OK"
+ scalar_value: {
+ int32_t: 0
+ }
+ enumerator: "SYS_ENOENT"
+ scalar_value: {
+ int32_t: -2
+ }
+ enumerator: "SYS_EINTR"
+ scalar_value: {
+ int32_t: -4
+ }
+ enumerator: "SYS_EIO"
+ scalar_value: {
+ int32_t: -5
+ }
+ enumerator: "SYS_EAGAIN"
+ scalar_value: {
+ int32_t: -11
+ }
+ enumerator: "SYS_ENOMEM"
+ scalar_value: {
+ int32_t: -12
+ }
+ enumerator: "SYS_EACCES"
+ scalar_value: {
+ int32_t: -13
+ }
+ enumerator: "SYS_EFAULT"
+ scalar_value: {
+ int32_t: -14
+ }
+ enumerator: "SYS_EBUSY"
+ scalar_value: {
+ int32_t: -16
+ }
+ enumerator: "SYS_EINVAL"
+ scalar_value: {
+ int32_t: -22
+ }
+ enumerator: "SYS_ENOSPC"
+ scalar_value: {
+ int32_t: -28
+ }
+ enumerator: "SYS_ETIMEDOUT"
+ scalar_value: {
+ int32_t: -110
+ }
+ }
+}
+
+attribute: {
+ name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintError"
+ type: TYPE_ENUM
+ enum_value: {
+ scalar_type: "int32_t"
+
+ enumerator: "ERROR_NO_ERROR"
+ scalar_value: {
+ int32_t: 0
+ }
+ enumerator: "ERROR_HW_UNAVAILABLE"
+ scalar_value: {
+ int32_t: 1
+ }
+ enumerator: "ERROR_UNABLE_TO_PROCESS"
+ scalar_value: {
+ int32_t: 2
+ }
+ enumerator: "ERROR_TIMEOUT"
+ scalar_value: {
+ int32_t: 3
+ }
+ enumerator: "ERROR_NO_SPACE"
+ scalar_value: {
+ int32_t: 4
+ }
+ enumerator: "ERROR_CANCELED"
+ scalar_value: {
+ int32_t: 5
+ }
+ enumerator: "ERROR_UNABLE_TO_REMOVE"
+ scalar_value: {
+ int32_t: 6
+ }
+ enumerator: "ERROR_LOCKOUT"
+ scalar_value: {
+ int32_t: 7
+ }
+ enumerator: "ERROR_VENDOR"
+ scalar_value: {
+ int32_t: 8
+ }
+ }
+}
+
+attribute: {
+ name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintAcquiredInfo"
+ type: TYPE_ENUM
+ enum_value: {
+ scalar_type: "int32_t"
+
+ enumerator: "ACQUIRED_GOOD"
+ scalar_value: {
+ int32_t: 0
+ }
+ enumerator: "ACQUIRED_PARTIAL"
+ scalar_value: {
+ int32_t: 1
+ }
+ enumerator: "ACQUIRED_INSUFFICIENT"
+ scalar_value: {
+ int32_t: 2
+ }
+ enumerator: "ACQUIRED_IMAGER_DIRTY"
+ scalar_value: {
+ int32_t: 3
+ }
+ enumerator: "ACQUIRED_TOO_SLOW"
+ scalar_value: {
+ int32_t: 4
+ }
+ enumerator: "ACQUIRED_TOO_FAST"
+ scalar_value: {
+ int32_t: 5
+ }
+ enumerator: "ACQUIRED_VENDOR"
+ scalar_value: {
+ int32_t: 6
+ }
+ }
+}
+
+attribute: {
+ name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintFingerId"
+ type: TYPE_STRUCT
+ struct_value: {
+ name: "gid"
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+ struct_value: {
+ name: "fid"
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+}
+
+attribute: {
+ name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintEnroll"
+ type: TYPE_STRUCT
+ struct_value: {
+ name: "finger"
+ type: TYPE_STRUCT
+ predefined_type: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintFingerId"
+ }
+ struct_value: {
+ name: "samplesRemaining"
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+ struct_value: {
+ name: "msg"
+ type: TYPE_SCALAR
+ scalar_type: "uint64_t"
+ }
+}
+
+attribute: {
+ name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintIterator"
+ type: TYPE_STRUCT
+ struct_value: {
+ name: "finger"
+ type: TYPE_STRUCT
+ predefined_type: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintFingerId"
+ }
+ struct_value: {
+ name: "remainingTemplates"
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+}
+
+attribute: {
+ name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintAcquired"
+ type: TYPE_STRUCT
+ struct_value: {
+ name: "acquiredInfo"
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintAcquiredInfo"
+ }
+}
+
+attribute: {
+ name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintAuthenticated"
+ type: TYPE_STRUCT
+ struct_value: {
+ name: "finger"
+ type: TYPE_STRUCT
+ predefined_type: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintFingerId"
+ }
+ struct_value: {
+ name: "hat"
+ type: TYPE_ARRAY
+ vector_size: 69
+ vector_value: {
+ type: TYPE_SCALAR
+ scalar_type: "uint8_t"
+ }
+ }
+}
+
+attribute: {
+ name: "::android::hardware::biometrics::fingerprint::V2_1::FingerprintMsgType"
+ type: TYPE_ENUM
+ enum_value: {
+ scalar_type: "int32_t"
+
+ enumerator: "ERROR"
+ scalar_value: {
+ int32_t: -1
+ }
+ enumerator: "ACQUIRED"
+ scalar_value: {
+ int32_t: 1
+ }
+ enumerator: "TEMPLATE_ENROLLING"
+ scalar_value: {
+ int32_t: 3
+ }
+ enumerator: "TEMPLATE_REMOVED"
+ scalar_value: {
+ int32_t: 4
+ }
+ enumerator: "AUTHENTICATED"
+ scalar_value: {
+ int32_t: 5
+ }
+ enumerator: "TEMPLATE_ENUMERATING"
+ scalar_value: {
+ int32_t: 6
+ }
+ }
+}
+
diff --git a/bluetooth/1.0/Android.bp b/bluetooth/1.0/Android.bp
index 7928fb6..2373ceb 100644
--- a/bluetooth/1.0/Android.bp
+++ b/bluetooth/1.0/Android.bp
@@ -1,13 +1,20 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
+filegroup {
+ name: "android.hardware.bluetooth@1.0_hal",
+ srcs: [
+ "types.hal",
+ "IBluetoothHci.hal",
+ "IBluetoothHciCallbacks.hal",
+ ],
+}
+
genrule {
name: "android.hardware.bluetooth@1.0_genc++",
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.bluetooth@1.0",
srcs: [
- "types.hal",
- "IBluetoothHci.hal",
- "IBluetoothHciCallbacks.hal",
+ ":android.hardware.bluetooth@1.0_hal",
],
out: [
"android/hardware/bluetooth/1.0/types.cpp",
@@ -21,9 +28,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.bluetooth@1.0",
srcs: [
- "types.hal",
- "IBluetoothHci.hal",
- "IBluetoothHciCallbacks.hal",
+ ":android.hardware.bluetooth@1.0_hal",
],
out: [
"android/hardware/bluetooth/1.0/types.h",
diff --git a/bluetooth/1.0/Android.mk b/bluetooth/1.0/Android.mk
index 7924cee..d824d5d 100644
--- a/bluetooth/1.0/Android.mk
+++ b/bluetooth/1.0/Android.mk
@@ -8,7 +8,7 @@
LOCAL_MODULE := android.hardware.bluetooth@1.0-java
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -87,7 +87,7 @@
LOCAL_MODULE := android.hardware.bluetooth@1.0-java-static
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
diff --git a/bluetooth/1.0/default/async_fd_watcher.cc b/bluetooth/1.0/default/async_fd_watcher.cc
index 9cd86f1..161a74a 100644
--- a/bluetooth/1.0/default/async_fd_watcher.cc
+++ b/bluetooth/1.0/default/async_fd_watcher.cc
@@ -140,9 +140,15 @@
// Timeout.
if (retval == 0) {
- std::unique_lock<std::mutex> guard(timeout_mutex_);
- if (timeout_ms_ > std::chrono::milliseconds(0) && timeout_cb_)
- timeout_cb_();
+ // Allow the timeout callback to modify the timeout.
+ TimeoutCallback saved_cb;
+ {
+ std::unique_lock<std::mutex> guard(timeout_mutex_);
+ if (timeout_ms_ > std::chrono::milliseconds(0))
+ saved_cb = timeout_cb_;
+ }
+ if (saved_cb != nullptr)
+ saved_cb();
continue;
}
diff --git a/bluetooth/1.0/default/bluetooth_address.cc b/bluetooth/1.0/default/bluetooth_address.cc
index b917de9..656d78d 100644
--- a/bluetooth/1.0/default/bluetooth_address.cc
+++ b/bluetooth/1.0/default/bluetooth_address.cc
@@ -83,6 +83,34 @@
valid_bda = true;
}
+ /* Generate new BDA if necessary */
+ if (!valid_bda) {
+ char bdstr[kStringLength + 1];
+
+ /* No autogen BDA. Generate one now. */
+ local_addr[0] = 0x22;
+ local_addr[1] = 0x22;
+ local_addr[2] = (uint8_t)rand();
+ local_addr[3] = (uint8_t)rand();
+ local_addr[4] = (uint8_t)rand();
+ local_addr[5] = (uint8_t)rand();
+
+ /* Convert to ascii, and store as a persistent property */
+ bytes_to_string(local_addr, bdstr);
+
+ ALOGE("%s: No preset BDA! Generating BDA: %s for prop %s", __func__,
+ (char*)bdstr, PERSIST_BDADDR_PROPERTY);
+ ALOGE("%s: This is a bug in the platform! Please fix!", __func__);
+
+ if (property_set(PERSIST_BDADDR_PROPERTY, (char*)bdstr) < 0) {
+ ALOGE("%s: Failed to set random BDA in prop %s", __func__,
+ PERSIST_BDADDR_PROPERTY);
+ valid_bda = false;
+ } else {
+ valid_bda = true;
+ }
+ }
+
return valid_bda;
}
diff --git a/bluetooth/1.0/default/test/async_fd_watcher_unittest.cc b/bluetooth/1.0/default/test/async_fd_watcher_unittest.cc
index c21acb8..49ea44a 100644
--- a/bluetooth/1.0/default/test/async_fd_watcher_unittest.cc
+++ b/bluetooth/1.0/default/test/async_fd_watcher_unittest.cc
@@ -56,8 +56,7 @@
int reuse_flag = 1;
EXPECT_FALSE(setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &reuse_flag,
sizeof(reuse_flag)) < 0);
- EXPECT_FALSE(bind(fd, (sockaddr*)&serv_addr, sizeof(serv_addr)) <
- 0);
+ EXPECT_FALSE(bind(fd, (sockaddr*)&serv_addr, sizeof(serv_addr)) < 0);
ALOGD("%s before listen", __func__);
listen(fd, 1);
@@ -81,11 +80,12 @@
int n = TEMP_FAILURE_RETRY(read(fd, server_buffer_, kBufferSize - 1));
EXPECT_FALSE(n < 0);
- if (n == 0) // got EOF
+ if (n == 0) { // got EOF
ALOGD("%s: EOF", __func__);
- else
+ } else {
ALOGD("%s: Got something", __func__);
n = write(fd, "1", 1);
+ }
}
void SetUp() override {
@@ -101,7 +101,10 @@
int connection_fd = AcceptConnection(fd);
ALOGD("%s: Conn_watcher fd = %d", __func__, fd);
- conn_watcher_.ConfigureTimeout(std::chrono::seconds(0), [this]() { bool connection_timeout_cleared = false; ASSERT_TRUE(connection_timeout_cleared); });
+ conn_watcher_.ConfigureTimeout(std::chrono::seconds(0), [this]() {
+ bool connection_timeout_cleared = false;
+ ASSERT_TRUE(connection_timeout_cleared);
+ });
ALOGD("%s: 3", __func__);
async_fd_watcher_.WatchFdForNonBlockingReads(
@@ -110,7 +113,10 @@
// Time out if it takes longer than a second.
SetTimeout(std::chrono::seconds(1));
});
- conn_watcher_.ConfigureTimeout(std::chrono::seconds(1), [this]() { bool connection_timeout = true; ASSERT_FALSE(connection_timeout); });
+ conn_watcher_.ConfigureTimeout(std::chrono::seconds(1), [this]() {
+ bool connection_timeout = true;
+ ASSERT_FALSE(connection_timeout);
+ });
}
void CleanUpServer() {
@@ -135,7 +141,7 @@
}
bool TimedOut() {
- ALOGD("%s %d", __func__, timed_out_? 1 : 0);
+ ALOGD("%s %d", __func__, timed_out_ ? 1 : 0);
return timed_out_;
}
@@ -198,8 +204,8 @@
// Fail if the client doesn't connect within 1 second.
conn_watcher.ConfigureTimeout(std::chrono::seconds(1), [this]() {
- bool connection_timeout = true;
- ASSERT_FALSE(connection_timeout);
+ bool connection_timeout = true;
+ ASSERT_FALSE(connection_timeout);
});
ConnectClient();
@@ -220,7 +226,8 @@
});
// Set the timeout flag after 100ms.
- conn_watcher.ConfigureTimeout(std::chrono::milliseconds(100), [this, timeout_ptr]() { *timeout_ptr = true; });
+ conn_watcher.ConfigureTimeout(std::chrono::milliseconds(100),
+ [this, timeout_ptr]() { *timeout_ptr = true; });
EXPECT_FALSE(timed_out);
sleep(1);
EXPECT_TRUE(timed_out);
@@ -228,6 +235,38 @@
close(socket_fd);
}
+// Modify the timeout in a timeout callback.
+TEST_F(AsyncFdWatcherSocketTest, TimedOutSchedulesTimeout) {
+ int socket_fd = StartServer();
+ bool timed_out = false;
+ bool timed_out2 = false;
+
+ AsyncFdWatcher conn_watcher;
+ conn_watcher.WatchFdForNonBlockingReads(socket_fd, [this](int fd) {
+ int connection_fd = AcceptConnection(fd);
+ close(connection_fd);
+ });
+
+ // Set a timeout flag in each callback.
+ conn_watcher.ConfigureTimeout(
+ std::chrono::milliseconds(500),
+ [this, &conn_watcher, &timed_out, &timed_out2]() {
+ timed_out = true;
+ conn_watcher.ConfigureTimeout(std::chrono::seconds(1),
+ [&timed_out2]() { timed_out2 = true; });
+ });
+ EXPECT_FALSE(timed_out);
+ EXPECT_FALSE(timed_out2);
+ sleep(1);
+ EXPECT_TRUE(timed_out);
+ EXPECT_FALSE(timed_out2);
+ sleep(1);
+ EXPECT_TRUE(timed_out);
+ EXPECT_TRUE(timed_out2);
+ conn_watcher.StopWatchingFileDescriptor();
+ close(socket_fd);
+}
+
// Use two AsyncFdWatchers to set up a server socket.
TEST_F(AsyncFdWatcherSocketTest, ClientServer) {
ConfigureServer();
diff --git a/bluetooth/1.0/default/test/bluetooth_address_test.cc b/bluetooth/1.0/default/test/bluetooth_address_test.cc
index 9f80ec2..adcd9c1 100644
--- a/bluetooth/1.0/default/test/bluetooth_address_test.cc
+++ b/bluetooth/1.0/default/test/bluetooth_address_test.cc
@@ -219,10 +219,18 @@
EXPECT_TRUE(BluetoothAddress::get_local_address(address));
EXPECT_TRUE(memcmp(address, kTestAddr1_bytes, BluetoothAddress::kBytes) == 0);
- // File contains a zero address.
+ // File contains a zero address. A random address will be generated.
FileWriteString(kAddrPath, kZeros);
EXPECT_TRUE(property_set(PROPERTY_BT_BDADDR_PATH, kAddrPath) == 0);
- EXPECT_FALSE(BluetoothAddress::get_local_address(address));
+ EXPECT_TRUE(property_set(PERSIST_BDADDR_PROPERTY, kTestAddrBad1) == 0);
+ EXPECT_TRUE(BluetoothAddress::get_local_address(address));
+ EXPECT_TRUE(memcmp(address, kZeros_bytes, BluetoothAddress::kBytes) != 0);
+ char prop[PROP_VALUE_MAX] = "Before reading";
+ EXPECT_TRUE(property_get(PERSIST_BDADDR_PROPERTY, prop, NULL) ==
+ BluetoothAddress::kStringLength);
+ char address_str[BluetoothAddress::kStringLength + 1];
+ BluetoothAddress::bytes_to_string(address, address_str);
+ EXPECT_TRUE(memcmp(address_str, prop, BluetoothAddress::kStringLength) == 0);
// Factory property contains an address.
EXPECT_TRUE(property_set(PERSIST_BDADDR_PROPERTY, kTestAddrBad1) == 0);
diff --git a/bluetooth/1.0/default/vendor_interface.cc b/bluetooth/1.0/default/vendor_interface.cc
index 51a0add..7737dd2 100644
--- a/bluetooth/1.0/default/vendor_interface.cc
+++ b/bluetooth/1.0/default/vendor_interface.cc
@@ -39,8 +39,15 @@
using android::hardware::bluetooth::V1_0::implementation::VendorInterface;
using android::hardware::hidl_vec;
-tINT_CMD_CBACK internal_command_cb;
-uint16_t internal_command_opcode;
+struct {
+ tINT_CMD_CBACK cb;
+ uint16_t opcode;
+} internal_command;
+
+// True when LPM is not enabled yet or wake is not asserted.
+bool lpm_wake_deasserted;
+uint32_t lpm_timeout_ms;
+bool recent_activity_flag;
VendorInterface* g_vendor_interface = nullptr;
@@ -105,19 +112,20 @@
uint16_t opcode = packet[opcode_offset] | (packet[opcode_offset + 1] << 8);
- ALOGV("%s internal_command_opcode = %04X opcode = %04x", __func__,
- internal_command_opcode, opcode);
- return opcode == internal_command_opcode;
+ ALOGV("%s internal_command.opcode = %04X opcode = %04x", __func__,
+ internal_command.opcode, opcode);
+ return opcode == internal_command.opcode;
}
uint8_t transmit_cb(uint16_t opcode, void* buffer, tINT_CMD_CBACK callback) {
ALOGV("%s opcode: 0x%04x, ptr: %p, cb: %p", __func__, opcode, buffer,
callback);
- internal_command_cb = callback;
- internal_command_opcode = opcode;
+ internal_command.cb = callback;
+ internal_command.opcode = opcode;
uint8_t type = HCI_PACKET_TYPE_COMMAND;
HC_BT_HDR* bt_hdr = reinterpret_cast<HC_BT_HDR*>(buffer);
VendorInterface::get()->Send(type, bt_hdr->data, bt_hdr->len);
+ delete[] reinterpret_cast<uint8_t*>(buffer);
return true;
}
@@ -268,6 +276,9 @@
fd_watcher_.WatchFdForNonBlockingReads(uart_fd_,
[this](int fd) { OnDataReady(fd); });
+ // Initially, the power management is off.
+ lpm_wake_deasserted = true;
+
// Start configuring the firmware
firmware_startup_timer_ = new FirmwareStartupTimer();
lib_interface_->op(BT_VND_OP_FW_CFG, nullptr);
@@ -279,6 +290,9 @@
fd_watcher_.StopWatchingFileDescriptor();
if (lib_interface_ != nullptr) {
+ bt_vendor_lpm_mode_t mode = BT_VND_LPM_DISABLE;
+ lib_interface_->op(BT_VND_OP_LPM_SET_MODE, &mode);
+
lib_interface_->op(BT_VND_OP_USERIAL_CLOSE, nullptr);
uart_fd_ = INVALID_FD;
int power_state = BT_VND_PWR_OFF;
@@ -299,6 +313,19 @@
size_t VendorInterface::Send(uint8_t type, const uint8_t* data, size_t length) {
if (uart_fd_ == INVALID_FD) return 0;
+ recent_activity_flag = true;
+
+ if (lpm_wake_deasserted == true) {
+ // Restart the timer.
+ fd_watcher_.ConfigureTimeout(std::chrono::milliseconds(lpm_timeout_ms),
+ [this]() { OnTimeout(); });
+ // Assert wake.
+ lpm_wake_deasserted = false;
+ bt_vendor_lpm_wake_state_t wakeState = BT_VND_LPM_WAKE_ASSERT;
+ lib_interface_->op(BT_VND_OP_LPM_WAKE_SET_STATE, &wakeState);
+ ALOGV("%s: Sent wake before (%02x)", __func__, data[0] | (data[1] << 8));
+ }
+
int rv = write_safely(uart_fd_, &type, sizeof(type));
if (rv == sizeof(type))
rv = write_safely(uart_fd_, data, length);
@@ -318,6 +345,29 @@
initialize_complete_cb_(result == 0);
initialize_complete_cb_ = nullptr;
}
+
+ lib_interface_->op(BT_VND_OP_GET_LPM_IDLE_TIMEOUT, &lpm_timeout_ms);
+ ALOGI("%s: lpm_timeout_ms %d", __func__, lpm_timeout_ms);
+
+ bt_vendor_lpm_mode_t mode = BT_VND_LPM_ENABLE;
+ lib_interface_->op(BT_VND_OP_LPM_SET_MODE, &mode);
+
+ ALOGD("%s Calling StartLowPowerWatchdog()", __func__);
+ fd_watcher_.ConfigureTimeout(std::chrono::milliseconds(lpm_timeout_ms),
+ [this]() { OnTimeout(); });
+}
+
+void VendorInterface::OnTimeout() {
+ ALOGV("%s", __func__);
+ if (recent_activity_flag == false) {
+ lpm_wake_deasserted = true;
+ bt_vendor_lpm_wake_state_t wakeState = BT_VND_LPM_WAKE_DEASSERT;
+ lib_interface_->op(BT_VND_OP_LPM_WAKE_SET_STATE, &wakeState);
+ fd_watcher_.ConfigureTimeout(std::chrono::seconds(0), []() {
+ ALOGE("Zero timeout! Should never happen.");
+ });
+ }
+ recent_activity_flag = false;
}
void VendorInterface::OnDataReady(int fd) {
@@ -364,18 +414,19 @@
hci_packet_.data() + preamble_size_for_type[hci_packet_type_] +
hci_packet_bytes_read_,
hci_packet_bytes_remaining_));
+ CHECK(bytes_read > 0);
hci_packet_bytes_remaining_ -= bytes_read;
hci_packet_bytes_read_ += bytes_read;
if (hci_packet_bytes_remaining_ == 0) {
- if (internal_command_cb != nullptr &&
+ if (internal_command.cb != nullptr &&
hci_packet_type_ == HCI_PACKET_TYPE_EVENT &&
internal_command_event_match(hci_packet_)) {
HC_BT_HDR* bt_hdr =
WrapPacketAndCopy(HCI_PACKET_TYPE_EVENT, hci_packet_);
// The callbacks can send new commands, so don't zero after calling.
- tINT_CMD_CBACK saved_cb = internal_command_cb;
- internal_command_cb = nullptr;
+ tINT_CMD_CBACK saved_cb = internal_command.cb;
+ internal_command.cb = nullptr;
saved_cb(bt_hdr);
} else {
packet_read_cb_(hci_packet_type_, hci_packet_);
diff --git a/bluetooth/1.0/default/vendor_interface.h b/bluetooth/1.0/default/vendor_interface.h
index 79611cd..ce5769c 100644
--- a/bluetooth/1.0/default/vendor_interface.h
+++ b/bluetooth/1.0/default/vendor_interface.h
@@ -53,6 +53,8 @@
PacketReadCallback packet_read_cb);
void Close();
+ void OnTimeout();
+
void OnDataReady(int fd);
void *lib_handle_;
diff --git a/bluetooth/1.0/vts/Android.mk b/bluetooth/1.0/vts/Android.mk
deleted file mode 100644
index 85e0c38..0000000
--- a/bluetooth/1.0/vts/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(LOCAL_PATH)/functional/vts/testcases/hal/bluetooth/hidl/Android.mk
diff --git a/bluetooth/1.0/vts/BluetoothHci.vts b/bluetooth/1.0/vts/BluetoothHci.vts
index 1112371..348c0ab 100644
--- a/bluetooth/1.0/vts/BluetoothHci.vts
+++ b/bluetooth/1.0/vts/BluetoothHci.vts
@@ -6,18 +6,23 @@
import: "android.hardware.bluetooth@1.0::IBluetoothHciCallbacks"
import: "android.hardware.bluetooth@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
api: {
name: "initialize"
- return_type_hidl: {
- type: TYPE_ENUM
- predefined_type: "::android::hardware::bluetooth::V1_0::Status"
- }
arg: {
type: TYPE_HIDL_INTERFACE
- predefined_type: "IBluetoothHciCallbacks"
- is_callback: false
+ predefined_type: "::android::hardware::bluetooth::V1_0::IBluetoothHciCallbacks"
+ }
+ callflow: {
+ entry: true
+ }
+ callflow: {
+ next: "sendHciCommand"
+ next: "sendAclData"
+ next: "sendScoData"
+ next: "close"
}
}
@@ -30,6 +35,12 @@
scalar_type: "uint8_t"
}
}
+ callflow: {
+ next: "sendHciCommand"
+ next: "sendAclData"
+ next: "sendScoData"
+ next: "close"
+ }
}
api: {
@@ -41,6 +52,12 @@
scalar_type: "uint8_t"
}
}
+ callflow: {
+ next: "sendHciCommand"
+ next: "sendAclData"
+ next: "sendScoData"
+ next: "close"
+ }
}
api: {
@@ -52,10 +69,19 @@
scalar_type: "uint8_t"
}
}
+ callflow: {
+ next: "sendHciCommand"
+ next: "sendAclData"
+ next: "sendScoData"
+ next: "close"
+ }
}
api: {
name: "close"
+ callflow: {
+ exit: true
+ }
}
}
diff --git a/bluetooth/1.0/vts/BluetoothHciCallbacks.vts b/bluetooth/1.0/vts/BluetoothHciCallbacks.vts
index f2df5b4..6b3dfd4 100644
--- a/bluetooth/1.0/vts/BluetoothHciCallbacks.vts
+++ b/bluetooth/1.0/vts/BluetoothHciCallbacks.vts
@@ -5,9 +5,18 @@
package: "android.hardware.bluetooth"
import: "android.hardware.bluetooth@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
api: {
+ name: "initializationComplete"
+ arg: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::bluetooth::V1_0::Status"
+ }
+ }
+
+ api: {
name: "hciEventReceived"
arg: {
type: TYPE_VECTOR
diff --git a/bluetooth/1.0/vts/functional/Android.bp b/bluetooth/1.0/vts/functional/Android.bp
index 7d04736..086ac99 100644
--- a/bluetooth/1.0/vts/functional/Android.bp
+++ b/bluetooth/1.0/vts/functional/Android.bp
@@ -31,11 +31,7 @@
],
static_libs: ["libgtest"],
cflags: [
- "--coverage",
"-O0",
"-g",
],
- ldflags: [
- "--coverage",
- ],
}
diff --git a/bluetooth/1.0/vts/functional/bluetooth_hidl_hal_test.cpp b/bluetooth/1.0/vts/functional/bluetooth_hidl_hal_test.cpp
index 683029e..eb1cdc1 100644
--- a/bluetooth/1.0/vts/functional/bluetooth_hidl_hal_test.cpp
+++ b/bluetooth/1.0/vts/functional/bluetooth_hidl_hal_test.cpp
@@ -122,9 +122,9 @@
virtual void SetUp() override {
// currently test passthrough mode only
bluetooth = IBluetoothHci::getService();
+ ASSERT_NE(bluetooth, nullptr);
ALOGW("%s: getService() for bluetooth is %s", __func__,
bluetooth->isRemote() ? "remote" : "local");
- ASSERT_NE(bluetooth, nullptr);
bluetooth_cb = new BluetoothHciCallbacks(*this);
ASSERT_NE(bluetooth_cb, nullptr);
diff --git a/bluetooth/1.0/vts/functional/vts/testcases/hal/bluetooth/hidl/Android.mk b/bluetooth/1.0/vts/functional/vts/testcases/hal/bluetooth/hidl/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/bluetooth/1.0/vts/functional/vts/testcases/hal/bluetooth/hidl/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/bluetooth/1.0/vts/functional/vts/testcases/hal/bluetooth/hidl/target/Android.mk b/bluetooth/1.0/vts/functional/vts/testcases/hal/bluetooth/hidl/target/Android.mk
deleted file mode 100644
index 98bb686..0000000
--- a/bluetooth/1.0/vts/functional/vts/testcases/hal/bluetooth/hidl/target/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := HalBluetoothHidlTargetBasicTest
-VTS_CONFIG_SRC_DIR := testcases/hal/bluetooth/hidl/target
-include test/vts/tools/build/Android.host_config.mk
diff --git a/bluetooth/1.0/vts/functional/vts/testcases/hal/bluetooth/hidl/target/AndroidTest.xml b/bluetooth/1.0/vts/functional/vts/testcases/hal/bluetooth/hidl/target/AndroidTest.xml
deleted file mode 100644
index 54fb89b..0000000
--- a/bluetooth/1.0/vts/functional/vts/testcases/hal/bluetooth/hidl/target/AndroidTest.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<configuration description="Config for VTS Bluetooth HIDL HAL's basic target-side test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="HalBluetoothHidlTargetBasicTest" />
- <option name="binary-test-sources" value="
- _64bit::DATA/nativetest64/bluetooth_hidl_hal_test/bluetooth_hidl_hal_test,
- "/>
- <option name="binary-test-type" value="gtest" />
- <option name="test-timeout" value="1m" />
- </test>
-</configuration>
diff --git a/bluetooth/1.0/vts/functional/vts/testcases/hal/bluetooth/hidl/target_profiling/Android.mk b/bluetooth/1.0/vts/functional/vts/testcases/hal/bluetooth/hidl/target_profiling/Android.mk
deleted file mode 100644
index 81a2db9..0000000
--- a/bluetooth/1.0/vts/functional/vts/testcases/hal/bluetooth/hidl/target_profiling/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-## Copyright (C) 2016 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.
-# #
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := BluetoothHidlTargetProfilingTest
-VTS_CONFIG_SRC_DIR := testcases/hal/bluetooth/hidl/target_profiling
-include test/vts/tools/build/Android.host_config.mk
diff --git a/bluetooth/1.0/vts/functional/vts/testcases/hal/bluetooth/hidl/target_profiling/AndroidTest.xml b/bluetooth/1.0/vts/functional/vts/testcases/hal/bluetooth/hidl/target_profiling/AndroidTest.xml
deleted file mode 100644
index 8052b3c..0000000
--- a/bluetooth/1.0/vts/functional/vts/testcases/hal/bluetooth/hidl/target_profiling/AndroidTest.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<configuration description="Config for VTS Bluetooth HIDL HAL's target-side profiling test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="BluetoothHidlTargetProfilingTest" />
- <option name="binary-test-sources" value="
- _64bit::DATA/nativetest64/bluetooth_hidl_hal_test/bluetooth_hidl_hal_test,
- "/>
- <option name="binary-test-type" value="gtest" />
- <option name="test-timeout" value="1m" />
- <option name="enable-profiling" value="true" />
- </test>
-</configuration>
diff --git a/boot/1.0/Android.bp b/boot/1.0/Android.bp
index 8e62c89..7265cc2 100644
--- a/boot/1.0/Android.bp
+++ b/boot/1.0/Android.bp
@@ -1,12 +1,19 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
+filegroup {
+ name: "android.hardware.boot@1.0_hal",
+ srcs: [
+ "types.hal",
+ "IBootControl.hal",
+ ],
+}
+
genrule {
name: "android.hardware.boot@1.0_genc++",
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.boot@1.0",
srcs: [
- "types.hal",
- "IBootControl.hal",
+ ":android.hardware.boot@1.0_hal",
],
out: [
"android/hardware/boot/1.0/types.cpp",
@@ -19,8 +26,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.boot@1.0",
srcs: [
- "types.hal",
- "IBootControl.hal",
+ ":android.hardware.boot@1.0_hal",
],
out: [
"android/hardware/boot/1.0/types.h",
@@ -54,106 +60,3 @@
"android.hidl.base@1.0",
],
}
-
-genrule {
- name: "android.hardware.boot.vts.driver@1.0_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.boot@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/boot/1.0/ $(genDir)/android/hardware/boot/1.0/",
- srcs: [
- "types.hal",
- "IBootControl.hal",
- ],
- out: [
- "android/hardware/boot/1.0/types.vts.cpp",
- "android/hardware/boot/1.0/BootControl.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.boot.vts.driver@1.0_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.boot@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/boot/1.0/ $(genDir)/android/hardware/boot/1.0/",
- srcs: [
- "types.hal",
- "IBootControl.hal",
- ],
- out: [
- "android/hardware/boot/1.0/types.vts.h",
- "android/hardware/boot/1.0/BootControl.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.boot.vts.driver@1.0",
- generated_sources: ["android.hardware.boot.vts.driver@1.0_genc++"],
- generated_headers: ["android.hardware.boot.vts.driver@1.0_genc++_headers"],
- export_generated_headers: ["android.hardware.boot.vts.driver@1.0_genc++_headers"],
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libvts_common",
- "libvts_datatype",
- "libvts_measurement",
- "libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
- "android.hidl.base@1.0",
- "android.hardware.boot@1.0",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "android.hidl.base@1.0",
- ],
-}
-
-genrule {
- name: "android.hardware.boot@1.0-IBootControl-vts.profiler_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.boot@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/boot/1.0/ $(genDir)/android/hardware/boot/1.0/",
- srcs: [
- "IBootControl.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/boot/1.0/BootControl.vts.cpp",
- "android/hardware/boot/1.0/types.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.boot@1.0-IBootControl-vts.profiler_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.boot@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/boot/1.0/ $(genDir)/android/hardware/boot/1.0/",
- srcs: [
- "IBootControl.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/boot/1.0/BootControl.vts.h",
- "android/hardware/boot/1.0/types.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.boot@1.0-IBootControl-vts.profiler",
- generated_sources: ["android.hardware.boot@1.0-IBootControl-vts.profiler_genc++"],
- generated_headers: ["android.hardware.boot@1.0-IBootControl-vts.profiler_genc++_headers"],
- export_generated_headers: ["android.hardware.boot@1.0-IBootControl-vts.profiler_genc++_headers"],
- shared_libs: [
- "libbase",
- "libhidlbase",
- "libhidltransport",
- "libvts_profiling",
- "libvts_multidevice_proto",
- "libprotobuf-cpp-full",
- "android.hidl.base@1.0",
- "android.hardware.boot@1.0",
- ],
-}
diff --git a/boot/1.0/Android.mk b/boot/1.0/Android.mk
index 6fa5e4b..b188acb 100644
--- a/boot/1.0/Android.mk
+++ b/boot/1.0/Android.mk
@@ -8,7 +8,7 @@
LOCAL_MODULE := android.hardware.boot@1.0-java
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -83,7 +83,7 @@
LOCAL_MODULE := android.hardware.boot@1.0-java-static
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
diff --git a/boot/1.0/default/Android.mk b/boot/1.0/default/Android.mk
index be67779..99a6cf9 100644
--- a/boot/1.0/default/Android.mk
+++ b/boot/1.0/default/Android.mk
@@ -3,6 +3,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.boot@1.0-impl
LOCAL_MODULE_RELATIVE_PATH := hw
+LOCAL_PROPRIETARY_MODULE := true
LOCAL_SRC_FILES := \
BootControl.cpp \
@@ -19,6 +20,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE_RELATIVE_PATH := hw
+LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE := android.hardware.boot@1.0-service
LOCAL_INIT_RC := android.hardware.boot@1.0-service.rc
LOCAL_SRC_FILES := \
diff --git a/boot/1.0/default/android.hardware.boot@1.0-service.rc b/boot/1.0/default/android.hardware.boot@1.0-service.rc
index 67d400b..ef5dd91 100644
--- a/boot/1.0/default/android.hardware.boot@1.0-service.rc
+++ b/boot/1.0/default/android.hardware.boot@1.0-service.rc
@@ -1,4 +1,4 @@
-service boot-hal-1-0 /system/bin/hw/android.hardware.boot@1.0-service
+service boot-hal-1-0 /vendor/bin/hw/android.hardware.boot@1.0-service
class hal
user root
group root
diff --git a/boot/1.0/vts/BootControl.vts b/boot/1.0/vts/BootControl.vts
index 384ae50..b400f0e 100644
--- a/boot/1.0/vts/BootControl.vts
+++ b/boot/1.0/vts/BootControl.vts
@@ -5,6 +5,7 @@
package: "android.hardware.boot"
import: "android.hardware.boot@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
api: {
diff --git a/boot/1.0/vts/functional/Android.bp b/boot/1.0/vts/functional/Android.bp
index 714a18b..6c28bf1 100644
--- a/boot/1.0/vts/functional/Android.bp
+++ b/boot/1.0/vts/functional/Android.bp
@@ -30,11 +30,7 @@
],
static_libs: ["libgtest"],
cflags: [
- "--coverage",
"-O0",
"-g",
- ],
- ldflags: [
- "--coverage"
]
}
diff --git a/boot/1.0/vts/functional/vts/Android.mk b/boot/1.0/vts/functional/vts/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/boot/1.0/vts/functional/vts/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/boot/1.0/vts/functional/vts/testcases/Android.mk b/boot/1.0/vts/functional/vts/testcases/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/boot/1.0/vts/functional/vts/testcases/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/boot/1.0/vts/functional/vts/testcases/hal/Android.mk b/boot/1.0/vts/functional/vts/testcases/hal/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/boot/1.0/vts/functional/vts/testcases/hal/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/boot/1.0/vts/functional/vts/testcases/hal/boot/Android.mk b/boot/1.0/vts/functional/vts/testcases/hal/boot/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/boot/1.0/vts/functional/vts/testcases/hal/boot/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/boot/1.0/vts/functional/vts/testcases/hal/boot/hidl/Android.mk b/boot/1.0/vts/functional/vts/testcases/hal/boot/hidl/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/boot/1.0/vts/functional/vts/testcases/hal/boot/hidl/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/boot/1.0/vts/functional/vts/testcases/hal/boot/hidl/target/Android.mk b/boot/1.0/vts/functional/vts/testcases/hal/boot/hidl/target/Android.mk
deleted file mode 100644
index 844b93b..0000000
--- a/boot/1.0/vts/functional/vts/testcases/hal/boot/hidl/target/Android.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := HalBootHidlTargetTest
-VTS_CONFIG_SRC_DIR := testcases/hal/boot/hidl/target
-include test/vts/tools/build/Android.host_config.mk
diff --git a/boot/1.0/vts/functional/vts/testcases/hal/boot/hidl/target/AndroidTest.xml b/boot/1.0/vts/functional/vts/testcases/hal/boot/hidl/target/AndroidTest.xml
deleted file mode 100644
index bc759bf..0000000
--- a/boot/1.0/vts/functional/vts/testcases/hal/boot/hidl/target/AndroidTest.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<configuration description="Config for VTS Boot HIDL HAL's target-side test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="HalBootHidlTargetTest"/>
- <option name="binary-test-sources" value="
- _32bit::DATA/nativetest/boot_hidl_hal_test/boot_hidl_hal_test,
- _64bit::DATA/nativetest64/boot_hidl_hal_test/boot_hidl_hal_test,
- "/>
- <option name="test-config-path" value="vts/testcases/hal/boot/hidl/target/HalBootHidlTargetTest.config" />
- <option name="binary-test-type" value="gtest" />
- <option name="test-timeout" value="1m" />
- </test>
-</configuration>
diff --git a/boot/1.0/vts/functional/vts/testcases/hal/boot/hidl/target/HalBootHidlTargetTest.config b/boot/1.0/vts/functional/vts/testcases/hal/boot/hidl/target/HalBootHidlTargetTest.config
deleted file mode 100644
index ebb4d1b..0000000
--- a/boot/1.0/vts/functional/vts/testcases/hal/boot/hidl/target/HalBootHidlTargetTest.config
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "use_gae_db": true,
- "coverage": true,
- "modules": [
- {
- "module_name": "system/lib64/hw/bootctrl.msm8996",
- "git_project": {
- "name": "platform/hardware/qcom/bootctrl",
- "path": "hardware/qcom/bootctrl"
- }
- },
- {
- "module_name": "system/lib64/hw/android.hardware.boot@1.0-impl",
- "git_project": {
- "name": "platform/hardware/interfaces",
- "path": "hardware/interfaces"
- }
- }
- ]
-}
diff --git a/boot/1.0/vts/functional/vts/testcases/hal/boot/hidl/target_profiling/Android.mk b/boot/1.0/vts/functional/vts/testcases/hal/boot/hidl/target_profiling/Android.mk
deleted file mode 100644
index f7414df..0000000
--- a/boot/1.0/vts/functional/vts/testcases/hal/boot/hidl/target_profiling/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := HalBootHidlTargetProfilingTest
-VTS_CONFIG_SRC_DIR := testcases/hal/boot/hidl/target
-include test/vts/tools/build/Android.host_config.mk
diff --git a/boot/1.0/vts/functional/vts/testcases/hal/boot/hidl/target_profiling/AndroidTest.xml b/boot/1.0/vts/functional/vts/testcases/hal/boot/hidl/target_profiling/AndroidTest.xml
deleted file mode 100644
index dbc6300..0000000
--- a/boot/1.0/vts/functional/vts/testcases/hal/boot/hidl/target_profiling/AndroidTest.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<configuration description="Config for VTS Boot HIDL HAL's target-side test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="HalBootHidlTargetProfilingTest"/>
- <option name="binary-test-sources" value="
- _32bit::DATA/nativetest/boot_hidl_hal_test/boot_hidl_hal_test,
- _64bit::DATA/nativetest64/boot_hidl_hal_test/boot_hidl_hal_test,
- "/>
- <option name="binary-test-type" value="gtest" />
- <option name="test-timeout" value="5m" />
- <option name="enable-profiling" value="true" />
- </test>
-</configuration>
diff --git a/broadcastradio/1.0/Android.bp b/broadcastradio/1.0/Android.bp
index cf44add..3c3a015 100644
--- a/broadcastradio/1.0/Android.bp
+++ b/broadcastradio/1.0/Android.bp
@@ -1,9 +1,7 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
-genrule {
- name: "android.hardware.broadcastradio@1.0_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.broadcastradio@1.0",
+filegroup {
+ name: "android.hardware.broadcastradio@1.0_hal",
srcs: [
"types.hal",
"IBroadcastRadio.hal",
@@ -11,6 +9,15 @@
"ITuner.hal",
"ITunerCallback.hal",
],
+}
+
+genrule {
+ name: "android.hardware.broadcastradio@1.0_genc++",
+ tools: ["hidl-gen"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.broadcastradio@1.0",
+ srcs: [
+ ":android.hardware.broadcastradio@1.0_hal",
+ ],
out: [
"android/hardware/broadcastradio/1.0/types.cpp",
"android/hardware/broadcastradio/1.0/BroadcastRadioAll.cpp",
@@ -25,11 +32,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.broadcastradio@1.0",
srcs: [
- "types.hal",
- "IBroadcastRadio.hal",
- "IBroadcastRadioFactory.hal",
- "ITuner.hal",
- "ITunerCallback.hal",
+ ":android.hardware.broadcastradio@1.0_hal",
],
out: [
"android/hardware/broadcastradio/1.0/types.h",
diff --git a/broadcastradio/1.0/default/Android.mk b/broadcastradio/1.0/default/Android.mk
index 734a0e1..569291e 100644
--- a/broadcastradio/1.0/default/Android.mk
+++ b/broadcastradio/1.0/default/Android.mk
@@ -2,6 +2,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.broadcastradio@1.0-impl
+LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_SRC_FILES := \
BroadcastRadio.cpp \
diff --git a/broadcastradio/1.0/vts/functional/Android.mk b/broadcastradio/1.0/vts/functional/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/broadcastradio/1.0/vts/functional/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/broadcastradio/1.0/vts/functional/vts/Android.mk b/broadcastradio/1.0/vts/functional/vts/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/broadcastradio/1.0/vts/functional/vts/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/broadcastradio/1.0/vts/functional/vts/testcases/Android.mk b/broadcastradio/1.0/vts/functional/vts/testcases/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/broadcastradio/1.0/vts/functional/vts/testcases/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/broadcastradio/1.0/vts/functional/vts/testcases/hal/Android.mk b/broadcastradio/1.0/vts/functional/vts/testcases/hal/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/broadcastradio/1.0/vts/functional/vts/testcases/hal/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/broadcastradio/1.0/vts/functional/vts/testcases/hal/broadcastradio/Android.mk b/broadcastradio/1.0/vts/functional/vts/testcases/hal/broadcastradio/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/broadcastradio/1.0/vts/functional/vts/testcases/hal/broadcastradio/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/broadcastradio/1.0/vts/functional/vts/testcases/hal/broadcastradio/hidl/Android.mk b/broadcastradio/1.0/vts/functional/vts/testcases/hal/broadcastradio/hidl/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/broadcastradio/1.0/vts/functional/vts/testcases/hal/broadcastradio/hidl/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/broadcastradio/1.0/vts/functional/vts/testcases/hal/broadcastradio/hidl/target/Android.mk b/broadcastradio/1.0/vts/functional/vts/testcases/hal/broadcastradio/hidl/target/Android.mk
deleted file mode 100644
index 153dcd6..0000000
--- a/broadcastradio/1.0/vts/functional/vts/testcases/hal/broadcastradio/hidl/target/Android.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := HalBroadcastRadioHidlTargetBasicTest
-VTS_CONFIG_SRC_DIR := testcases/hal/broadcastradio/hidl/target
-include test/vts/tools/build/Android.host_config.mk
diff --git a/broadcastradio/1.0/vts/functional/vts/testcases/hal/broadcastradio/hidl/target/AndroidTest.xml b/broadcastradio/1.0/vts/functional/vts/testcases/hal/broadcastradio/hidl/target/AndroidTest.xml
deleted file mode 100644
index 4c03855..0000000
--- a/broadcastradio/1.0/vts/functional/vts/testcases/hal/broadcastradio/hidl/target/AndroidTest.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<configuration description="Config for VTS broadcast radio HIDL HAL's basic target-side test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="HalBroadcastRadioHidlTargetBasicTest" />
- <option name="binary-test-sources" value="
- _32bit::DATA/nativetest/broadcastradio_hidl_hal_test/broadcastradio_hidl_hal_test,
- _64bit::DATA/nativetest64/broadcastradio_hidl_hal_test/broadcastradio_hidl_hal_test,
- "/>
- <option name="binary-test-type" value="gtest" />
- <option name="test-timeout" value="5m" />
- </test>
-</configuration>
diff --git a/camera/common/1.0/Android.bp b/camera/common/1.0/Android.bp
index 49098c4..aea6e76 100644
--- a/camera/common/1.0/Android.bp
+++ b/camera/common/1.0/Android.bp
@@ -1,11 +1,18 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
+filegroup {
+ name: "android.hardware.camera.common@1.0_hal",
+ srcs: [
+ "types.hal",
+ ],
+}
+
genrule {
name: "android.hardware.camera.common@1.0_genc++",
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.common@1.0",
srcs: [
- "types.hal",
+ ":android.hardware.camera.common@1.0_hal",
],
out: [
"android/hardware/camera/common/1.0/types.cpp",
@@ -17,7 +24,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.common@1.0",
srcs: [
- "types.hal",
+ ":android.hardware.camera.common@1.0_hal",
],
out: [
"android/hardware/camera/common/1.0/types.h",
diff --git a/camera/common/1.0/Android.mk b/camera/common/1.0/Android.mk
index 2e68dc0..9e05172 100644
--- a/camera/common/1.0/Android.mk
+++ b/camera/common/1.0/Android.mk
@@ -8,7 +8,7 @@
LOCAL_MODULE := android.hardware.camera.common@1.0-java
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -191,7 +191,7 @@
LOCAL_MODULE := android.hardware.camera.common@1.0-java-static
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
diff --git a/camera/device/1.0/Android.bp b/camera/device/1.0/Android.bp
index 9a6941a..b8560c7 100644
--- a/camera/device/1.0/Android.bp
+++ b/camera/device/1.0/Android.bp
@@ -1,15 +1,22 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
-genrule {
- name: "android.hardware.camera.device@1.0_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@1.0",
+filegroup {
+ name: "android.hardware.camera.device@1.0_hal",
srcs: [
"types.hal",
"ICameraDevice.hal",
"ICameraDeviceCallback.hal",
"ICameraDevicePreviewCallback.hal",
],
+}
+
+genrule {
+ name: "android.hardware.camera.device@1.0_genc++",
+ tools: ["hidl-gen"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@1.0",
+ srcs: [
+ ":android.hardware.camera.device@1.0_hal",
+ ],
out: [
"android/hardware/camera/device/1.0/types.cpp",
"android/hardware/camera/device/1.0/CameraDeviceAll.cpp",
@@ -23,10 +30,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@1.0",
srcs: [
- "types.hal",
- "ICameraDevice.hal",
- "ICameraDeviceCallback.hal",
- "ICameraDevicePreviewCallback.hal",
+ ":android.hardware.camera.device@1.0_hal",
],
out: [
"android/hardware/camera/device/1.0/types.h",
diff --git a/camera/device/3.2/Android.bp b/camera/device/3.2/Android.bp
index 8b72d5b..a3ac721 100644
--- a/camera/device/3.2/Android.bp
+++ b/camera/device/3.2/Android.bp
@@ -1,15 +1,22 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
-genrule {
- name: "android.hardware.camera.device@3.2_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@3.2",
+filegroup {
+ name: "android.hardware.camera.device@3.2_hal",
srcs: [
"types.hal",
"ICameraDevice.hal",
"ICameraDeviceCallback.hal",
"ICameraDeviceSession.hal",
],
+}
+
+genrule {
+ name: "android.hardware.camera.device@3.2_genc++",
+ tools: ["hidl-gen"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@3.2",
+ srcs: [
+ ":android.hardware.camera.device@3.2_hal",
+ ],
out: [
"android/hardware/camera/device/3.2/types.cpp",
"android/hardware/camera/device/3.2/CameraDeviceAll.cpp",
@@ -23,10 +30,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@3.2",
srcs: [
- "types.hal",
- "ICameraDevice.hal",
- "ICameraDeviceCallback.hal",
- "ICameraDeviceSession.hal",
+ ":android.hardware.camera.device@3.2_hal",
],
out: [
"android/hardware/camera/device/3.2/types.h",
diff --git a/camera/device/3.2/default/Android.bp b/camera/device/3.2/default/Android.bp
index 40d4253..62e3c3e 100644
--- a/camera/device/3.2/default/Android.bp
+++ b/camera/device/3.2/default/Android.bp
@@ -1,5 +1,5 @@
cc_library_shared {
- name: "android.hardware.camera.device@3.2-impl",
+ name: "camera.device@3.2-impl",
srcs: ["CameraDevice.cpp",
"CameraDeviceSession.cpp",
"convert.cpp"],
@@ -20,27 +20,3 @@
],
export_include_dirs: ["."]
}
-
-cc_library_shared {
- name: "android.hardware.camera.device@3.2-impl-binderized",
- srcs: ["CameraDevice.cpp",
- "CameraDeviceSession.cpp",
- "convert.cpp"],
- cppflags: ["-DBINDERIZED"],
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "libcutils",
- "android.hardware.camera.device@3.2",
- "android.hardware.camera.provider@2.4",
- "liblog",
- "libhardware",
- "libcamera_metadata"
- ],
- static_libs: [
- "android.hardware.camera.common@1.0-helper"
- ],
- export_include_dirs: ["."]
-}
diff --git a/camera/device/3.2/default/CameraDeviceSession.cpp b/camera/device/3.2/default/CameraDeviceSession.cpp
index 26b7b73..0f3d97b 100644
--- a/camera/device/3.2/default/CameraDeviceSession.cpp
+++ b/camera/device/3.2/default/CameraDeviceSession.cpp
@@ -118,9 +118,6 @@
private:
bool mInitialized;
- // Some existing gralloc drivers do not support retaining more than once,
- // when we are in passthrough mode.
-#ifdef BINDERIZED
bool openGralloc()
{
const hw_module_t* module;
@@ -197,9 +194,9 @@
mRelease(mDevice, handle);
} else {
mModule->unregisterBuffer(mModule, handle);
- native_handle_close(handle);
- native_handle_delete(const_cast<native_handle_t*>(handle));
}
+ native_handle_close(handle);
+ native_handle_delete(const_cast<native_handle_t*>(handle));
}
// gralloc1
@@ -209,12 +206,6 @@
// gralloc0
const gralloc_module_t* mModule;
-#else
- bool openGralloc() { return true; }
- void closeGralloc() {}
- buffer_handle_t cloneBuffer(buffer_handle_t handle) { return handle; }
- void releaseBuffer(buffer_handle_t) {}
-#endif
};
HandleImporter sHandleImporter;
@@ -408,48 +399,53 @@
return Void();
}
+ if (status != Status::OK) {
+ _hidl_cb(status, outStreams);
+ return Void();
+ }
+ camera3_stream_configuration_t stream_list;
+ hidl_vec<camera3_stream_t*> streams;
- if (status == Status::OK) {
- camera3_stream_configuration_t stream_list;
- hidl_vec<camera3_stream_t*> streams;
+ stream_list.operation_mode = (uint32_t) requestedConfiguration.operationMode;
+ stream_list.num_streams = requestedConfiguration.streams.size();
+ streams.resize(stream_list.num_streams);
+ stream_list.streams = streams.data();
- stream_list.operation_mode = (uint32_t) requestedConfiguration.operationMode;
- stream_list.num_streams = requestedConfiguration.streams.size();
- streams.resize(stream_list.num_streams);
- stream_list.streams = streams.data();
+ for (uint32_t i = 0; i < stream_list.num_streams; i++) {
+ int id = requestedConfiguration.streams[i].id;
- for (uint32_t i = 0; i < stream_list.num_streams; i++) {
- int id = requestedConfiguration.streams[i].id;
-
- if (mStreamMap.count(id) == 0) {
- Camera3Stream stream;
- convertFromHidl(requestedConfiguration.streams[i], &stream);
- mStreamMap[id] = stream;
- mCirculatingBuffers.emplace(stream.mId, CirculatingBuffers{});
- } else {
- // width/height/format must not change, but usage/rotation might need to change
- if (mStreamMap[id].stream_type !=
- (int) requestedConfiguration.streams[i].streamType ||
- mStreamMap[id].width != requestedConfiguration.streams[i].width ||
- mStreamMap[id].height != requestedConfiguration.streams[i].height ||
- mStreamMap[id].format != (int) requestedConfiguration.streams[i].format ||
- mStreamMap[id].data_space != (android_dataspace_t)
- requestedConfiguration.streams[i].dataSpace) {
- ALOGE("%s: stream %d configuration changed!", __FUNCTION__, id);
- _hidl_cb(Status::INTERNAL_ERROR, outStreams);
- return Void();
- }
- mStreamMap[id].rotation = (int) requestedConfiguration.streams[i].rotation;
- mStreamMap[id].usage = (uint32_t) requestedConfiguration.streams[i].usage;
+ if (mStreamMap.count(id) == 0) {
+ Camera3Stream stream;
+ convertFromHidl(requestedConfiguration.streams[i], &stream);
+ mStreamMap[id] = stream;
+ mCirculatingBuffers.emplace(stream.mId, CirculatingBuffers{});
+ } else {
+ // width/height/format must not change, but usage/rotation might need to change
+ if (mStreamMap[id].stream_type !=
+ (int) requestedConfiguration.streams[i].streamType ||
+ mStreamMap[id].width != requestedConfiguration.streams[i].width ||
+ mStreamMap[id].height != requestedConfiguration.streams[i].height ||
+ mStreamMap[id].format != (int) requestedConfiguration.streams[i].format ||
+ mStreamMap[id].data_space != (android_dataspace_t)
+ requestedConfiguration.streams[i].dataSpace) {
+ ALOGE("%s: stream %d configuration changed!", __FUNCTION__, id);
+ _hidl_cb(Status::INTERNAL_ERROR, outStreams);
+ return Void();
}
- streams[i] = &mStreamMap[id];
+ mStreamMap[id].rotation = (int) requestedConfiguration.streams[i].rotation;
+ mStreamMap[id].usage = (uint32_t) requestedConfiguration.streams[i].usage;
}
+ streams[i] = &mStreamMap[id];
+ }
- ATRACE_BEGIN("camera3->configure_streams");
- status_t ret = mDevice->ops->configure_streams(mDevice, &stream_list);
- ATRACE_END();
+ ATRACE_BEGIN("camera3->configure_streams");
+ status_t ret = mDevice->ops->configure_streams(mDevice, &stream_list);
+ ATRACE_END();
+ // In case Hal returns error most likely it was not able to release
+ // the corresponding resources of the deleted streams.
+ if (ret == OK) {
// delete unused streams, note we do this after adding new streams to ensure new stream
// will not have the same address as deleted stream, and HAL has a chance to reference
// the to be deleted stream in configure_streams call
@@ -464,30 +460,37 @@
}
if (!found) {
// Unmap all buffers of deleted stream
- for (auto& pair : mCirculatingBuffers.at(id)) {
- sHandleImporter.freeBuffer(pair.second);
- }
- mCirculatingBuffers[id].clear();
- mCirculatingBuffers.erase(id);
+ // in case the configuration call succeeds and HAL
+ // is able to release the corresponding resources too.
+ cleanupBuffersLocked(id);
it = mStreamMap.erase(it);
} else {
++it;
}
}
-
- if (ret == -EINVAL) {
- status = Status::ILLEGAL_ARGUMENT;
- } else if (ret != OK) {
- status = Status::INTERNAL_ERROR;
- } else {
- convertToHidl(stream_list, &outStreams);
- }
-
}
+
+ if (ret == -EINVAL) {
+ status = Status::ILLEGAL_ARGUMENT;
+ } else if (ret != OK) {
+ status = Status::INTERNAL_ERROR;
+ } else {
+ convertToHidl(stream_list, &outStreams);
+ }
+
_hidl_cb(status, outStreams);
return Void();
}
+// Needs to get called after acquiring 'mInflightLock'
+void CameraDeviceSession::cleanupBuffersLocked(int id) {
+ for (auto& pair : mCirculatingBuffers.at(id)) {
+ sHandleImporter.freeBuffer(pair.second);
+ }
+ mCirculatingBuffers[id].clear();
+ mCirculatingBuffers.erase(id);
+}
+
Return<Status> CameraDeviceSession::processCaptureRequest(const CaptureRequest& request) {
Status status = initStatus();
if (status != Status::OK) {
diff --git a/camera/device/3.2/default/CameraDeviceSession.h b/camera/device/3.2/default/CameraDeviceSession.h
index ca9d24d..f8689d3 100644
--- a/camera/device/3.2/default/CameraDeviceSession.h
+++ b/camera/device/3.2/default/CameraDeviceSession.h
@@ -123,6 +123,8 @@
static void cleanupInflightFences(
hidl_vec<int>& allFences, size_t numFences);
+ void cleanupBuffersLocked(int id);
+
/**
* Static callback forwarding methods from HAL to instance
*/
diff --git a/camera/metadata/3.2/Android.bp b/camera/metadata/3.2/Android.bp
index 2625026..1e464d6 100644
--- a/camera/metadata/3.2/Android.bp
+++ b/camera/metadata/3.2/Android.bp
@@ -1,11 +1,18 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
+filegroup {
+ name: "android.hardware.camera.metadata@3.2_hal",
+ srcs: [
+ "types.hal",
+ ],
+}
+
genrule {
name: "android.hardware.camera.metadata@3.2_genc++",
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.metadata@3.2",
srcs: [
- "types.hal",
+ ":android.hardware.camera.metadata@3.2_hal",
],
out: [
"android/hardware/camera/metadata/3.2/types.cpp",
@@ -17,7 +24,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.metadata@3.2",
srcs: [
- "types.hal",
+ ":android.hardware.camera.metadata@3.2_hal",
],
out: [
"android/hardware/camera/metadata/3.2/types.h",
diff --git a/camera/metadata/3.2/Android.mk b/camera/metadata/3.2/Android.mk
index 083fb6b..86cee91 100644
--- a/camera/metadata/3.2/Android.mk
+++ b/camera/metadata/3.2/Android.mk
@@ -8,7 +8,7 @@
LOCAL_MODULE := android.hardware.camera.metadata@3.2-java
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -355,6 +355,25 @@
LOCAL_GENERATED_SOURCES += $(GEN)
#
+# Build types.hal (CameraMetadataEnumAndroidControlEnableZsl)
+#
+GEN := $(intermediates)/android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidControlEnableZsl.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
+ android.hardware.camera.metadata@3.2::types.CameraMetadataEnumAndroidControlEnableZsl
+
+$(GEN): $(LOCAL_PATH)/types.hal
+ $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+
+#
# Build types.hal (CameraMetadataEnumAndroidControlMode)
#
GEN := $(intermediates)/android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidControlMode.java
@@ -1217,7 +1236,7 @@
LOCAL_MODULE := android.hardware.camera.metadata@3.2-java-static
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -1564,6 +1583,25 @@
LOCAL_GENERATED_SOURCES += $(GEN)
#
+# Build types.hal (CameraMetadataEnumAndroidControlEnableZsl)
+#
+GEN := $(intermediates)/android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidControlEnableZsl.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
+ android.hardware.camera.metadata@3.2::types.CameraMetadataEnumAndroidControlEnableZsl
+
+$(GEN): $(LOCAL_PATH)/types.hal
+ $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+
+#
# Build types.hal (CameraMetadataEnumAndroidControlMode)
#
GEN := $(intermediates)/android/hardware/camera/metadata/V3_2/CameraMetadataEnumAndroidControlMode.java
diff --git a/camera/provider/2.4/Android.bp b/camera/provider/2.4/Android.bp
index f5f10de..3369a3c 100644
--- a/camera/provider/2.4/Android.bp
+++ b/camera/provider/2.4/Android.bp
@@ -1,12 +1,19 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
+filegroup {
+ name: "android.hardware.camera.provider@2.4_hal",
+ srcs: [
+ "ICameraProvider.hal",
+ "ICameraProviderCallback.hal",
+ ],
+}
+
genrule {
name: "android.hardware.camera.provider@2.4_genc++",
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.provider@2.4",
srcs: [
- "ICameraProvider.hal",
- "ICameraProviderCallback.hal",
+ ":android.hardware.camera.provider@2.4_hal",
],
out: [
"android/hardware/camera/provider/2.4/CameraProviderAll.cpp",
@@ -19,8 +26,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.provider@2.4",
srcs: [
- "ICameraProvider.hal",
- "ICameraProviderCallback.hal",
+ ":android.hardware.camera.provider@2.4_hal",
],
out: [
"android/hardware/camera/provider/2.4/ICameraProvider.h",
diff --git a/camera/provider/2.4/default/Android.bp b/camera/provider/2.4/default/Android.bp
index ee40ce5..e0ae12f 100644
--- a/camera/provider/2.4/default/Android.bp
+++ b/camera/provider/2.4/default/Android.bp
@@ -1,5 +1,6 @@
cc_library_shared {
name: "android.hardware.camera.provider@2.4-impl",
+ proprietary: true,
relative_install_path: "hw",
srcs: ["CameraProvider.cpp"],
shared_libs: [
@@ -10,7 +11,7 @@
"libcutils",
"android.hardware.camera.device@1.0",
"android.hardware.camera.device@3.2",
- "android.hardware.camera.device@3.2-impl",
+ "camera.device@3.2-impl",
"android.hardware.camera.provider@2.4",
"android.hardware.camera.common@1.0",
"liblog",
@@ -24,8 +25,9 @@
cc_binary {
name: "android.hardware.camera.provider@2.4-service",
+ proprietary: true,
relative_install_path: "hw",
- srcs: ["service.cpp", "CameraProvider.cpp"],
+ srcs: ["service.cpp"],
compile_multilib: "32",
init_rc: ["android.hardware.camera.provider@2.4-service.rc"],
shared_libs: [
@@ -40,7 +42,6 @@
"android.hardware.camera.provider@2.4",
"android.hardware.camera.common@1.0",
"libcutils",
- "android.hardware.camera.device@3.2-impl-binderized",
"libcamera_metadata"
],
static_libs: [
diff --git a/camera/provider/2.4/default/CameraProvider.cpp b/camera/provider/2.4/default/CameraProvider.cpp
index f1a66a8..5714f83 100644
--- a/camera/provider/2.4/default/CameraProvider.cpp
+++ b/camera/provider/2.4/default/CameraProvider.cpp
@@ -51,8 +51,7 @@
const struct camera_module_callbacks* callbacks,
int camera_id,
int new_status) {
- ALOGI("%s++", __FUNCTION__);
- sp<CameraProvider> cp = const_cast<CameraProvider*>(
+ CameraProvider* cp = const_cast<CameraProvider*>(
static_cast<const CameraProvider*>(callbacks));
if (cp == nullptr) {
@@ -60,7 +59,7 @@
return;
}
- ALOGI("%s resolved provider %p", __FUNCTION__, cp.get());
+ ALOGI("%s resolved provider %p", __FUNCTION__, cp);
Mutex::Autolock _l(cp->mCbLock);
char cameraId[kMaxCameraIdLen];
@@ -76,15 +75,13 @@
}
}
}
- ALOGI("%s--", __FUNCTION__);
}
void CameraProvider::sTorchModeStatusChange(
const struct camera_module_callbacks* callbacks,
const char* camera_id,
int new_status) {
- ALOGI("%s++", __FUNCTION__);
- sp<CameraProvider> cp = const_cast<CameraProvider*>(
+ CameraProvider* cp = const_cast<CameraProvider*>(
static_cast<const CameraProvider*>(callbacks));
if (cp == nullptr) {
@@ -92,7 +89,7 @@
return;
}
- ALOGI("%s resolved provider %p", __FUNCTION__, cp.get());
+ ALOGI("%s resolved provider %p", __FUNCTION__, cp);
Mutex::Autolock _l(cp->mCbLock);
if (cp->mCallbacks != nullptr) {
@@ -105,7 +102,6 @@
}
}
}
- ALOGI("%s--", __FUNCTION__);
}
Status CameraProvider::getHidlStatus(int status) {
@@ -234,8 +230,10 @@
// Setup vendor tags here so HAL can setup vendor keys in camera characteristics
VendorTagDescriptor::clearGlobalVendorTagDescriptor();
- bool setupSucceed = setUpVendorTags();
- return !setupSucceed; // return flag here is mInitFailed
+ if (!setUpVendorTags()) {
+ ALOGE("%s: Vendor tag setup failed, will not be available.", __FUNCTION__);
+ }
+ return false; // mInitFailed
}
bool CameraProvider::setUpVendorTags() {
@@ -245,7 +243,7 @@
// Check if vendor operations have been implemented
if (!mModule->isVendorTagDefined()) {
ALOGI("%s: No vendor tags defined for this device.", __FUNCTION__);
- return false;
+ return true;
}
mModule->getVendorTagOps(&vOps);
diff --git a/camera/provider/2.4/default/android.hardware.camera.provider@2.4-service.rc b/camera/provider/2.4/default/android.hardware.camera.provider@2.4-service.rc
index 31f0810..192870b 100644
--- a/camera/provider/2.4/default/android.hardware.camera.provider@2.4-service.rc
+++ b/camera/provider/2.4/default/android.hardware.camera.provider@2.4-service.rc
@@ -1,4 +1,4 @@
-service camera-provider-2-4 /system/bin/hw/android.hardware.camera.provider@2.4-service
+service camera-provider-2-4 /vendor/bin/hw/android.hardware.camera.provider@2.4-service
class hal
user cameraserver
group audio camera input drmrpc
diff --git a/camera/provider/2.4/default/service.cpp b/camera/provider/2.4/default/service.cpp
index 9600559..cf66e04 100644
--- a/camera/provider/2.4/default/service.cpp
+++ b/camera/provider/2.4/default/service.cpp
@@ -17,41 +17,13 @@
#define LOG_TAG "android.hardware.camera.provider@2.4-service"
#include <android/hardware/camera/provider/2.4/ICameraProvider.h>
-#include <CameraProvider.h>
-
-#include <hidl/HidlTransportSupport.h>
#include <hidl/LegacySupport.h>
-#include <utils/StrongPointer.h>
-using android::hardware::configureRpcThreadpool;
-using android::hardware::joinRpcThreadpool;
-using android::sp;
using android::hardware::camera::provider::V2_4::ICameraProvider;
-using android::hardware::camera::provider::V2_4::implementation::HIDL_FETCH_ICameraProvider;
+using android::hardware::defaultPassthroughServiceImplementation;
int main()
{
- const char instance[] = "legacy/0";
-
- // TODO(b/34817742): use defaultServicePassthroughImplementation
- // so that the toggle is implemented correctly
- using ::android::hardware::details::blockIfBinderizationDisabled;
- blockIfBinderizationDisabled(ICameraProvider::descriptor, instance);
-
ALOGI("Camera provider Service is starting.");
-
- configureRpcThreadpool(1, true /* callerWillJoin */);
- // TODO (b/34510650): check the passthrough/binderized dev key
- sp<ICameraProvider> service = HIDL_FETCH_ICameraProvider(instance);
- if (service == nullptr) {
- ALOGI("Camera provider getService returned NULL");
- return -1;
- }
-
- LOG_FATAL_IF(service->isRemote(), "Camera provider service is REMOTE!");
-
- service->registerAsService(instance);
- joinRpcThreadpool();
-
- return 0;
+ return defaultPassthroughServiceImplementation<ICameraProvider>("legacy/0");
}
\ No newline at end of file
diff --git a/configstore/1.0/Android.bp b/configstore/1.0/Android.bp
index 06fcbd9..c2cd54a 100644
--- a/configstore/1.0/Android.bp
+++ b/configstore/1.0/Android.bp
@@ -1,12 +1,19 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
+filegroup {
+ name: "android.hardware.configstore@1.0_hal",
+ srcs: [
+ "types.hal",
+ "ISurfaceFlingerConfigs.hal",
+ ],
+}
+
genrule {
name: "android.hardware.configstore@1.0_genc++",
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.configstore@1.0",
srcs: [
- "types.hal",
- "ISurfaceFlingerConfigs.hal",
+ ":android.hardware.configstore@1.0_hal",
],
out: [
"android/hardware/configstore/1.0/types.cpp",
@@ -19,8 +26,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.configstore@1.0",
srcs: [
- "types.hal",
- "ISurfaceFlingerConfigs.hal",
+ ":android.hardware.configstore@1.0_hal",
],
out: [
"android/hardware/configstore/1.0/types.h",
diff --git a/configstore/1.0/Android.mk b/configstore/1.0/Android.mk
index fd2718e..010d509 100644
--- a/configstore/1.0/Android.mk
+++ b/configstore/1.0/Android.mk
@@ -8,7 +8,7 @@
LOCAL_MODULE := android.hardware.configstore@1.0-java
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -159,7 +159,7 @@
LOCAL_MODULE := android.hardware.configstore@1.0-java-static
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
diff --git a/configstore/1.0/ISurfaceFlingerConfigs.hal b/configstore/1.0/ISurfaceFlingerConfigs.hal
index 97dc915..4403a90 100644
--- a/configstore/1.0/ISurfaceFlingerConfigs.hal
+++ b/configstore/1.0/ISurfaceFlingerConfigs.hal
@@ -17,4 +17,5 @@
interface ISurfaceFlingerConfigs {
vsyncEventPhaseOffsetNs() generates (OptionalInt64 value);
+ useTripleFramebuffer() generates (OptionalBool value);
};
diff --git a/configstore/1.0/default/Android.mk b/configstore/1.0/default/Android.mk
index 5de3451..116126d 100644
--- a/configstore/1.0/default/Android.mk
+++ b/configstore/1.0/default/Android.mk
@@ -3,6 +3,7 @@
################################################################################
include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.configstore@1.0-impl
+LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE_CLASS := SHARED_LIBRARIES
LOCAL_MODULE_RELATIVE_PATH := hw
@@ -22,6 +23,7 @@
################################################################################
include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.configstore@1.0-service
+LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE_CLASS := EXECUTABLES
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_INIT_RC := android.hardware.configstore@1.0-service.rc
diff --git a/configstore/1.0/default/SurfaceFlingerConfigs.cpp b/configstore/1.0/default/SurfaceFlingerConfigs.cpp
index fc75182..5d62b15 100644
--- a/configstore/1.0/default/SurfaceFlingerConfigs.cpp
+++ b/configstore/1.0/default/SurfaceFlingerConfigs.cpp
@@ -19,6 +19,15 @@
return Void();
}
+Return<void> SurfaceFlingerConfigs::useTripleFramebuffer(useTripleFramebuffer_cb _hidl_cb) {
+ bool value = false;
+#ifdef USE_TRIPLE_FRAMEBUFFER
+ value = true;
+#endif
+ _hidl_cb({true, value});
+ LOG(INFO) << "SurfaceFlinger FrameBuffer: " << (value ? "triple" : "double");
+ return Void();
+}
// Methods from ::android::hidl::base::V1_0::IBase follow.
diff --git a/configstore/1.0/default/SurfaceFlingerConfigs.h b/configstore/1.0/default/SurfaceFlingerConfigs.h
index 5c754a0..c9652fc 100644
--- a/configstore/1.0/default/SurfaceFlingerConfigs.h
+++ b/configstore/1.0/default/SurfaceFlingerConfigs.h
@@ -25,6 +25,7 @@
struct SurfaceFlingerConfigs : public ISurfaceFlingerConfigs {
// Methods from ::android::hardware::configstore::V1_0::ISurfaceFlingerConfigs follow.
Return<void> vsyncEventPhaseOffsetNs(vsyncEventPhaseOffsetNs_cb _hidl_cb) override;
+ Return<void> useTripleFramebuffer(useTripleFramebuffer_cb _hidl_cb) override;
// Methods from ::android::hidl::base::V1_0::IBase follow.
diff --git a/configstore/1.0/default/android.hardware.configstore@1.0-service.rc b/configstore/1.0/default/android.hardware.configstore@1.0-service.rc
index 2e303b0..8741bdd 100644
--- a/configstore/1.0/default/android.hardware.configstore@1.0-service.rc
+++ b/configstore/1.0/default/android.hardware.configstore@1.0-service.rc
@@ -1,4 +1,4 @@
-service configstore-hal-1-0 /system/bin/hw/android.hardware.configstore@1.0-service
+service configstore-hal-1-0 /vendor/bin/hw/android.hardware.configstore@1.0-service
class hal
user system
group system
diff --git a/configstore/1.0/default/surfaceflinger.mk b/configstore/1.0/default/surfaceflinger.mk
index 42fa191..5a946f4 100644
--- a/configstore/1.0/default/surfaceflinger.mk
+++ b/configstore/1.0/default/surfaceflinger.mk
@@ -4,3 +4,7 @@
ifneq ($(VSYNC_EVENT_PHASE_OFFSET_NS),)
LOCAL_CFLAGS += -DVSYNC_EVENT_PHASE_OFFSET_NS=$(VSYNC_EVENT_PHASE_OFFSET_NS)
endif
+
+ifeq ($(NUM_FRAMEBUFFER_SURFACE_BUFFERS),3)
+ LOCAL_CFLAGS += -DUSE_TRIPLE_FRAMEBUFFER
+endif
diff --git a/configstore/Android.bp b/configstore/Android.bp
index bbb3e4b..79b63f6 100644
--- a/configstore/Android.bp
+++ b/configstore/Android.bp
@@ -1,4 +1,5 @@
// This is an autogenerated file, do not edit.
subdirs = [
"1.0",
+ "utils",
]
diff --git a/configstore/utils/Android.bp b/configstore/utils/Android.bp
new file mode 100644
index 0000000..32053a7
--- /dev/null
+++ b/configstore/utils/Android.bp
@@ -0,0 +1,28 @@
+//
+// Copyright (C) 2017 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.
+//
+
+cc_library_static {
+ name: "android.hardware.configstore-utils",
+ export_include_dirs: ["include"],
+ srcs: [],
+ shared_libs: [
+ "android.hardware.configstore@1.0",
+ ],
+ export_shared_lib_headers: [
+ "android.hardware.configstore@1.0",
+ ],
+}
+
diff --git a/configstore/utils/include/configstore/Utils.h b/configstore/utils/include/configstore/Utils.h
new file mode 100644
index 0000000..98ccae9
--- /dev/null
+++ b/configstore/utils/include/configstore/Utils.h
@@ -0,0 +1,94 @@
+//
+// Copyright (C) 2017 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.
+//
+
+#ifndef ANDROID_HARDWARE_CONFIGSTORE_UTILS_H
+#define ANDROID_HARDWARE_CONFIGSTORE_UTILS_H
+
+#include <hidl/Status.h>
+#include <stdatomic.h>
+
+namespace android {
+namespace hardware {
+namespace configstore {
+// arguments V: type for the value (i.e., OptionalXXX)
+// I: interface class name
+// func: member function pointer
+using namespace V1_0;
+
+template<typename V, typename I, android::hardware::Return<void> (I::* func)
+ (std::function<void(const V&)>)>
+decltype(V::value) get(const decltype(V::value) &defValue) {
+ auto getHelper = []()->V {
+ V ret;
+ sp<I> configs = I::getService();
+
+ if (!configs.get()) {
+ // fallback to the default value
+ ret.specified = false;
+ } else {
+ (*configs.*func)([&ret](V v) {
+ ret = v;
+ });
+ }
+
+ return ret;
+ };
+ static V cachedValue = getHelper();
+
+ return cachedValue.specified ? cachedValue.value : defValue;
+}
+
+template<typename I, android::hardware::Return<void> (I::* func)
+ (std::function<void(const OptionalBool&)>)>
+bool getBool(const bool defValue) {
+ return get<OptionalBool, I, func>(defValue);
+}
+
+template<typename I, android::hardware::Return<void> (I::* func)
+ (std::function<void(const OptionalInt32&)>)>
+int32_t getInt32(const int32_t defValue) {
+ return get<OptionalInt32, I, func>(defValue);
+}
+
+template<typename I, android::hardware::Return<void> (I::* func)
+ (std::function<void(const OptionalUInt32&)>)>
+uint32_t getUInt32(const uint32_t defValue) {
+ return get<OptionalUInt32, I, func>(defValue);
+}
+
+template<typename I, android::hardware::Return<void> (I::* func)
+ (std::function<void(const OptionalInt64&)>)>
+int64_t getInt64(const int64_t defValue) {
+ return get<OptionalInt64, I, func>(defValue);
+}
+
+template<typename I, android::hardware::Return<void> (I::* func)
+ (std::function<void(const OptionalUInt64&)>)>
+uint64_t getUInt64(const uint64_t defValue) {
+ return get<OptionalUInt64, I, func>(defValue);
+}
+
+template<typename I, android::hardware::Return<void> (I::* func)
+ (std::function<void(const OptionalString&)>)>
+std::string getString(const std::string &defValue) {
+ return get<OptionalString, I, func>(defValue);
+}
+
+} // namespace configstore
+} // namespace hardware
+} // namespace android
+
+#endif // ANDROID_HARDWARE_CONFIGSTORE_UTILS_H
diff --git a/contexthub/1.0/Android.bp b/contexthub/1.0/Android.bp
index 5798306..8cd4acb 100644
--- a/contexthub/1.0/Android.bp
+++ b/contexthub/1.0/Android.bp
@@ -1,13 +1,20 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
+filegroup {
+ name: "android.hardware.contexthub@1.0_hal",
+ srcs: [
+ "types.hal",
+ "IContexthub.hal",
+ "IContexthubCallback.hal",
+ ],
+}
+
genrule {
name: "android.hardware.contexthub@1.0_genc++",
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.contexthub@1.0",
srcs: [
- "types.hal",
- "IContexthub.hal",
- "IContexthubCallback.hal",
+ ":android.hardware.contexthub@1.0_hal",
],
out: [
"android/hardware/contexthub/1.0/types.cpp",
@@ -21,9 +28,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.contexthub@1.0",
srcs: [
- "types.hal",
- "IContexthub.hal",
- "IContexthubCallback.hal",
+ ":android.hardware.contexthub@1.0_hal",
],
out: [
"android/hardware/contexthub/1.0/types.h",
diff --git a/contexthub/1.0/Android.mk b/contexthub/1.0/Android.mk
index c73c5c4..a053986 100644
--- a/contexthub/1.0/Android.mk
+++ b/contexthub/1.0/Android.mk
@@ -8,7 +8,7 @@
LOCAL_MODULE := android.hardware.contexthub@1.0-java
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -334,7 +334,7 @@
LOCAL_MODULE := android.hardware.contexthub@1.0-java-static
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
diff --git a/contexthub/1.0/default/Android.bp b/contexthub/1.0/default/Android.bp
index 7c5f79d..0e1dc77 100644
--- a/contexthub/1.0/default/Android.bp
+++ b/contexthub/1.0/default/Android.bp
@@ -16,6 +16,7 @@
cc_library_shared {
name: "android.hardware.contexthub@1.0-impl",
+ proprietary: true,
relative_install_path: "hw",
srcs: ["Contexthub.cpp"],
shared_libs: [
diff --git a/contexthub/1.0/default/Android.mk b/contexthub/1.0/default/Android.mk
index ad40878..cc36b7f 100644
--- a/contexthub/1.0/default/Android.mk
+++ b/contexthub/1.0/default/Android.mk
@@ -2,6 +2,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE_RELATIVE_PATH := hw
+LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE := android.hardware.contexthub@1.0-service
LOCAL_INIT_RC := android.hardware.contexthub@1.0-service.rc
LOCAL_SRC_FILES := \
diff --git a/contexthub/1.0/default/android.hardware.contexthub@1.0-service.rc b/contexthub/1.0/default/android.hardware.contexthub@1.0-service.rc
index 8dba85f..5677ec2 100644
--- a/contexthub/1.0/default/android.hardware.contexthub@1.0-service.rc
+++ b/contexthub/1.0/default/android.hardware.contexthub@1.0-service.rc
@@ -1,4 +1,4 @@
-service contexthub-hal-1-0 /system/bin/hw/android.hardware.contexthub@1.0-service
+service contexthub-hal-1-0 /vendor/bin/hw/android.hardware.contexthub@1.0-service
class hal
user system
group system
diff --git a/contexthub/1.0/vts/Android.mk b/contexthub/1.0/vts/Android.mk
deleted file mode 100644
index 266884b..0000000
--- a/contexthub/1.0/vts/Android.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Copyright (C) 2017 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-contexthub-vts-path := $(LOCAL_PATH)
-
-include $(contexthub-vts-path)/functional/vts/testcases/hal/contexthub/hidl/target/Android.mk
diff --git a/contexthub/1.0/vts/Contexthub.vts b/contexthub/1.0/vts/Contexthub.vts
index b4e42f5..a5cdc81 100644
--- a/contexthub/1.0/vts/Contexthub.vts
+++ b/contexthub/1.0/vts/Contexthub.vts
@@ -6,6 +6,7 @@
import: "android.hardware.contexthub@1.0::IContexthubCallback"
import: "android.hardware.contexthub@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
api: {
@@ -31,8 +32,7 @@
}
arg: {
type: TYPE_HIDL_CALLBACK
- predefined_type: "IContexthubCallback"
- is_callback: true
+ predefined_type: "::android::hardware::contexthub::V1_0::IContexthubCallback"
}
}
diff --git a/contexthub/1.0/vts/ContexthubCallback.vts b/contexthub/1.0/vts/ContexthubCallback.vts
index c3784e8..59ff2fe 100644
--- a/contexthub/1.0/vts/ContexthubCallback.vts
+++ b/contexthub/1.0/vts/ContexthubCallback.vts
@@ -5,6 +5,7 @@
package: "android.hardware.contexthub"
import: "android.hardware.contexthub@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
api: {
diff --git a/contexthub/1.0/vts/functional/Android.bp b/contexthub/1.0/vts/functional/Android.bp
index e78898e..1c011a0 100644
--- a/contexthub/1.0/vts/functional/Android.bp
+++ b/contexthub/1.0/vts/functional/Android.bp
@@ -27,12 +27,8 @@
],
static_libs: ["libgtest"],
cflags: [
- "--coverage",
"-O0",
"-g",
- ],
- ldflags: [
- "--coverage",
- ],
+ ]
}
diff --git a/contexthub/1.0/vts/functional/vts/testcases/hal/contexthub/hidl/target/Android.mk b/contexthub/1.0/vts/functional/vts/testcases/hal/contexthub/hidl/target/Android.mk
deleted file mode 100644
index a46a0e6..0000000
--- a/contexthub/1.0/vts/functional/vts/testcases/hal/contexthub/hidl/target/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2017 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := ContexthubHidlTargetTest
-VTS_CONFIG_SRC_DIR := testcases/hal/contexthub/hidl/target
-include test/vts/tools/build/Android.host_config.mk
diff --git a/contexthub/1.0/vts/functional/vts/testcases/hal/contexthub/hidl/target/AndroidTest.xml b/contexthub/1.0/vts/functional/vts/testcases/hal/contexthub/hidl/target/AndroidTest.xml
deleted file mode 100644
index a314d1b..0000000
--- a/contexthub/1.0/vts/functional/vts/testcases/hal/contexthub/hidl/target/AndroidTest.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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.
--->
-<configuration description="Config for VTS Context Hub HIDL HAL's target-side test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="ContexthubHidlTargetTest" />
- <option name="binary-test-sources" value="
- _32bit::DATA/nativetest/contexthub_hidl_hal_test/contexthub_hidl_hal_test,
- _64bit::DATA/nativetest64/contexthub_hidl_hal_test/contexthub_hidl_hal_test,
- "/>
- <option name="binary-test-type" value="gtest" />
- <option name="binary-test-disable-framework" value="true" />
- <option name="test-timeout" value="10m" />
- </test>
-</configuration>
-
diff --git a/contexthub/1.0/vts/types.vts b/contexthub/1.0/vts/types.vts
index 12576b1..4f5dfcf 100644
--- a/contexthub/1.0/vts/types.vts
+++ b/contexthub/1.0/vts/types.vts
@@ -71,6 +71,7 @@
struct_value: {
name: "flags"
type: TYPE_MASK
+ scalar_type: "uint32_t"
predefined_type: "::android::hardware::contexthub::V1_0::NanoAppFlags"
}
struct_value: {
@@ -411,6 +412,7 @@
struct_value: {
name: "flags"
type: TYPE_MASK
+ scalar_type: "uint32_t"
predefined_type: "::android::hardware::contexthub::V1_0::HubMemoryFlag"
}
}
diff --git a/drm/1.0/Android.bp b/drm/1.0/Android.bp
index 3c9f22b..0241984 100644
--- a/drm/1.0/Android.bp
+++ b/drm/1.0/Android.bp
@@ -1,9 +1,7 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
-genrule {
- name: "android.hardware.drm@1.0_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.drm@1.0",
+filegroup {
+ name: "android.hardware.drm@1.0_hal",
srcs: [
"types.hal",
"ICryptoFactory.hal",
@@ -12,6 +10,15 @@
"IDrmPlugin.hal",
"IDrmPluginListener.hal",
],
+}
+
+genrule {
+ name: "android.hardware.drm@1.0_genc++",
+ tools: ["hidl-gen"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.drm@1.0",
+ srcs: [
+ ":android.hardware.drm@1.0_hal",
+ ],
out: [
"android/hardware/drm/1.0/types.cpp",
"android/hardware/drm/1.0/CryptoFactoryAll.cpp",
@@ -27,12 +34,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.drm@1.0",
srcs: [
- "types.hal",
- "ICryptoFactory.hal",
- "ICryptoPlugin.hal",
- "IDrmFactory.hal",
- "IDrmPlugin.hal",
- "IDrmPluginListener.hal",
+ ":android.hardware.drm@1.0_hal",
],
out: [
"android/hardware/drm/1.0/types.h",
@@ -86,302 +88,3 @@
"android.hidl.base@1.0",
],
}
-
-genrule {
- name: "android.hardware.drm.vts.driver@1.0_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.drm@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/drm/1.0/ $(genDir)/android/hardware/drm/1.0/",
- srcs: [
- "types.hal",
- "ICryptoFactory.hal",
- "ICryptoPlugin.hal",
- "IDrmFactory.hal",
- "IDrmPlugin.hal",
- "IDrmPluginListener.hal",
- ],
- out: [
- "android/hardware/drm/1.0/types.vts.cpp",
- "android/hardware/drm/1.0/CryptoFactory.vts.cpp",
- "android/hardware/drm/1.0/CryptoPlugin.vts.cpp",
- "android/hardware/drm/1.0/DrmFactory.vts.cpp",
- "android/hardware/drm/1.0/DrmPlugin.vts.cpp",
- "android/hardware/drm/1.0/DrmPluginListener.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.drm.vts.driver@1.0_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.drm@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/drm/1.0/ $(genDir)/android/hardware/drm/1.0/",
- srcs: [
- "types.hal",
- "ICryptoFactory.hal",
- "ICryptoPlugin.hal",
- "IDrmFactory.hal",
- "IDrmPlugin.hal",
- "IDrmPluginListener.hal",
- ],
- out: [
- "android/hardware/drm/1.0/types.vts.h",
- "android/hardware/drm/1.0/CryptoFactory.vts.h",
- "android/hardware/drm/1.0/CryptoPlugin.vts.h",
- "android/hardware/drm/1.0/DrmFactory.vts.h",
- "android/hardware/drm/1.0/DrmPlugin.vts.h",
- "android/hardware/drm/1.0/DrmPluginListener.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.drm.vts.driver@1.0",
- generated_sources: ["android.hardware.drm.vts.driver@1.0_genc++"],
- generated_headers: ["android.hardware.drm.vts.driver@1.0_genc++_headers"],
- export_generated_headers: ["android.hardware.drm.vts.driver@1.0_genc++_headers"],
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libvts_common",
- "libvts_datatype",
- "libvts_measurement",
- "libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
- "android.hidl.base@1.0",
- "android.hardware.drm@1.0",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "android.hidl.base@1.0",
- ],
-}
-
-genrule {
- name: "android.hardware.drm@1.0-ICryptoFactory-vts.profiler_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.drm@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/drm/1.0/ $(genDir)/android/hardware/drm/1.0/",
- srcs: [
- "ICryptoFactory.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/drm/1.0/CryptoFactory.vts.cpp",
- "android/hardware/drm/1.0/types.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.drm@1.0-ICryptoFactory-vts.profiler_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.drm@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/drm/1.0/ $(genDir)/android/hardware/drm/1.0/",
- srcs: [
- "ICryptoFactory.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/drm/1.0/CryptoFactory.vts.h",
- "android/hardware/drm/1.0/types.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.drm@1.0-ICryptoFactory-vts.profiler",
- generated_sources: ["android.hardware.drm@1.0-ICryptoFactory-vts.profiler_genc++"],
- generated_headers: ["android.hardware.drm@1.0-ICryptoFactory-vts.profiler_genc++_headers"],
- export_generated_headers: ["android.hardware.drm@1.0-ICryptoFactory-vts.profiler_genc++_headers"],
- shared_libs: [
- "libbase",
- "libhidlbase",
- "libhidltransport",
- "libvts_profiling",
- "libvts_multidevice_proto",
- "libprotobuf-cpp-full",
- "android.hidl.base@1.0",
- "android.hardware.drm@1.0",
- ],
-}
-
-genrule {
- name: "android.hardware.drm@1.0-ICryptoPlugin-vts.profiler_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.drm@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/drm/1.0/ $(genDir)/android/hardware/drm/1.0/",
- srcs: [
- "ICryptoPlugin.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/drm/1.0/CryptoPlugin.vts.cpp",
- "android/hardware/drm/1.0/types.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.drm@1.0-ICryptoPlugin-vts.profiler_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.drm@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/drm/1.0/ $(genDir)/android/hardware/drm/1.0/",
- srcs: [
- "ICryptoPlugin.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/drm/1.0/CryptoPlugin.vts.h",
- "android/hardware/drm/1.0/types.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.drm@1.0-ICryptoPlugin-vts.profiler",
- generated_sources: ["android.hardware.drm@1.0-ICryptoPlugin-vts.profiler_genc++"],
- generated_headers: ["android.hardware.drm@1.0-ICryptoPlugin-vts.profiler_genc++_headers"],
- export_generated_headers: ["android.hardware.drm@1.0-ICryptoPlugin-vts.profiler_genc++_headers"],
- shared_libs: [
- "libbase",
- "libhidlbase",
- "libhidltransport",
- "libvts_profiling",
- "libvts_multidevice_proto",
- "libprotobuf-cpp-full",
- "android.hidl.base@1.0",
- "android.hardware.drm@1.0",
- ],
-}
-
-genrule {
- name: "android.hardware.drm@1.0-IDrmFactory-vts.profiler_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.drm@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/drm/1.0/ $(genDir)/android/hardware/drm/1.0/",
- srcs: [
- "IDrmFactory.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/drm/1.0/DrmFactory.vts.cpp",
- "android/hardware/drm/1.0/types.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.drm@1.0-IDrmFactory-vts.profiler_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.drm@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/drm/1.0/ $(genDir)/android/hardware/drm/1.0/",
- srcs: [
- "IDrmFactory.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/drm/1.0/DrmFactory.vts.h",
- "android/hardware/drm/1.0/types.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.drm@1.0-IDrmFactory-vts.profiler",
- generated_sources: ["android.hardware.drm@1.0-IDrmFactory-vts.profiler_genc++"],
- generated_headers: ["android.hardware.drm@1.0-IDrmFactory-vts.profiler_genc++_headers"],
- export_generated_headers: ["android.hardware.drm@1.0-IDrmFactory-vts.profiler_genc++_headers"],
- shared_libs: [
- "libbase",
- "libhidlbase",
- "libhidltransport",
- "libvts_profiling",
- "libvts_multidevice_proto",
- "libprotobuf-cpp-full",
- "android.hidl.base@1.0",
- "android.hardware.drm@1.0",
- ],
-}
-
-genrule {
- name: "android.hardware.drm@1.0-IDrmPlugin-vts.profiler_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.drm@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/drm/1.0/ $(genDir)/android/hardware/drm/1.0/",
- srcs: [
- "IDrmPlugin.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/drm/1.0/DrmPlugin.vts.cpp",
- "android/hardware/drm/1.0/types.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.drm@1.0-IDrmPlugin-vts.profiler_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.drm@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/drm/1.0/ $(genDir)/android/hardware/drm/1.0/",
- srcs: [
- "IDrmPlugin.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/drm/1.0/DrmPlugin.vts.h",
- "android/hardware/drm/1.0/types.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.drm@1.0-IDrmPlugin-vts.profiler",
- generated_sources: ["android.hardware.drm@1.0-IDrmPlugin-vts.profiler_genc++"],
- generated_headers: ["android.hardware.drm@1.0-IDrmPlugin-vts.profiler_genc++_headers"],
- export_generated_headers: ["android.hardware.drm@1.0-IDrmPlugin-vts.profiler_genc++_headers"],
- shared_libs: [
- "libbase",
- "libhidlbase",
- "libhidltransport",
- "libvts_profiling",
- "libvts_multidevice_proto",
- "libprotobuf-cpp-full",
- "android.hidl.base@1.0",
- "android.hardware.drm@1.0",
- ],
-}
-
-genrule {
- name: "android.hardware.drm@1.0-IDrmPluginListener-vts.profiler_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.drm@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/drm/1.0/ $(genDir)/android/hardware/drm/1.0/",
- srcs: [
- "IDrmPluginListener.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/drm/1.0/DrmPluginListener.vts.cpp",
- "android/hardware/drm/1.0/types.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.drm@1.0-IDrmPluginListener-vts.profiler_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.drm@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/drm/1.0/ $(genDir)/android/hardware/drm/1.0/",
- srcs: [
- "IDrmPluginListener.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/drm/1.0/DrmPluginListener.vts.h",
- "android/hardware/drm/1.0/types.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.drm@1.0-IDrmPluginListener-vts.profiler",
- generated_sources: ["android.hardware.drm@1.0-IDrmPluginListener-vts.profiler_genc++"],
- generated_headers: ["android.hardware.drm@1.0-IDrmPluginListener-vts.profiler_genc++_headers"],
- export_generated_headers: ["android.hardware.drm@1.0-IDrmPluginListener-vts.profiler_genc++_headers"],
- shared_libs: [
- "libbase",
- "libhidlbase",
- "libhidltransport",
- "libvts_profiling",
- "libvts_multidevice_proto",
- "libprotobuf-cpp-full",
- "android.hidl.base@1.0",
- "android.hardware.drm@1.0",
- ],
-}
diff --git a/drm/1.0/default/Android.mk b/drm/1.0/default/Android.mk
index ac5b90a..ea6cca0 100644
--- a/drm/1.0/default/Android.mk
+++ b/drm/1.0/default/Android.mk
@@ -21,6 +21,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.drm@1.0-service
LOCAL_INIT_RC := android.hardware.drm@1.0-service.rc
+LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_SRC_FILES := \
service.cpp \
@@ -48,6 +49,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.drm@1.0-impl
+LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_SRC_FILES := \
DrmFactory.cpp \
diff --git a/drm/1.0/default/CryptoFactory.cpp b/drm/1.0/default/CryptoFactory.cpp
index 13cad67..e46233d 100644
--- a/drm/1.0/default/CryptoFactory.cpp
+++ b/drm/1.0/default/CryptoFactory.cpp
@@ -15,11 +15,10 @@
*/
#define LOG_TAG "android.hardware.drm@1.0-impl"
-#include <utils/Log.h>
-
#include "CryptoFactory.h"
#include "CryptoPlugin.h"
#include "TypeConvert.h"
+#include <utils/Log.h>
namespace android {
namespace hardware {
@@ -27,63 +26,45 @@
namespace V1_0 {
namespace implementation {
-CryptoFactory::CryptoFactory() :
- trebleLoader("/vendor/lib/hw", "createCryptoFactory"),
- legacyLoader("/vendor/lib/mediadrm", "createCryptoFactory") {
-}
-
-// Methods from ::android::hardware::drm::V1_0::ICryptoFactory follow.
-Return<bool> CryptoFactory::isCryptoSchemeSupported(
- const hidl_array<uint8_t, 16>& uuid) {
- return isCryptoSchemeSupported(trebleLoader, uuid) ||
- isCryptoSchemeSupported(legacyLoader, uuid);
-}
-
-Return<void> CryptoFactory::createPlugin(const hidl_array<uint8_t, 16>& uuid,
- const hidl_vec<uint8_t>& initData, createPlugin_cb _hidl_cb) {
- sp<ICryptoPlugin> plugin = createTreblePlugin(uuid, initData);
- if (plugin == nullptr) {
- plugin = createLegacyPlugin(uuid, initData);
+ CryptoFactory::CryptoFactory() :
+ loader("/vendor/lib/mediadrm", "createCryptoFactory") {
}
- _hidl_cb(plugin != nullptr ? Status::OK : Status::ERROR_DRM_CANNOT_HANDLE, plugin);
- return Void();
-}
-sp<ICryptoPlugin> CryptoFactory::createTreblePlugin(const hidl_array<uint8_t, 16>& uuid,
- const hidl_vec<uint8_t>& initData) {
- sp<ICryptoPlugin> plugin;
- for (size_t i = 0; i < trebleLoader.factoryCount(); i++) {
- Return<void> hResult = trebleLoader.getFactory(i)->createPlugin(uuid, initData,
- [&](Status status, const sp<ICryptoPlugin>& hPlugin) {
- if (status == Status::OK) {
- plugin = hPlugin;
- }
+ // Methods from ::android::hardware::drm::V1_0::ICryptoFactory follow.
+ Return<bool> CryptoFactory::isCryptoSchemeSupported(
+ const hidl_array<uint8_t, 16>& uuid) {
+ for (size_t i = 0; i < loader.factoryCount(); i++) {
+ if (loader.getFactory(i)->isCryptoSchemeSupported(uuid.data())) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ Return<void> CryptoFactory::createPlugin(const hidl_array<uint8_t, 16>& uuid,
+ const hidl_vec<uint8_t>& initData, createPlugin_cb _hidl_cb) {
+ for (size_t i = 0; i < loader.factoryCount(); i++) {
+ if (loader.getFactory(i)->isCryptoSchemeSupported(uuid.data())) {
+ android::CryptoPlugin *legacyPlugin = NULL;
+ status_t status = loader.getFactory(i)->createPlugin(uuid.data(),
+ initData.data(), initData.size(), &legacyPlugin);
+ CryptoPlugin *newPlugin = NULL;
+ if (legacyPlugin == NULL) {
+ ALOGE("Crypto legacy HAL: failed to create crypto plugin");
+ } else {
+ newPlugin = new CryptoPlugin(legacyPlugin);
}
- );
- if (plugin != nullptr) {
- return plugin;
+ _hidl_cb(toStatus(status), newPlugin);
+ return Void();
+ }
}
+ _hidl_cb(Status::ERROR_DRM_CANNOT_HANDLE, NULL);
+ return Void();
}
- return nullptr;
-}
-sp<ICryptoPlugin> CryptoFactory::createLegacyPlugin(const hidl_array<uint8_t, 16>& uuid,
- const hidl_vec<uint8_t>& initData) {
- android::CryptoPlugin *legacyPlugin = nullptr;
- for (size_t i = 0; i < legacyLoader.factoryCount(); i++) {
- legacyLoader.getFactory(i)->createPlugin(uuid.data(),
- initData.data(), initData.size(), &legacyPlugin);
- if (legacyPlugin) {
- return new CryptoPlugin(legacyPlugin);
- }
+ ICryptoFactory* HIDL_FETCH_ICryptoFactory(const char* /* name */) {
+ return new CryptoFactory();
}
- return nullptr;
-}
-
-
-ICryptoFactory* HIDL_FETCH_ICryptoFactory(const char* /* name */) {
- return new CryptoFactory();
-}
} // namespace implementation
} // namespace V1_0
diff --git a/drm/1.0/default/CryptoFactory.h b/drm/1.0/default/CryptoFactory.h
index d774406..412b557 100644
--- a/drm/1.0/default/CryptoFactory.h
+++ b/drm/1.0/default/CryptoFactory.h
@@ -41,7 +41,8 @@
CryptoFactory();
virtual ~CryptoFactory() {}
- // Methods from ::android::hardware::drmn::V1_0::ICryptoFactory follow.
+ // Methods from ::android::hardware::drm::V1_0::ICryptoFactory follow.
+
Return<bool> isCryptoSchemeSupported(const hidl_array<uint8_t, 16>& uuid)
override;
@@ -50,27 +51,7 @@
override;
private:
- template <typename L> Return<bool> isCryptoSchemeSupported(
- const L& loader, const hidl_array<uint8_t, 16>& uuid) {
- for (size_t i = 0; i < loader.factoryCount(); i++) {
- if (loader.getFactory(i)->isCryptoSchemeSupported(uuid.data())) {
- return true;
- }
- }
- return false;
- }
-
- sp<ICryptoPlugin> createTreblePlugin(const hidl_array<uint8_t, 16>& uuid,
- const hidl_vec<uint8_t>& initData);
-
- sp<ICryptoPlugin> createLegacyPlugin(const hidl_array<uint8_t, 16>& uuid,
- const hidl_vec<uint8_t>& initData);
-
- typedef android::PluginLoader<ICryptoFactory> PluginLoader;
- PluginLoader trebleLoader;
-
- typedef android::PluginLoader<android::CryptoFactory> LegacyLoader;
- LegacyLoader legacyLoader;
+ android::PluginLoader<android::CryptoFactory> loader;
CryptoFactory(const CryptoFactory &) = delete;
void operator=(const CryptoFactory &) = delete;
diff --git a/drm/1.0/default/DrmFactory.cpp b/drm/1.0/default/DrmFactory.cpp
index c98c1da..92f54f1 100644
--- a/drm/1.0/default/DrmFactory.cpp
+++ b/drm/1.0/default/DrmFactory.cpp
@@ -15,11 +15,10 @@
*/
#define LOG_TAG "android.hardware.drm@1.0-impl"
-#include <utils/Log.h>
-
#include "DrmFactory.h"
#include "DrmPlugin.h"
#include "TypeConvert.h"
+#include <utils/Log.h>
namespace android {
namespace hardware {
@@ -27,66 +26,56 @@
namespace V1_0 {
namespace implementation {
-DrmFactory::DrmFactory() :
- trebleLoader("/vendor/lib/hw", "createDrmFactory"),
- legacyLoader("/vendor/lib/mediadrm", "createDrmFactory") {
-}
+ DrmFactory::DrmFactory() :
+ loader("/vendor/lib/mediadrm", "createDrmFactory") {
+ }
-// Methods from ::android::hardware::drm::V1_0::IDrmFactory follow.
-Return<bool> DrmFactory::isCryptoSchemeSupported(
- const hidl_array<uint8_t, 16>& uuid) {
- return isCryptoSchemeSupported(trebleLoader, uuid) ||
- isCryptoSchemeSupported(legacyLoader, uuid);
-}
+ // Methods from ::android::hardware::drm::V1_0::IDrmFactory follow.
+ Return<bool> DrmFactory::isCryptoSchemeSupported (
+ const hidl_array<uint8_t, 16>& uuid) {
+ for (size_t i = 0; i < loader.factoryCount(); i++) {
+ if (loader.getFactory(i)->isCryptoSchemeSupported(uuid.data())) {
+ return true;
+ }
+ }
+ return false;
+ }
-Return<bool> DrmFactory::isContentTypeSupported (
- const hidl_string& mimeType) {
- return isContentTypeSupported<PluginLoader, hidl_string>(trebleLoader, mimeType) ||
- isContentTypeSupported<LegacyLoader, String8>(legacyLoader, mimeType);
-}
+ Return<bool> DrmFactory::isContentTypeSupported (
+ const hidl_string& mimeType) {
+ for (size_t i = 0; i < loader.factoryCount(); i++) {
+ if (loader.getFactory(i)->isContentTypeSupported(String8(mimeType.c_str()))) {
+ return true;
+ }
+ }
+ return false;
+ }
Return<void> DrmFactory::createPlugin(const hidl_array<uint8_t, 16>& uuid,
const hidl_string& appPackageName, createPlugin_cb _hidl_cb) {
- sp<IDrmPlugin> plugin = createTreblePlugin(uuid, appPackageName);
- if (plugin == nullptr) {
- plugin = createLegacyPlugin(uuid);
- }
- _hidl_cb(plugin != nullptr ? Status::OK : Status::ERROR_DRM_CANNOT_HANDLE, plugin);
- return Void();
-}
-sp<IDrmPlugin> DrmFactory::createTreblePlugin(const hidl_array<uint8_t, 16>& uuid,
- const hidl_string& appPackageName) {
- sp<IDrmPlugin> plugin;
- for (size_t i = 0; i < trebleLoader.factoryCount(); i++) {
- Return<void> hResult = trebleLoader.getFactory(i)->createPlugin(uuid,
- appPackageName, [&](Status status, const sp<IDrmPlugin>& hPlugin) {
- if (status == Status::OK) {
- plugin = hPlugin;
- }
+ for (size_t i = 0; i < loader.factoryCount(); i++) {
+ if (loader.getFactory(i)->isCryptoSchemeSupported(uuid.data())) {
+ android::DrmPlugin *legacyPlugin = NULL;
+ status_t status = loader.getFactory(i)->createDrmPlugin(
+ uuid.data(), &legacyPlugin);
+ DrmPlugin *newPlugin = NULL;
+ if (legacyPlugin == NULL) {
+ ALOGE("Drm legacy HAL: failed to create drm plugin");
+ } else {
+ newPlugin = new DrmPlugin(legacyPlugin);
}
- );
- if (plugin != nullptr) {
- return plugin;
+ _hidl_cb(toStatus(status), newPlugin);
+ return Void();
+ }
}
+ _hidl_cb(Status::ERROR_DRM_CANNOT_HANDLE, NULL);
+ return Void();
}
- return nullptr;
-}
-sp<IDrmPlugin> DrmFactory::createLegacyPlugin(const hidl_array<uint8_t, 16>& uuid) {
- android::DrmPlugin *legacyPlugin = nullptr;
- for (size_t i = 0; i < legacyLoader.factoryCount(); i++) {
- legacyLoader.getFactory(i)->createDrmPlugin(uuid.data(), &legacyPlugin);
- if (legacyPlugin) {
- return new DrmPlugin(legacyPlugin);
- }
+ IDrmFactory* HIDL_FETCH_IDrmFactory(const char* /* name */) {
+ return new DrmFactory();
}
- return nullptr;
-}
-
-IDrmFactory* HIDL_FETCH_IDrmFactory(const char* /* name */) {
- return new DrmFactory();
-}
} // namespace implementation
} // namespace V1_0
diff --git a/drm/1.0/default/DrmFactory.h b/drm/1.0/default/DrmFactory.h
index 2e71624..a008844 100644
--- a/drm/1.0/default/DrmFactory.h
+++ b/drm/1.0/default/DrmFactory.h
@@ -42,45 +42,18 @@
virtual ~DrmFactory() {}
// Methods from ::android::hardware::drm::V1_0::IDrmFactory follow.
+
Return<bool> isCryptoSchemeSupported(const hidl_array<uint8_t, 16>& uuid)
override;
- Return<bool> isContentTypeSupported(const hidl_string& mimeType)
+ Return<bool> isContentTypeSupported(const hidl_string &mimeType)
override;
Return<void> createPlugin(const hidl_array<uint8_t, 16>& uuid,
const hidl_string& appPackageName, createPlugin_cb _hidl_cb) override;
private:
- template <typename L> Return<bool> isCryptoSchemeSupported(
- const L& loader, const hidl_array<uint8_t, 16>& uuid) {
- for (size_t i = 0; i < loader.factoryCount(); i++) {
- if (loader.getFactory(i)->isCryptoSchemeSupported(uuid.data())) {
- return true;
- }
- }
- return false;
- }
-
- template <typename L, typename S> Return<bool> isContentTypeSupported(
- const L& loader, const hidl_string& mimeType) {
- for (size_t i = 0; i < loader.factoryCount(); i++) {
- if (loader.getFactory(i)->isContentTypeSupported(S(mimeType))) {
- return true;
- }
- }
- return false;
- }
-
- sp<IDrmPlugin> createTreblePlugin(const hidl_array<uint8_t, 16>& uuid,
- const hidl_string& appPackageName);
- sp<IDrmPlugin> createLegacyPlugin(const hidl_array<uint8_t, 16>& uuid);
-
- typedef android::PluginLoader<IDrmFactory> PluginLoader;
- PluginLoader trebleLoader;
-
- typedef android::PluginLoader<android::DrmFactory> LegacyLoader;
- LegacyLoader legacyLoader;
+ android::PluginLoader<android::DrmFactory> loader;
DrmFactory(const DrmFactory &) = delete;
void operator=(const DrmFactory &) = delete;
diff --git a/drm/1.0/default/android.hardware.drm@1.0-service.rc b/drm/1.0/default/android.hardware.drm@1.0-service.rc
index 281dc4b..e7beca3 100644
--- a/drm/1.0/default/android.hardware.drm@1.0-service.rc
+++ b/drm/1.0/default/android.hardware.drm@1.0-service.rc
@@ -1,4 +1,4 @@
-service drm-hal-1-0 /system/bin/hw/android.hardware.drm@1.0-service
+service drm-hal-1-0 /vendor/bin/hw/android.hardware.drm@1.0-service
class hal
user media
group mediadrm drmrpc
diff --git a/dumpstate/1.0/Android.bp b/dumpstate/1.0/Android.bp
index 7255937..1b473bc 100644
--- a/dumpstate/1.0/Android.bp
+++ b/dumpstate/1.0/Android.bp
@@ -1,11 +1,18 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
+filegroup {
+ name: "android.hardware.dumpstate@1.0_hal",
+ srcs: [
+ "IDumpstateDevice.hal",
+ ],
+}
+
genrule {
name: "android.hardware.dumpstate@1.0_genc++",
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.dumpstate@1.0",
srcs: [
- "IDumpstateDevice.hal",
+ ":android.hardware.dumpstate@1.0_hal",
],
out: [
"android/hardware/dumpstate/1.0/DumpstateDeviceAll.cpp",
@@ -17,7 +24,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.dumpstate@1.0",
srcs: [
- "IDumpstateDevice.hal",
+ ":android.hardware.dumpstate@1.0_hal",
],
out: [
"android/hardware/dumpstate/1.0/IDumpstateDevice.h",
diff --git a/dumpstate/1.0/default/Android.mk b/dumpstate/1.0/default/Android.mk
index 0b15184..ed9ef97 100644
--- a/dumpstate/1.0/default/Android.mk
+++ b/dumpstate/1.0/default/Android.mk
@@ -4,6 +4,7 @@
LOCAL_MODULE := android.hardware.dumpstate@1.0-service
LOCAL_INIT_RC := android.hardware.dumpstate@1.0-service.rc
LOCAL_MODULE_RELATIVE_PATH := hw
+LOCAL_PROPRIETARY_MODULE := true
LOCAL_SRC_FILES := \
DumpstateDevice.cpp \
service.cpp
diff --git a/dumpstate/1.0/default/android.hardware.dumpstate@1.0-service.rc b/dumpstate/1.0/default/android.hardware.dumpstate@1.0-service.rc
index 99b968e..0f27248 100644
--- a/dumpstate/1.0/default/android.hardware.dumpstate@1.0-service.rc
+++ b/dumpstate/1.0/default/android.hardware.dumpstate@1.0-service.rc
@@ -1,4 +1,4 @@
-service dumpstate-1-0 /system/bin/hw/android.hardware.dumpstate@1.0-service
+service dumpstate-1-0 /vendor/bin/hw/android.hardware.dumpstate@1.0-service
class hal
user system
group system
diff --git a/evs/1.0/Android.bp b/evs/1.0/Android.bp
index ed29968..89bac10 100644
--- a/evs/1.0/Android.bp
+++ b/evs/1.0/Android.bp
@@ -1,9 +1,7 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
-genrule {
- name: "android.hardware.evs@1.0_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.evs@1.0",
+filegroup {
+ name: "android.hardware.evs@1.0_hal",
srcs: [
"types.hal",
"IEvsCamera.hal",
@@ -11,6 +9,15 @@
"IEvsDisplay.hal",
"IEvsEnumerator.hal",
],
+}
+
+genrule {
+ name: "android.hardware.evs@1.0_genc++",
+ tools: ["hidl-gen"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.evs@1.0",
+ srcs: [
+ ":android.hardware.evs@1.0_hal",
+ ],
out: [
"android/hardware/evs/1.0/types.cpp",
"android/hardware/evs/1.0/EvsCameraAll.cpp",
@@ -25,11 +32,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.evs@1.0",
srcs: [
- "types.hal",
- "IEvsCamera.hal",
- "IEvsCameraStream.hal",
- "IEvsDisplay.hal",
- "IEvsEnumerator.hal",
+ ":android.hardware.evs@1.0_hal",
],
out: [
"android/hardware/evs/1.0/types.h",
diff --git a/evs/1.0/default/Android.bp b/evs/1.0/default/Android.bp
index e3bff25..7be365a 100644
--- a/evs/1.0/default/Android.bp
+++ b/evs/1.0/default/Android.bp
@@ -1,5 +1,6 @@
cc_binary {
name: "android.hardware.evs@1.0-service",
+ proprietary: true,
relative_install_path: "hw",
srcs: [
"service.cpp",
diff --git a/evs/1.0/default/EvsCamera.cpp b/evs/1.0/default/EvsCamera.cpp
index c62f7b6..a539b23 100644
--- a/evs/1.0/default/EvsCamera.cpp
+++ b/evs/1.0/default/EvsCamera.cpp
@@ -286,7 +286,7 @@
buffer_handle_t memHandle = nullptr;
status_t result = alloc.allocate(mWidth, mHeight,
mFormat, 1,
- mUsage,
+ mUsage, mUsage,
&memHandle, &mStride, 0, "EvsCamera");
if (result != NO_ERROR) {
ALOGE("Error %d allocating %d x %d graphics buffer", result, mWidth, mHeight);
diff --git a/evs/1.0/default/EvsDisplay.cpp b/evs/1.0/default/EvsDisplay.cpp
index dff4c49..7208395 100644
--- a/evs/1.0/default/EvsDisplay.cpp
+++ b/evs/1.0/default/EvsDisplay.cpp
@@ -149,7 +149,8 @@
GraphicBufferAllocator& alloc(GraphicBufferAllocator::get());
status_t result = alloc.allocate(mBuffer.width, mBuffer.height,
mBuffer.format, 1, mBuffer.usage,
- &handle, &mBuffer.stride,
+ mBuffer.usage, &handle,
+ &mBuffer.stride,
0, "EvsDisplay");
if (result != NO_ERROR) {
ALOGE("Error %d allocating %d x %d graphics buffer",
diff --git a/evs/1.0/default/android.hardware.evs@1.0-service.rc b/evs/1.0/default/android.hardware.evs@1.0-service.rc
index be7c9f9..bb38668 100644
--- a/evs/1.0/default/android.hardware.evs@1.0-service.rc
+++ b/evs/1.0/default/android.hardware.evs@1.0-service.rc
@@ -1,4 +1,4 @@
-service evs-hal-1-0 /system/bin/hw/android.hardware.evs@1.0-service
+service evs-hal-1-0 /vendor/bin/hw/android.hardware.evs@1.0-service
class hal
user cameraserver
group camera
diff --git a/example/extension/light/2.0/Android.bp b/example/extension/light/2.0/Android.bp
deleted file mode 100644
index cc50b83..0000000
--- a/example/extension/light/2.0/Android.bp
+++ /dev/null
@@ -1,56 +0,0 @@
-// This file is autogenerated by hidl-gen. Do not edit manually.
-
-genrule {
- name: "android.hardware.example.extension.light@2.0_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.example.extension.light@2.0",
- srcs: [
- "types.hal",
- "IExtLight.hal",
- ],
- out: [
- "android/hardware/example/extension/light/2.0/types.cpp",
- "android/hardware/example/extension/light/2.0/ExtLightAll.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.example.extension.light@2.0_genc++_headers",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.example.extension.light@2.0",
- srcs: [
- "types.hal",
- "IExtLight.hal",
- ],
- out: [
- "android/hardware/example/extension/light/2.0/types.h",
- "android/hardware/example/extension/light/2.0/IExtLight.h",
- "android/hardware/example/extension/light/2.0/IHwExtLight.h",
- "android/hardware/example/extension/light/2.0/BnHwExtLight.h",
- "android/hardware/example/extension/light/2.0/BpHwExtLight.h",
- "android/hardware/example/extension/light/2.0/BsExtLight.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.example.extension.light@2.0",
- generated_sources: ["android.hardware.example.extension.light@2.0_genc++"],
- generated_headers: ["android.hardware.example.extension.light@2.0_genc++_headers"],
- export_generated_headers: ["android.hardware.example.extension.light@2.0_genc++_headers"],
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "android.hardware.light@2.0",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "android.hardware.light@2.0",
- ],
-}
diff --git a/example/extension/light/2.0/default/Android.mk b/example/extension/light/2.0/default/Android.mk
deleted file mode 100644
index 55c21b9..0000000
--- a/example/extension/light/2.0/default/Android.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := android.hardware.example.extension.light@2.0-service
-LOCAL_INIT_RC := android.hardware.example.extension.light@2.0-service.rc
-LOCAL_MODULE_RELATIVE_PATH := hw
-LOCAL_SRC_FILES := \
- Light.cpp \
-
-LOCAL_SHARED_LIBRARIES := \
- libhidlbase \
- libhidltransport \
- libhwbinder \
- libutils \
- android.hardware.light@2.0 \
- android.hardware.example.extension.light@2.0 \
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/example/extension/light/2.0/default/android.hardware.example.extension.light@2.0-service.rc b/example/extension/light/2.0/default/android.hardware.example.extension.light@2.0-service.rc
deleted file mode 100644
index 8a90d81..0000000
--- a/example/extension/light/2.0/default/android.hardware.example.extension.light@2.0-service.rc
+++ /dev/null
@@ -1,4 +0,0 @@
-service light-ext-2-0 /system/bin/hw/android.hardware.example.extension.light@2.0-service
- class hal
- user system
- group system readproc
\ No newline at end of file
diff --git a/gatekeeper/1.0/Android.bp b/gatekeeper/1.0/Android.bp
index d4852ff..2697e4c 100644
--- a/gatekeeper/1.0/Android.bp
+++ b/gatekeeper/1.0/Android.bp
@@ -1,12 +1,19 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
+filegroup {
+ name: "android.hardware.gatekeeper@1.0_hal",
+ srcs: [
+ "types.hal",
+ "IGatekeeper.hal",
+ ],
+}
+
genrule {
name: "android.hardware.gatekeeper@1.0_genc++",
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.gatekeeper@1.0",
srcs: [
- "types.hal",
- "IGatekeeper.hal",
+ ":android.hardware.gatekeeper@1.0_hal",
],
out: [
"android/hardware/gatekeeper/1.0/types.cpp",
@@ -19,8 +26,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.gatekeeper@1.0",
srcs: [
- "types.hal",
- "IGatekeeper.hal",
+ ":android.hardware.gatekeeper@1.0_hal",
],
out: [
"android/hardware/gatekeeper/1.0/types.h",
@@ -54,106 +60,3 @@
"android.hidl.base@1.0",
],
}
-
-genrule {
- name: "android.hardware.gatekeeper.vts.driver@1.0_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.gatekeeper@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/gatekeeper/1.0/ $(genDir)/android/hardware/gatekeeper/1.0/",
- srcs: [
- "types.hal",
- "IGatekeeper.hal",
- ],
- out: [
- "android/hardware/gatekeeper/1.0/types.vts.cpp",
- "android/hardware/gatekeeper/1.0/Gatekeeper.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.gatekeeper.vts.driver@1.0_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.gatekeeper@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/gatekeeper/1.0/ $(genDir)/android/hardware/gatekeeper/1.0/",
- srcs: [
- "types.hal",
- "IGatekeeper.hal",
- ],
- out: [
- "android/hardware/gatekeeper/1.0/types.vts.h",
- "android/hardware/gatekeeper/1.0/Gatekeeper.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.gatekeeper.vts.driver@1.0",
- generated_sources: ["android.hardware.gatekeeper.vts.driver@1.0_genc++"],
- generated_headers: ["android.hardware.gatekeeper.vts.driver@1.0_genc++_headers"],
- export_generated_headers: ["android.hardware.gatekeeper.vts.driver@1.0_genc++_headers"],
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libvts_common",
- "libvts_datatype",
- "libvts_measurement",
- "libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
- "android.hidl.base@1.0",
- "android.hardware.gatekeeper@1.0",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "android.hidl.base@1.0",
- ],
-}
-
-genrule {
- name: "android.hardware.gatekeeper@1.0-IGatekeeper-vts.profiler_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.gatekeeper@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/gatekeeper/1.0/ $(genDir)/android/hardware/gatekeeper/1.0/",
- srcs: [
- "IGatekeeper.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/gatekeeper/1.0/Gatekeeper.vts.cpp",
- "android/hardware/gatekeeper/1.0/types.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.gatekeeper@1.0-IGatekeeper-vts.profiler_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.gatekeeper@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/gatekeeper/1.0/ $(genDir)/android/hardware/gatekeeper/1.0/",
- srcs: [
- "IGatekeeper.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/gatekeeper/1.0/Gatekeeper.vts.h",
- "android/hardware/gatekeeper/1.0/types.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.gatekeeper@1.0-IGatekeeper-vts.profiler",
- generated_sources: ["android.hardware.gatekeeper@1.0-IGatekeeper-vts.profiler_genc++"],
- generated_headers: ["android.hardware.gatekeeper@1.0-IGatekeeper-vts.profiler_genc++_headers"],
- export_generated_headers: ["android.hardware.gatekeeper@1.0-IGatekeeper-vts.profiler_genc++_headers"],
- shared_libs: [
- "libbase",
- "libhidlbase",
- "libhidltransport",
- "libvts_profiling",
- "libvts_multidevice_proto",
- "libprotobuf-cpp-full",
- "android.hidl.base@1.0",
- "android.hardware.gatekeeper@1.0",
- ],
-}
diff --git a/gatekeeper/1.0/Android.mk b/gatekeeper/1.0/Android.mk
index 5d66b45..70206ff 100644
--- a/gatekeeper/1.0/Android.mk
+++ b/gatekeeper/1.0/Android.mk
@@ -8,7 +8,7 @@
LOCAL_MODULE := android.hardware.gatekeeper@1.0-java
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -83,7 +83,7 @@
LOCAL_MODULE := android.hardware.gatekeeper@1.0-java-static
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
diff --git a/gatekeeper/1.0/default/Android.mk b/gatekeeper/1.0/default/Android.mk
index e3b7d10..94dc1ea 100644
--- a/gatekeeper/1.0/default/Android.mk
+++ b/gatekeeper/1.0/default/Android.mk
@@ -3,6 +3,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE_RELATIVE_PATH := hw
+LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE := android.hardware.gatekeeper@1.0-impl
LOCAL_SRC_FILES := \
@@ -22,6 +23,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE_RELATIVE_PATH := hw
+LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE := android.hardware.gatekeeper@1.0-service
LOCAL_INIT_RC := android.hardware.gatekeeper@1.0-service.rc
diff --git a/gatekeeper/1.0/default/android.hardware.gatekeeper@1.0-service.rc b/gatekeeper/1.0/default/android.hardware.gatekeeper@1.0-service.rc
index ac15e23..d3f5e9d 100644
--- a/gatekeeper/1.0/default/android.hardware.gatekeeper@1.0-service.rc
+++ b/gatekeeper/1.0/default/android.hardware.gatekeeper@1.0-service.rc
@@ -1,4 +1,4 @@
-service gatekeeper-1-0 /system/bin/hw/android.hardware.gatekeeper@1.0-service
+service gatekeeper-1-0 /vendor/bin/hw/android.hardware.gatekeeper@1.0-service
class hal
user system
group system
diff --git a/gatekeeper/1.0/vts/Android.mk b/gatekeeper/1.0/vts/Android.mk
deleted file mode 100644
index 58c2dca..0000000
--- a/gatekeeper/1.0/vts/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-
-
-LOCAL_PATH := $(call my-dir)
-
-include $(LOCAL_PATH)/functional/vts/testcases/hal/gatekeeper/hidl/Android.mk
diff --git a/gatekeeper/1.0/vts/Gatekeeper.vts b/gatekeeper/1.0/vts/Gatekeeper.vts
index 25dc32f..9e63488 100644
--- a/gatekeeper/1.0/vts/Gatekeeper.vts
+++ b/gatekeeper/1.0/vts/Gatekeeper.vts
@@ -5,6 +5,7 @@
package: "android.hardware.gatekeeper"
import: "android.hardware.gatekeeper@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
api: {
diff --git a/gatekeeper/1.0/vts/functional/Android.bp b/gatekeeper/1.0/vts/functional/Android.bp
index e79e40e..70a85c6 100644
--- a/gatekeeper/1.0/vts/functional/Android.bp
+++ b/gatekeeper/1.0/vts/functional/Android.bp
@@ -31,11 +31,7 @@
],
static_libs: ["libgtest"],
cflags: [
- "--coverage",
"-O0",
"-g",
- ],
- ldflags: [
- "--coverage"
]
}
diff --git a/gatekeeper/1.0/vts/functional/vts/testcases/hal/gatekeeper/hidl/Android.mk b/gatekeeper/1.0/vts/functional/vts/testcases/hal/gatekeeper/hidl/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/gatekeeper/1.0/vts/functional/vts/testcases/hal/gatekeeper/hidl/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/gatekeeper/1.0/vts/functional/vts/testcases/hal/gatekeeper/hidl/target/Android.mk b/gatekeeper/1.0/vts/functional/vts/testcases/hal/gatekeeper/hidl/target/Android.mk
deleted file mode 100644
index 59bfe17..0000000
--- a/gatekeeper/1.0/vts/functional/vts/testcases/hal/gatekeeper/hidl/target/Android.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := HalGatekeeperHidlTargetBasicTest
-VTS_CONFIG_SRC_DIR := testcases/hal/gatekeeper/hidl/target
-include test/vts/tools/build/Android.host_config.mk
diff --git a/gatekeeper/1.0/vts/functional/vts/testcases/hal/gatekeeper/hidl/target/AndroidTest.xml b/gatekeeper/1.0/vts/functional/vts/testcases/hal/gatekeeper/hidl/target/AndroidTest.xml
deleted file mode 100644
index 2e258ca..0000000
--- a/gatekeeper/1.0/vts/functional/vts/testcases/hal/gatekeeper/hidl/target/AndroidTest.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<configuration description="Config for VTS Gatekeeper HIDL HAL's basic target-side test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="HalGatekeeperHidlTargetBasicTest" />
- <option name="binary-test-sources" value="
- _32bit::DATA/nativetest/gatekeeper_hidl_hal_test/gatekeeper_hidl_hal_test,
- _64bit::DATA/nativetest64/gatekeeper_hidl_hal_test/gatekeeper_hidl_hal_test,
- "/>
- <option name="binary-test-type" value="gtest" />
- <option name="test-timeout" value="5m" />
- </test>
-</configuration>
diff --git a/gatekeeper/1.0/vts/functional/vts/testcases/hal/gatekeeper/hidl/target_profiling/Android.mk b/gatekeeper/1.0/vts/functional/vts/testcases/hal/gatekeeper/hidl/target_profiling/Android.mk
deleted file mode 100644
index 384b33c..0000000
--- a/gatekeeper/1.0/vts/functional/vts/testcases/hal/gatekeeper/hidl/target_profiling/Android.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := HalGatekeeperHidlTargetBasicProfilingTest
-VTS_CONFIG_SRC_DIR := testcases/hal/gatekeeper/hidl/target_profiling
-include test/vts/tools/build/Android.host_config.mk
diff --git a/gatekeeper/1.0/vts/functional/vts/testcases/hal/gatekeeper/hidl/target_profiling/AndroidTest.xml b/gatekeeper/1.0/vts/functional/vts/testcases/hal/gatekeeper/hidl/target_profiling/AndroidTest.xml
deleted file mode 100644
index 18bb442..0000000
--- a/gatekeeper/1.0/vts/functional/vts/testcases/hal/gatekeeper/hidl/target_profiling/AndroidTest.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<configuration description="Config for VTS Gatekeeper HIDL HAL's basic target-side test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="HalGatekeeperHidlTargetBasicProfilingTest" />
- <option name="binary-test-sources" value="
- _32bit::DATA/nativetest/gatekeeper_hidl_hal_test/gatekeeper_hidl_hal_test,
- _64bit::DATA/nativetest64/gatekeeper_hidl_hal_test/gatekeeper_hidl_hal_test,
- "/>
- <option name="binary-test-type" value="gtest" />
- <option name="test-timeout" value="5m" />
- <option name="enable-profiling" value="true" />
- </test>
-</configuration>
diff --git a/gnss/1.0/Android.bp b/gnss/1.0/Android.bp
index 4d7e26e..16895b6 100644
--- a/gnss/1.0/Android.bp
+++ b/gnss/1.0/Android.bp
@@ -1,9 +1,7 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
-genrule {
- name: "android.hardware.gnss@1.0_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.gnss@1.0",
+filegroup {
+ name: "android.hardware.gnss@1.0_hal",
srcs: [
"types.hal",
"IAGnss.hal",
@@ -27,6 +25,15 @@
"IGnssXtra.hal",
"IGnssXtraCallback.hal",
],
+}
+
+genrule {
+ name: "android.hardware.gnss@1.0_genc++",
+ tools: ["hidl-gen"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.gnss@1.0",
+ srcs: [
+ ":android.hardware.gnss@1.0_hal",
+ ],
out: [
"android/hardware/gnss/1.0/types.cpp",
"android/hardware/gnss/1.0/AGnssAll.cpp",
@@ -57,27 +64,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.gnss@1.0",
srcs: [
- "types.hal",
- "IAGnss.hal",
- "IAGnssCallback.hal",
- "IAGnssRil.hal",
- "IAGnssRilCallback.hal",
- "IGnss.hal",
- "IGnssBatching.hal",
- "IGnssBatchingCallback.hal",
- "IGnssCallback.hal",
- "IGnssConfiguration.hal",
- "IGnssDebug.hal",
- "IGnssGeofenceCallback.hal",
- "IGnssGeofencing.hal",
- "IGnssMeasurement.hal",
- "IGnssMeasurementCallback.hal",
- "IGnssNavigationMessage.hal",
- "IGnssNavigationMessageCallback.hal",
- "IGnssNi.hal",
- "IGnssNiCallback.hal",
- "IGnssXtra.hal",
- "IGnssXtraCallback.hal",
+ ":android.hardware.gnss@1.0_hal",
],
out: [
"android/hardware/gnss/1.0/types.h",
diff --git a/gnss/1.0/Android.mk b/gnss/1.0/Android.mk
index 130c14e..5985c87 100644
--- a/gnss/1.0/Android.mk
+++ b/gnss/1.0/Android.mk
@@ -8,7 +8,7 @@
LOCAL_MODULE := android.hardware.gnss@1.0-java
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -530,7 +530,7 @@
LOCAL_MODULE := android.hardware.gnss@1.0-java-static
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -1046,5 +1046,58 @@
include $(BUILD_STATIC_JAVA_LIBRARY)
+################################################################################
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := android.hardware.gnss@1.0-java-constants
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+
+intermediates := $(call local-generated-sources-dir, COMMON)
+
+HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
+#
+GEN := $(intermediates)/android/hardware/gnss/V1_0/Constants.java
+$(GEN): $(HIDL)
+$(GEN): $(LOCAL_PATH)/types.hal
+$(GEN): $(LOCAL_PATH)/IAGnss.hal
+$(GEN): $(LOCAL_PATH)/IAGnssCallback.hal
+$(GEN): $(LOCAL_PATH)/IAGnssRil.hal
+$(GEN): $(LOCAL_PATH)/IAGnssRilCallback.hal
+$(GEN): $(LOCAL_PATH)/IGnss.hal
+$(GEN): $(LOCAL_PATH)/IGnssBatching.hal
+$(GEN): $(LOCAL_PATH)/IGnssBatchingCallback.hal
+$(GEN): $(LOCAL_PATH)/IGnssCallback.hal
+$(GEN): $(LOCAL_PATH)/IGnssConfiguration.hal
+$(GEN): $(LOCAL_PATH)/IGnssDebug.hal
+$(GEN): $(LOCAL_PATH)/IGnssGeofenceCallback.hal
+$(GEN): $(LOCAL_PATH)/IGnssGeofencing.hal
+$(GEN): $(LOCAL_PATH)/IGnssMeasurement.hal
+$(GEN): $(LOCAL_PATH)/IGnssMeasurementCallback.hal
+$(GEN): $(LOCAL_PATH)/IGnssNavigationMessage.hal
+$(GEN): $(LOCAL_PATH)/IGnssNavigationMessageCallback.hal
+$(GEN): $(LOCAL_PATH)/IGnssNi.hal
+$(GEN): $(LOCAL_PATH)/IGnssNiCallback.hal
+$(GEN): $(LOCAL_PATH)/IGnssXtra.hal
+$(GEN): $(LOCAL_PATH)/IGnssXtraCallback.hal
+
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava-constants \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
+ android.hardware.gnss@1.0
+
+$(GEN):
+ $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+# Avoid dependency cycle of framework.jar -> this-library -> framework.jar
+LOCAL_NO_STANDARD_LIBRARIES := true
+LOCAL_JAVA_LIBRARIES := core-oj
+
+include $(BUILD_STATIC_JAVA_LIBRARY)
+
+
include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/gnss/1.0/IGnssBatching.hal b/gnss/1.0/IGnssBatching.hal
index 4d5affa..6f2dde6 100644
--- a/gnss/1.0/IGnssBatching.hal
+++ b/gnss/1.0/IGnssBatching.hal
@@ -136,7 +136,8 @@
/**
* Closes the interface. If any batch operations are in progress,
- * they should be stopped.
+ * they must be stopped. If any locations are in the hardware batch, they
+ * must be deleted (and not sent via callback.)
*
* init() may be called again, after this, if the interface is to be restored
*/
diff --git a/gnss/1.0/default/Android.mk b/gnss/1.0/default/Android.mk
index a6f73f2..73889b5 100644
--- a/gnss/1.0/default/Android.mk
+++ b/gnss/1.0/default/Android.mk
@@ -2,6 +2,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.gnss@1.0-impl
+LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_SRC_FILES := \
ThreadCreationWrapper.cpp \
@@ -31,6 +32,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE_RELATIVE_PATH := hw
+LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE := android.hardware.gnss@1.0-service
LOCAL_INIT_RC := android.hardware.gnss@1.0-service.rc
LOCAL_SRC_FILES := \
diff --git a/gnss/1.0/default/Gnss.cpp b/gnss/1.0/default/Gnss.cpp
index 19e22c2..a2a99a0 100644
--- a/gnss/1.0/default/Gnss.cpp
+++ b/gnss/1.0/default/Gnss.cpp
@@ -28,6 +28,8 @@
std::vector<std::unique_ptr<ThreadFuncArgs>> Gnss::sThreadFuncArgsList;
sp<IGnssCallback> Gnss::sGnssCbIface = nullptr;
bool Gnss::sInterfaceExists = false;
+bool Gnss::sWakelockHeldGnss = false;
+bool Gnss::sWakelockHeldFused = false;
GpsCallbacks Gnss::sGnssCb = {
.size = sizeof(GpsCallbacks),
@@ -253,21 +255,62 @@
}
void Gnss::acquireWakelockCb() {
- if (sGnssCbIface == nullptr) {
- ALOGE("%s: GNSS Callback Interface configured incorrectly", __func__);
- return;
- }
-
- sGnssCbIface->gnssAcquireWakelockCb();
+ acquireWakelockGnss();
}
void Gnss::releaseWakelockCb() {
+ releaseWakelockGnss();
+}
+
+
+void Gnss::acquireWakelockGnss() {
+ sWakelockHeldGnss = true;
+ updateWakelock();
+}
+
+void Gnss::releaseWakelockGnss() {
+ sWakelockHeldGnss = false;
+ updateWakelock();
+}
+
+void Gnss::acquireWakelockFused() {
+ sWakelockHeldFused = true;
+ updateWakelock();
+}
+
+void Gnss::releaseWakelockFused() {
+ sWakelockHeldFused = false;
+ updateWakelock();
+}
+
+void Gnss::updateWakelock() {
+ // Track the state of the last request - in case the wake lock in the layer above is reference
+ // counted.
+ static bool sWakelockHeld = false;
+
if (sGnssCbIface == nullptr) {
ALOGE("%s: GNSS Callback Interface configured incorrectly", __func__);
return;
}
- sGnssCbIface->gnssReleaseWakelockCb();
+ if (sWakelockHeldGnss || sWakelockHeldFused) {
+ if (!sWakelockHeld) {
+ ALOGI("%s: GNSS HAL Wakelock acquired due to gps: %d, fused: %d", __func__,
+ sWakelockHeldGnss, sWakelockHeldFused);
+ sWakelockHeld = true;
+ sGnssCbIface->gnssAcquireWakelockCb();
+ }
+ } else {
+ if (sWakelockHeld) {
+ ALOGI("%s: GNSS HAL Wakelock released", __func__);
+ } else {
+ // To avoid burning power, always release, even if logic got here with sWakelock false
+ // which it shouldn't, unless underlying *.h implementation makes duplicate requests.
+ ALOGW("%s: GNSS HAL Wakelock released, duplicate request", __func__);
+ }
+ sWakelockHeld = false;
+ sGnssCbIface->gnssReleaseWakelockCb();
+ }
}
void Gnss::requestUtcTimeCb() {
@@ -541,8 +584,26 @@
if (mGnssIface == nullptr) {
ALOGE("%s: Gnss interface is unavailable", __func__);
} else {
- // TODO(b/34133439): actually get an flpLocationIface
+ hw_module_t* module;
const FlpLocationInterface* flpLocationIface = nullptr;
+ int err = hw_get_module(FUSED_LOCATION_HARDWARE_MODULE_ID, (hw_module_t const**)&module);
+
+ if (err != 0) {
+ ALOGE("gnss flp hw_get_module failed: %d", err);
+ } else if (module == nullptr) {
+ ALOGE("Fused Location hw_get_module returned null module");
+ } else if (module->methods == nullptr) {
+ ALOGE("Fused Location hw_get_module returned null methods");
+ } else {
+ hw_device_t* device;
+ err = module->methods->open(module, FUSED_LOCATION_HARDWARE_MODULE_ID, &device);
+ if (err != 0) {
+ ALOGE("flpDevice open failed: %d", err);
+ } else {
+ flp_device_t * flpDevice = reinterpret_cast<flp_device_t*>(device);
+ flpLocationIface = flpDevice->get_flp_interface(flpDevice);
+ }
+ }
if (flpLocationIface == nullptr) {
ALOGE("%s: GnssBatching interface is not implemented by HAL", __func__);
@@ -550,7 +611,6 @@
mGnssBatching = new GnssBatching(flpLocationIface);
}
}
-
return mGnssBatching;
}
diff --git a/gnss/1.0/default/Gnss.h b/gnss/1.0/default/Gnss.h
index 36947c1..63614fa 100644
--- a/gnss/1.0/default/Gnss.h
+++ b/gnss/1.0/default/Gnss.h
@@ -53,7 +53,6 @@
* IGnssCallback interface to be passed into the conventional implementation of the GNSS HAL.
*/
struct Gnss : public IGnss {
- // TODO: Add flp_device_t, either in ctor, or later attach?
Gnss(gps_device_t* gnss_device);
~Gnss();
@@ -109,11 +108,27 @@
static void setSystemInfoCb(const LegacyGnssSystemInfo* info);
/*
+ * Wakelock consolidation, only needed for dual use of a gps.h & fused_location.h HAL
+ *
+ * Ensures that if the last call from either legacy .h was to acquire a wakelock, that a
+ * wakelock is held. Otherwise releases it.
+ */
+ static void acquireWakelockFused();
+ static void releaseWakelockFused();
+
+ /*
* Holds function pointers to the callback methods.
*/
static GpsCallbacks sGnssCb;
private:
+ // for wakelock consolidation, see above
+ static void acquireWakelockGnss();
+ static void releaseWakelockGnss();
+ static void updateWakelock();
+ static bool sWakelockHeldGnss;
+ static bool sWakelockHeldFused;
+
sp<GnssXtra> mGnssXtraIface = nullptr;
sp<AGnssRil> mGnssRil = nullptr;
sp<GnssGeofencing> mGnssGeofencingIface = nullptr;
diff --git a/gnss/1.0/default/GnssBatching.cpp b/gnss/1.0/default/GnssBatching.cpp
index 404b5da..95c5e60 100644
--- a/gnss/1.0/default/GnssBatching.cpp
+++ b/gnss/1.0/default/GnssBatching.cpp
@@ -1,4 +1,27 @@
+/*
+ * Copyright (C) 2016 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.
+ */
+
+#define LOG_TAG "GnssHAL_GnssBatchingInterface"
+
#include "GnssBatching.h"
+#include <Gnss.h> // for wakelock consolidation
+#include <GnssUtils.h>
+
+#include <cutils/log.h> // for ALOGE
+#include <vector>
namespace android {
namespace hardware {
@@ -6,38 +29,189 @@
namespace V1_0 {
namespace implementation {
-GnssBatching::GnssBatching(const FlpLocationInterface* flpLocationIface) :
- mFlpLocationIface(flpLocationIface) {}
+sp<IGnssBatchingCallback> GnssBatching::sGnssBatchingCbIface = nullptr;
+bool GnssBatching::sFlpSupportsBatching = false;
+FlpCallbacks GnssBatching::sFlpCb = {
+ .size = sizeof(FlpCallbacks),
+ .location_cb = locationCb,
+ .acquire_wakelock_cb = acquireWakelockCb,
+ .release_wakelock_cb = releaseWakelockCb,
+ .set_thread_event_cb = setThreadEventCb,
+ .flp_capabilities_cb = flpCapabilitiesCb,
+ .flp_status_cb = flpStatusCb,
+};
+
+GnssBatching::GnssBatching(const FlpLocationInterface* flpLocationIface) :
+ mFlpLocationIface(flpLocationIface) {
+}
+
+/*
+ * This enum is used locally by various methods below. It is only used by the default
+ * implementation and is not part of the GNSS interface.
+ */
+enum BatchingValues : uint16_t {
+ // Numbers 0-3 were used in earlier implementations - using 4 to be distinct to the HAL
+ FLP_GNSS_BATCHING_CLIENT_ID = 4,
+ // Tech. mask of GNSS, and sensor aiding, for legacy HAL to fit with GnssBatching API
+ FLP_TECH_MASK_GNSS_AND_SENSORS = FLP_TECH_MASK_GNSS | FLP_TECH_MASK_SENSORS,
+ // Putting a cap to avoid possible memory issues. Unlikely values this high are supported.
+ MAX_LOCATIONS_PER_BATCH = 1000
+};
+
+void GnssBatching::locationCb(int32_t locationsCount, FlpLocation** locations) {
+ if (sGnssBatchingCbIface == nullptr) {
+ ALOGE("%s: GNSS Batching Callback Interface configured incorrectly", __func__);
+ return;
+ }
+
+ if (locations == nullptr) {
+ ALOGE("%s: Invalid locations from GNSS HAL", __func__);
+ return;
+ }
+
+ if (locationsCount < 0) {
+ ALOGE("%s: Negative location count: %d set to 0", __func__, locationsCount);
+ locationsCount = 0;
+ } else if (locationsCount > MAX_LOCATIONS_PER_BATCH) {
+ ALOGW("%s: Unexpected high location count: %d set to %d", __func__, locationsCount,
+ MAX_LOCATIONS_PER_BATCH);
+ locationsCount = MAX_LOCATIONS_PER_BATCH;
+ }
+
+ /**
+ * Note:
+ * Some existing implementations may drop duplicate locations. These could be expanded here
+ * but as there's ambiguity between no-GPS-fix vs. dropped duplicates in that implementation,
+ * and that's not specified by the fused_location.h, that isn't safe to do here.
+ * Fortunately, this shouldn't be a major issue in cases where GNSS batching is typically
+ * used (e.g. when user is likely in vehicle/bicycle.)
+ */
+ std::vector<android::hardware::gnss::V1_0::GnssLocation> gnssLocations;
+ for (int iLocation = 0; iLocation < locationsCount; iLocation++) {
+ if (locations[iLocation] == nullptr) {
+ ALOGE("%s: Null location at slot: %d of %d, skipping", __func__, iLocation,
+ locationsCount);
+ continue;
+ }
+ if ((locations[iLocation]->sources_used & ~FLP_TECH_MASK_GNSS_AND_SENSORS) != 0)
+ {
+ ALOGE("%s: Unrequested location type %d at slot: %d of %d, skipping", __func__,
+ locations[iLocation]->sources_used, iLocation, locationsCount);
+ continue;
+ }
+ gnssLocations.push_back(convertToGnssLocation(locations[iLocation]));
+ }
+
+ sGnssBatchingCbIface->gnssLocationBatchCb(gnssLocations);
+}
+
+void GnssBatching::acquireWakelockCb() {
+ Gnss::acquireWakelockFused();
+}
+
+void GnssBatching::releaseWakelockCb() {
+ Gnss::releaseWakelockFused();
+}
+
+// this can just return success, because threads are now set up on demand in the jni layer
+int32_t GnssBatching::setThreadEventCb(ThreadEvent event) {
+ return FLP_RESULT_SUCCESS;
+}
+
+void GnssBatching::flpCapabilitiesCb(int32_t capabilities) {
+ ALOGD("%s capabilities %d", __func__, capabilities);
+
+ if (capabilities & CAPABILITY_GNSS) {
+ // once callback is received and capabilities high enough, we know version is
+ // high enough for flush()
+ sFlpSupportsBatching = true;
+ }
+}
+
+void GnssBatching::flpStatusCb(int32_t status) {
+ ALOGD("%s (default implementation) not forwarding status: %d", __func__, status);
+}
// Methods from ::android::hardware::gnss::V1_0::IGnssBatching follow.
Return<bool> GnssBatching::init(const sp<IGnssBatchingCallback>& callback) {
- // TODO(b/34133439) implement
- return false;
+ if (mFlpLocationIface == nullptr) {
+ ALOGE("%s: Flp batching is unavailable", __func__);
+ return false;
+ }
+
+ sGnssBatchingCbIface = callback;
+
+ return (mFlpLocationIface->init(&sFlpCb) == 0);
}
Return<uint16_t> GnssBatching::getBatchSize() {
- // TODO(b/34133439) implement
- return 0;
+ if (mFlpLocationIface == nullptr) {
+ ALOGE("%s: Flp batching interface is unavailable", __func__);
+ return 0;
+ }
+
+ return mFlpLocationIface->get_batch_size();
}
Return<bool> GnssBatching::start(const IGnssBatching::Options& options) {
- // TODO(b/34133439) implement
- return false;
+ if (mFlpLocationIface == nullptr) {
+ ALOGE("%s: Flp batching interface is unavailable", __func__);
+ return false;
+ }
+
+ if (!sFlpSupportsBatching) {
+ ALOGE("%s: Flp batching interface not supported, no capabilities callback received",
+ __func__);
+ return false;
+ }
+
+ FlpBatchOptions optionsHw;
+ // Legacy code used 9999 mW for High accuracy, and 21 mW for balanced.
+ // New GNSS API just expects reasonable GNSS chipset behavior - do something efficient
+ // given the interval. This 100 mW limit should be quite sufficient (esp. given legacy code
+ // implementations may not even use this value.)
+ optionsHw.max_power_allocation_mW = 100;
+ optionsHw.sources_to_use = FLP_TECH_MASK_GNSS_AND_SENSORS;
+ optionsHw.flags = 0;
+ if (options.flags & Flag::WAKEUP_ON_FIFO_FULL) {
+ optionsHw.flags |= FLP_BATCH_WAKEUP_ON_FIFO_FULL;
+ }
+ optionsHw.period_ns = options.periodNanos;
+ optionsHw.smallest_displacement_meters = 0; // Zero offset - just use time interval
+
+ return (mFlpLocationIface->start_batching(FLP_GNSS_BATCHING_CLIENT_ID, &optionsHw)
+ == FLP_RESULT_SUCCESS);
}
Return<void> GnssBatching::flush() {
- // TODO(b/34133439) implement
+ if (mFlpLocationIface == nullptr) {
+ ALOGE("%s: Flp batching interface is unavailable", __func__);
+ return Void();
+ }
+
+ mFlpLocationIface->flush_batched_locations();
+
return Void();
}
Return<bool> GnssBatching::stop() {
- // TODO(b/34133439) implement
- return false;
+ if (mFlpLocationIface == nullptr) {
+ ALOGE("%s: Flp batching interface is unavailable", __func__);
+ return false;
+ }
+
+ return (mFlpLocationIface->stop_batching(FLP_GNSS_BATCHING_CLIENT_ID) == FLP_RESULT_SUCCESS);
}
Return<void> GnssBatching::cleanup() {
- // TODO(b/34133439) implement
+ if (mFlpLocationIface == nullptr) {
+ ALOGE("%s: Flp batching interface is unavailable", __func__);
+ return Void();
+ }
+
+ mFlpLocationIface->cleanup();
+
return Void();
}
diff --git a/gnss/1.0/default/GnssBatching.h b/gnss/1.0/default/GnssBatching.h
index ac3aa99..001c27d 100644
--- a/gnss/1.0/default/GnssBatching.h
+++ b/gnss/1.0/default/GnssBatching.h
@@ -6,7 +6,6 @@
#include <hidl/MQDescriptor.h>
#include <hidl/Status.h>
-
namespace android {
namespace hardware {
namespace gnss {
@@ -35,8 +34,26 @@
Return<bool> stop() override;
Return<void> cleanup() override;
+ /*
+ * Callback methods to be passed into the conventional FLP HAL by the default
+ * implementation. These methods are not part of the IGnssBatching base class.
+ */
+ static void locationCb(int32_t locationsCount, FlpLocation** locations);
+ static void acquireWakelockCb();
+ static void releaseWakelockCb();
+ static int32_t setThreadEventCb(ThreadEvent event);
+ static void flpCapabilitiesCb(int32_t capabilities);
+ static void flpStatusCb(int32_t status);
+
+ /*
+ * Holds function pointers to the callback methods.
+ */
+ static FlpCallbacks sFlpCb;
+
private:
const FlpLocationInterface* mFlpLocationIface = nullptr;
+ static sp<IGnssBatchingCallback> sGnssBatchingCbIface;
+ static bool sFlpSupportsBatching;
};
extern "C" IGnssBatching* HIDL_FETCH_IGnssBatching(const char* name);
diff --git a/gnss/1.0/default/GnssUtils.cpp b/gnss/1.0/default/GnssUtils.cpp
index 82a516b..d9956d6 100644
--- a/gnss/1.0/default/GnssUtils.cpp
+++ b/gnss/1.0/default/GnssUtils.cpp
@@ -51,6 +51,28 @@
return gnssLocation;
}
+GnssLocation convertToGnssLocation(FlpLocation* location) {
+ GnssLocation gnssLocation = {};
+ if (location != nullptr) {
+ gnssLocation = {
+ // Bit mask applied (and 0's below) for same reason as above with GpsLocation
+ .gnssLocationFlags = static_cast<uint16_t>(location->flags & 0x1f),
+ .latitudeDegrees = location->latitude,
+ .longitudeDegrees = location->longitude,
+ .altitudeMeters = location->altitude,
+ .speedMetersPerSec = location->speed,
+ .bearingDegrees = location->bearing,
+ .horizontalAccuracyMeters = location->accuracy,
+ .verticalAccuracyMeters = 0,
+ .speedAccuracyMetersPerSecond = 0,
+ .bearingAccuracyDegrees = 0,
+ .timestamp = location->timestamp
+ };
+ }
+
+ return gnssLocation;
+}
+
} // namespace implementation
} // namespace V1_0
} // namespace gnss
diff --git a/gnss/1.0/default/GnssUtils.h b/gnss/1.0/default/GnssUtils.h
index fc2f547..38d4b2d 100644
--- a/gnss/1.0/default/GnssUtils.h
+++ b/gnss/1.0/default/GnssUtils.h
@@ -16,6 +16,7 @@
#ifndef android_hardware_gnss_V1_0_GnssUtil_H_
#define android_hardware_gnss_V1_0_GnssUtil_H_
+#include <hardware/fused_location.h>
#include <hardware/gps.h>
#include <android/hardware/gnss/1.0/types.h>
@@ -31,6 +32,12 @@
*/
GnssLocation convertToGnssLocation(GpsLocation* location);
+/*
+ * This method converts an FlpLocation struct to a GnssLocation
+ * struct.
+ */
+GnssLocation convertToGnssLocation(FlpLocation* location);
+
} // namespace implementation
} // namespace V1_0
} // namespace gnss
diff --git a/gnss/1.0/default/android.hardware.gnss@1.0-service.rc b/gnss/1.0/default/android.hardware.gnss@1.0-service.rc
index eeb2e43..cf44944 100644
--- a/gnss/1.0/default/android.hardware.gnss@1.0-service.rc
+++ b/gnss/1.0/default/android.hardware.gnss@1.0-service.rc
@@ -1,4 +1,4 @@
-service gnss_service /system/bin/hw/android.hardware.gnss@1.0-service
+service gnss_service /vendor/bin/hw/android.hardware.gnss@1.0-service
class main
user system
group system
diff --git a/graphics/Android.bp b/graphics/Android.bp
index 6d55dd1..eaa47ae 100644
--- a/graphics/Android.bp
+++ b/graphics/Android.bp
@@ -6,6 +6,7 @@
"common/1.0",
"composer/2.1",
"composer/2.1/default",
+ "composer/2.1/vts/functional",
"mapper/2.0",
"mapper/2.0/default",
"mapper/2.0/vts/functional",
diff --git a/graphics/allocator/2.0/Android.bp b/graphics/allocator/2.0/Android.bp
index 48db3e9..69ddd9b 100644
--- a/graphics/allocator/2.0/Android.bp
+++ b/graphics/allocator/2.0/Android.bp
@@ -1,13 +1,20 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
+filegroup {
+ name: "android.hardware.graphics.allocator@2.0_hal",
+ srcs: [
+ "types.hal",
+ "IAllocator.hal",
+ "IAllocatorClient.hal",
+ ],
+}
+
genrule {
name: "android.hardware.graphics.allocator@2.0_genc++",
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.allocator@2.0",
srcs: [
- "types.hal",
- "IAllocator.hal",
- "IAllocatorClient.hal",
+ ":android.hardware.graphics.allocator@2.0_hal",
],
out: [
"android/hardware/graphics/allocator/2.0/types.cpp",
@@ -21,9 +28,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.allocator@2.0",
srcs: [
- "types.hal",
- "IAllocator.hal",
- "IAllocatorClient.hal",
+ ":android.hardware.graphics.allocator@2.0_hal",
],
out: [
"android/hardware/graphics/allocator/2.0/types.h",
@@ -64,159 +69,3 @@
"android.hidl.base@1.0",
],
}
-
-genrule {
- name: "android.hardware.graphics.allocator.vts.driver@2.0_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.allocator@2.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/graphics/allocator/2.0/ $(genDir)/android/hardware/graphics/allocator/2.0/",
- srcs: [
- "types.hal",
- "IAllocator.hal",
- "IAllocatorClient.hal",
- ],
- out: [
- "android/hardware/graphics/allocator/2.0/types.vts.cpp",
- "android/hardware/graphics/allocator/2.0/Allocator.vts.cpp",
- "android/hardware/graphics/allocator/2.0/AllocatorClient.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.graphics.allocator.vts.driver@2.0_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.allocator@2.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/graphics/allocator/2.0/ $(genDir)/android/hardware/graphics/allocator/2.0/",
- srcs: [
- "types.hal",
- "IAllocator.hal",
- "IAllocatorClient.hal",
- ],
- out: [
- "android/hardware/graphics/allocator/2.0/types.vts.h",
- "android/hardware/graphics/allocator/2.0/Allocator.vts.h",
- "android/hardware/graphics/allocator/2.0/AllocatorClient.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.graphics.allocator.vts.driver@2.0",
- generated_sources: ["android.hardware.graphics.allocator.vts.driver@2.0_genc++"],
- generated_headers: ["android.hardware.graphics.allocator.vts.driver@2.0_genc++_headers"],
- export_generated_headers: ["android.hardware.graphics.allocator.vts.driver@2.0_genc++_headers"],
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libvts_common",
- "libvts_datatype",
- "libvts_measurement",
- "libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
- "android.hardware.graphics.common@1.0",
- "android.hidl.base@1.0",
- "android.hardware.graphics.allocator@2.0",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "android.hardware.graphics.common@1.0",
- "android.hidl.base@1.0",
- ],
-}
-
-genrule {
- name: "android.hardware.graphics.allocator@2.0-IAllocator-vts.profiler_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.allocator@2.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/graphics/allocator/2.0/ $(genDir)/android/hardware/graphics/allocator/2.0/",
- srcs: [
- "IAllocator.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/graphics/allocator/2.0/Allocator.vts.cpp",
- "android/hardware/graphics/allocator/2.0/types.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.graphics.allocator@2.0-IAllocator-vts.profiler_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.allocator@2.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/graphics/allocator/2.0/ $(genDir)/android/hardware/graphics/allocator/2.0/",
- srcs: [
- "IAllocator.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/graphics/allocator/2.0/Allocator.vts.h",
- "android/hardware/graphics/allocator/2.0/types.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.graphics.allocator@2.0-IAllocator-vts.profiler",
- generated_sources: ["android.hardware.graphics.allocator@2.0-IAllocator-vts.profiler_genc++"],
- generated_headers: ["android.hardware.graphics.allocator@2.0-IAllocator-vts.profiler_genc++_headers"],
- export_generated_headers: ["android.hardware.graphics.allocator@2.0-IAllocator-vts.profiler_genc++_headers"],
- shared_libs: [
- "libbase",
- "libhidlbase",
- "libhidltransport",
- "libvts_profiling",
- "libvts_multidevice_proto",
- "libprotobuf-cpp-full",
- "android.hardware.graphics.common@1.0",
- "android.hidl.base@1.0",
- "android.hardware.graphics.allocator@2.0",
- ],
-}
-
-genrule {
- name: "android.hardware.graphics.allocator@2.0-IAllocatorClient-vts.profiler_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.allocator@2.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/graphics/allocator/2.0/ $(genDir)/android/hardware/graphics/allocator/2.0/",
- srcs: [
- "IAllocatorClient.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/graphics/allocator/2.0/AllocatorClient.vts.cpp",
- "android/hardware/graphics/allocator/2.0/types.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.graphics.allocator@2.0-IAllocatorClient-vts.profiler_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.allocator@2.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/graphics/allocator/2.0/ $(genDir)/android/hardware/graphics/allocator/2.0/",
- srcs: [
- "IAllocatorClient.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/graphics/allocator/2.0/AllocatorClient.vts.h",
- "android/hardware/graphics/allocator/2.0/types.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.graphics.allocator@2.0-IAllocatorClient-vts.profiler",
- generated_sources: ["android.hardware.graphics.allocator@2.0-IAllocatorClient-vts.profiler_genc++"],
- generated_headers: ["android.hardware.graphics.allocator@2.0-IAllocatorClient-vts.profiler_genc++_headers"],
- export_generated_headers: ["android.hardware.graphics.allocator@2.0-IAllocatorClient-vts.profiler_genc++_headers"],
- shared_libs: [
- "libbase",
- "libhidlbase",
- "libhidltransport",
- "libvts_profiling",
- "libvts_multidevice_proto",
- "libprotobuf-cpp-full",
- "android.hardware.graphics.common@1.0",
- "android.hidl.base@1.0",
- "android.hardware.graphics.allocator@2.0",
- ],
-}
diff --git a/graphics/allocator/2.0/default/Android.bp b/graphics/allocator/2.0/default/Android.bp
index f0c736c..315893f 100644
--- a/graphics/allocator/2.0/default/Android.bp
+++ b/graphics/allocator/2.0/default/Android.bp
@@ -1,5 +1,6 @@
cc_library_shared {
name: "android.hardware.graphics.allocator@2.0-impl",
+ proprietary: true,
relative_install_path: "hw",
srcs: ["Gralloc.cpp"],
cppflags: ["-Wall", "-Wextra"],
@@ -18,6 +19,7 @@
cc_binary {
name: "android.hardware.graphics.allocator@2.0-service",
+ proprietary: true,
relative_install_path: "hw",
srcs: ["service.cpp"],
init_rc: ["android.hardware.graphics.allocator@2.0-service.rc"],
diff --git a/graphics/allocator/2.0/default/android.hardware.graphics.allocator@2.0-service.rc b/graphics/allocator/2.0/default/android.hardware.graphics.allocator@2.0-service.rc
index 8bb0d85..c4715cd 100644
--- a/graphics/allocator/2.0/default/android.hardware.graphics.allocator@2.0-service.rc
+++ b/graphics/allocator/2.0/default/android.hardware.graphics.allocator@2.0-service.rc
@@ -1,4 +1,4 @@
-service gralloc-2-0 /system/bin/hw/android.hardware.graphics.allocator@2.0-service
+service gralloc-2-0 /vendor/bin/hw/android.hardware.graphics.allocator@2.0-service
class hal
user system
group graphics drmrpc readproc
diff --git a/graphics/allocator/2.0/vts/Allocator.vts b/graphics/allocator/2.0/vts/Allocator.vts
index e767cbd..b26876d 100644
--- a/graphics/allocator/2.0/vts/Allocator.vts
+++ b/graphics/allocator/2.0/vts/Allocator.vts
@@ -6,6 +6,8 @@
import: "android.hardware.graphics.allocator@2.0::IAllocatorClient"
import: "android.hardware.graphics.allocator@2.0::types"
+import: "android.hardware.graphics.common@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
attribute: {
@@ -73,8 +75,7 @@
}
return_type_hidl: {
type: TYPE_HIDL_INTERFACE
- predefined_type: "IAllocatorClient"
- is_callback: false
+ predefined_type: "::android::hardware::graphics::allocator::V2_0::IAllocatorClient"
}
callflow: {
entry: true
diff --git a/graphics/allocator/2.0/vts/AllocatorClient.vts b/graphics/allocator/2.0/vts/AllocatorClient.vts
index 2ab19f7..585c36c 100644
--- a/graphics/allocator/2.0/vts/AllocatorClient.vts
+++ b/graphics/allocator/2.0/vts/AllocatorClient.vts
@@ -6,475 +6,10 @@
import: "android.hardware.graphics.allocator@2.0::types"
import: "android.hardware.graphics.common@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
attribute: {
- name: "::android::hardware::graphics::common::V1_0::PixelFormat"
- type: TYPE_ENUM
- enum_value: {
- scalar_type: "int32_t"
-
- enumerator: "RGBA_8888"
- scalar_value: {
- int32_t: 1
- }
- enumerator: "RGBX_8888"
- scalar_value: {
- int32_t: 2
- }
- enumerator: "RGB_888"
- scalar_value: {
- int32_t: 3
- }
- enumerator: "RGB_565"
- scalar_value: {
- int32_t: 4
- }
- enumerator: "BGRA_8888"
- scalar_value: {
- int32_t: 5
- }
- enumerator: "RGBA_FP16"
- scalar_value: {
- int32_t: 22
- }
- enumerator: "YV12"
- scalar_value: {
- int32_t: 842094169
- }
- enumerator: "Y8"
- scalar_value: {
- int32_t: 538982489
- }
- enumerator: "Y16"
- scalar_value: {
- int32_t: 540422489
- }
- enumerator: "RAW16"
- scalar_value: {
- int32_t: 32
- }
- enumerator: "RAW10"
- scalar_value: {
- int32_t: 37
- }
- enumerator: "RAW12"
- scalar_value: {
- int32_t: 38
- }
- enumerator: "RAW_OPAQUE"
- scalar_value: {
- int32_t: 36
- }
- enumerator: "BLOB"
- scalar_value: {
- int32_t: 33
- }
- enumerator: "IMPLEMENTATION_DEFINED"
- scalar_value: {
- int32_t: 34
- }
- enumerator: "YCBCR_420_888"
- scalar_value: {
- int32_t: 35
- }
- enumerator: "YCBCR_422_888"
- scalar_value: {
- int32_t: 39
- }
- enumerator: "YCBCR_444_888"
- scalar_value: {
- int32_t: 40
- }
- enumerator: "FLEX_RGB_888"
- scalar_value: {
- int32_t: 41
- }
- enumerator: "FLEX_RGBA_8888"
- scalar_value: {
- int32_t: 42
- }
- enumerator: "YCBCR_422_SP"
- scalar_value: {
- int32_t: 16
- }
- enumerator: "YCRCB_420_SP"
- scalar_value: {
- int32_t: 17
- }
- enumerator: "YCBCR_422_I"
- scalar_value: {
- int32_t: 20
- }
- enumerator: "JPEG"
- scalar_value: {
- int32_t: 256
- }
- }
- }
-
- attribute: {
- name: "::android::hardware::graphics::common::V1_0::Transform"
- type: TYPE_ENUM
- enum_value: {
- scalar_type: "int32_t"
-
- enumerator: "FLIP_H"
- scalar_value: {
- int32_t: 1
- }
- enumerator: "FLIP_V"
- scalar_value: {
- int32_t: 2
- }
- enumerator: "ROT_90"
- scalar_value: {
- int32_t: 4
- }
- enumerator: "ROT_180"
- scalar_value: {
- int32_t: 3
- }
- enumerator: "ROT_270"
- scalar_value: {
- int32_t: 7
- }
- }
- }
-
- attribute: {
- name: "::android::hardware::graphics::common::V1_0::Dataspace"
- type: TYPE_ENUM
- enum_value: {
- scalar_type: "int32_t"
-
- enumerator: "UNKNOWN"
- scalar_value: {
- int32_t: 0
- }
- enumerator: "ARBITRARY"
- scalar_value: {
- int32_t: 1
- }
- enumerator: "STANDARD_SHIFT"
- scalar_value: {
- int32_t: 16
- }
- enumerator: "STANDARD_MASK"
- scalar_value: {
- int32_t: 4128768
- }
- enumerator: "STANDARD_UNSPECIFIED"
- scalar_value: {
- int32_t: 0
- }
- enumerator: "STANDARD_BT709"
- scalar_value: {
- int32_t: 65536
- }
- enumerator: "STANDARD_BT601_625"
- scalar_value: {
- int32_t: 131072
- }
- enumerator: "STANDARD_BT601_625_UNADJUSTED"
- scalar_value: {
- int32_t: 196608
- }
- enumerator: "STANDARD_BT601_525"
- scalar_value: {
- int32_t: 262144
- }
- enumerator: "STANDARD_BT601_525_UNADJUSTED"
- scalar_value: {
- int32_t: 327680
- }
- enumerator: "STANDARD_BT2020"
- scalar_value: {
- int32_t: 393216
- }
- enumerator: "STANDARD_BT2020_CONSTANT_LUMINANCE"
- scalar_value: {
- int32_t: 458752
- }
- enumerator: "STANDARD_BT470M"
- scalar_value: {
- int32_t: 524288
- }
- enumerator: "STANDARD_FILM"
- scalar_value: {
- int32_t: 589824
- }
- enumerator: "STANDARD_DCI_P3"
- scalar_value: {
- int32_t: 655360
- }
- enumerator: "STANDARD_ADOBE_RGB"
- scalar_value: {
- int32_t: 720896
- }
- enumerator: "TRANSFER_SHIFT"
- scalar_value: {
- int32_t: 22
- }
- enumerator: "TRANSFER_MASK"
- scalar_value: {
- int32_t: 130023424
- }
- enumerator: "TRANSFER_UNSPECIFIED"
- scalar_value: {
- int32_t: 0
- }
- enumerator: "TRANSFER_LINEAR"
- scalar_value: {
- int32_t: 4194304
- }
- enumerator: "TRANSFER_SRGB"
- scalar_value: {
- int32_t: 8388608
- }
- enumerator: "TRANSFER_SMPTE_170M"
- scalar_value: {
- int32_t: 12582912
- }
- enumerator: "TRANSFER_GAMMA2_2"
- scalar_value: {
- int32_t: 16777216
- }
- enumerator: "TRANSFER_GAMMA2_6"
- scalar_value: {
- int32_t: 20971520
- }
- enumerator: "TRANSFER_GAMMA2_8"
- scalar_value: {
- int32_t: 25165824
- }
- enumerator: "TRANSFER_ST2084"
- scalar_value: {
- int32_t: 29360128
- }
- enumerator: "TRANSFER_HLG"
- scalar_value: {
- int32_t: 33554432
- }
- enumerator: "RANGE_SHIFT"
- scalar_value: {
- int32_t: 27
- }
- enumerator: "RANGE_MASK"
- scalar_value: {
- int32_t: 939524096
- }
- enumerator: "RANGE_UNSPECIFIED"
- scalar_value: {
- int32_t: 0
- }
- enumerator: "RANGE_FULL"
- scalar_value: {
- int32_t: 134217728
- }
- enumerator: "RANGE_LIMITED"
- scalar_value: {
- int32_t: 268435456
- }
- enumerator: "RANGE_EXTENDED"
- scalar_value: {
- int32_t: 402653184
- }
- enumerator: "SRGB_LINEAR"
- scalar_value: {
- int32_t: 512
- }
- enumerator: "V0_SRGB_LINEAR"
- scalar_value: {
- int32_t: 138477568
- }
- enumerator: "V0_SCRGB_LINEAR"
- scalar_value: {
- int32_t: 406913024
- }
- enumerator: "SRGB"
- scalar_value: {
- int32_t: 513
- }
- enumerator: "V0_SRGB"
- scalar_value: {
- int32_t: 142671872
- }
- enumerator: "V0_SCRGB"
- scalar_value: {
- int32_t: 411107328
- }
- enumerator: "JFIF"
- scalar_value: {
- int32_t: 257
- }
- enumerator: "V0_JFIF"
- scalar_value: {
- int32_t: 146931712
- }
- enumerator: "BT601_625"
- scalar_value: {
- int32_t: 258
- }
- enumerator: "V0_BT601_625"
- scalar_value: {
- int32_t: 281149440
- }
- enumerator: "BT601_525"
- scalar_value: {
- int32_t: 259
- }
- enumerator: "V0_BT601_525"
- scalar_value: {
- int32_t: 281280512
- }
- enumerator: "BT709"
- scalar_value: {
- int32_t: 260
- }
- enumerator: "V0_BT709"
- scalar_value: {
- int32_t: 281083904
- }
- enumerator: "DCI_P3_LINEAR"
- scalar_value: {
- int32_t: 139067392
- }
- enumerator: "DCI_P3"
- scalar_value: {
- int32_t: 155844608
- }
- enumerator: "DISPLAY_P3_LINEAR"
- scalar_value: {
- int32_t: 139067392
- }
- enumerator: "DISPLAY_P3"
- scalar_value: {
- int32_t: 143261696
- }
- enumerator: "ADOBE_RGB"
- scalar_value: {
- int32_t: 151715840
- }
- enumerator: "BT2020_LINEAR"
- scalar_value: {
- int32_t: 138805248
- }
- enumerator: "BT2020"
- scalar_value: {
- int32_t: 147193856
- }
- enumerator: "DEPTH"
- scalar_value: {
- int32_t: 4096
- }
- }
- }
-
- attribute: {
- name: "::android::hardware::graphics::common::V1_0::ColorMode"
- type: TYPE_ENUM
- enum_value: {
- scalar_type: "int32_t"
-
- enumerator: "NATIVE"
- scalar_value: {
- int32_t: 0
- }
- enumerator: "STANDARD_BT601_625"
- scalar_value: {
- int32_t: 1
- }
- enumerator: "STANDARD_BT601_625_UNADJUSTED"
- scalar_value: {
- int32_t: 2
- }
- enumerator: "STANDARD_BT601_525"
- scalar_value: {
- int32_t: 3
- }
- enumerator: "STANDARD_BT601_525_UNADJUSTED"
- scalar_value: {
- int32_t: 4
- }
- enumerator: "STANDARD_BT709"
- scalar_value: {
- int32_t: 5
- }
- enumerator: "DCI_P3"
- scalar_value: {
- int32_t: 6
- }
- enumerator: "SRGB"
- scalar_value: {
- int32_t: 7
- }
- enumerator: "ADOBE_RGB"
- scalar_value: {
- int32_t: 8
- }
- }
- }
-
- attribute: {
- name: "::android::hardware::graphics::common::V1_0::ColorTransform"
- type: TYPE_ENUM
- enum_value: {
- scalar_type: "int32_t"
-
- enumerator: "IDENTITY"
- scalar_value: {
- int32_t: 0
- }
- enumerator: "ARBITRARY_MATRIX"
- scalar_value: {
- int32_t: 1
- }
- enumerator: "VALUE_INVERSE"
- scalar_value: {
- int32_t: 2
- }
- enumerator: "GRAYSCALE"
- scalar_value: {
- int32_t: 3
- }
- enumerator: "CORRECT_PROTANOPIA"
- scalar_value: {
- int32_t: 4
- }
- enumerator: "CORRECT_DEUTERANOPIA"
- scalar_value: {
- int32_t: 5
- }
- enumerator: "CORRECT_TRITANOPIA"
- scalar_value: {
- int32_t: 6
- }
- }
- }
-
- attribute: {
- name: "::android::hardware::graphics::common::V1_0::Hdr"
- type: TYPE_ENUM
- enum_value: {
- scalar_type: "int32_t"
-
- enumerator: "DOLBY_VISION"
- scalar_value: {
- int32_t: 1
- }
- enumerator: "HDR10"
- scalar_value: {
- int32_t: 2
- }
- enumerator: "HLG"
- scalar_value: {
- int32_t: 3
- }
- }
- }
-
- attribute: {
name: "::android::hardware::graphics::allocator::V2_0::IAllocatorClient::BufferDescriptorInfo"
type: TYPE_STRUCT
struct_value: {
diff --git a/graphics/allocator/2.0/vts/Android.mk b/graphics/allocator/2.0/vts/Android.mk
deleted file mode 100644
index 00fd344..0000000
--- a/graphics/allocator/2.0/vts/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(LOCAL_PATH)/functional/vts/testcases/hal/graphics/allocator/hidl/target/Android.mk
diff --git a/graphics/allocator/2.0/vts/functional/Android.bp b/graphics/allocator/2.0/vts/functional/Android.bp
index 194b228..2f58836 100644
--- a/graphics/allocator/2.0/vts/functional/Android.bp
+++ b/graphics/allocator/2.0/vts/functional/Android.bp
@@ -31,11 +31,7 @@
],
static_libs: ["libgtest"],
cflags: [
- "--coverage",
"-O0",
"-g",
- ],
- ldflags: [
- "--coverage",
- ],
+ ]
}
diff --git a/graphics/allocator/2.0/vts/functional/vts/testcases/hal/graphics/allocator/hidl/target/Android.mk b/graphics/allocator/2.0/vts/functional/vts/testcases/hal/graphics/allocator/hidl/target/Android.mk
deleted file mode 100644
index 2c1617f..0000000
--- a/graphics/allocator/2.0/vts/functional/vts/testcases/hal/graphics/allocator/hidl/target/Android.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := HalGraphicsAllocatorHidlTargetTest
-VTS_CONFIG_SRC_DIR := testcases/hal/graphics/allocator/hidl/target
-include test/vts/tools/build/Android.host_config.mk
diff --git a/graphics/allocator/2.0/vts/functional/vts/testcases/hal/graphics/allocator/hidl/target/AndroidTest.xml b/graphics/allocator/2.0/vts/functional/vts/testcases/hal/graphics/allocator/hidl/target/AndroidTest.xml
deleted file mode 100644
index 4ef2e95..0000000
--- a/graphics/allocator/2.0/vts/functional/vts/testcases/hal/graphics/allocator/hidl/target/AndroidTest.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<configuration description="Config for VTS Graphics Allocator HIDL HAL's basic target-side test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="HalGraphicsAllocatorHidlTargetTest" />
- <option name="binary-test-sources" value="
- _32bit::DATA/nativetest/graphics_allocator_hidl_hal_test/graphics_allocator_hidl_hal_test,
- _64bit::DATA/nativetest64/graphics_allocator_hidl_hal_test/graphics_allocator_hidl_hal_test,
- " />
- <option name="binary-test-type" value="gtest" />
- <option name="test-timeout" value="1m" />
- </test>
-</configuration>
diff --git a/graphics/allocator/2.0/vts/types.vts b/graphics/allocator/2.0/vts/types.vts
index 2b7e47a..4a8376c 100644
--- a/graphics/allocator/2.0/vts/types.vts
+++ b/graphics/allocator/2.0/vts/types.vts
@@ -84,6 +84,10 @@
scalar_value: {
uint64_t: 4194304
}
+ enumerator: "SENSOR_DIRECT_DATA"
+ scalar_value: {
+ uint64_t: 8388608
+ }
}
}
@@ -129,6 +133,10 @@
scalar_value: {
uint64_t: 1048576
}
+ enumerator: "GPU_DATA_BUFFER"
+ scalar_value: {
+ uint64_t: 8388608
+ }
}
}
diff --git a/graphics/common/1.0/Android.bp b/graphics/common/1.0/Android.bp
index b67afd1..99370e8 100644
--- a/graphics/common/1.0/Android.bp
+++ b/graphics/common/1.0/Android.bp
@@ -1,11 +1,18 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
+filegroup {
+ name: "android.hardware.graphics.common@1.0_hal",
+ srcs: [
+ "types.hal",
+ ],
+}
+
genrule {
name: "android.hardware.graphics.common@1.0_genc++",
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.common@1.0",
srcs: [
- "types.hal",
+ ":android.hardware.graphics.common@1.0_hal",
],
out: [
"android/hardware/graphics/common/1.0/types.cpp",
@@ -17,7 +24,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.common@1.0",
srcs: [
- "types.hal",
+ ":android.hardware.graphics.common@1.0_hal",
],
out: [
"android/hardware/graphics/common/1.0/types.h",
diff --git a/graphics/common/1.0/Android.mk b/graphics/common/1.0/Android.mk
index 0fa6dcc..c08053d 100644
--- a/graphics/common/1.0/Android.mk
+++ b/graphics/common/1.0/Android.mk
@@ -8,7 +8,7 @@
LOCAL_MODULE := android.hardware.graphics.common@1.0-java
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -134,7 +134,7 @@
LOCAL_MODULE := android.hardware.graphics.common@1.0-java-static
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -260,7 +260,7 @@
LOCAL_MODULE := android.hardware.graphics.common@1.0-java-constants
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
#
diff --git a/graphics/composer/2.1/Android.bp b/graphics/composer/2.1/Android.bp
index 7216c0f..f309439 100644
--- a/graphics/composer/2.1/Android.bp
+++ b/graphics/composer/2.1/Android.bp
@@ -1,15 +1,22 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
-genrule {
- name: "android.hardware.graphics.composer@2.1_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.composer@2.1",
+filegroup {
+ name: "android.hardware.graphics.composer@2.1_hal",
srcs: [
"types.hal",
"IComposer.hal",
"IComposerCallback.hal",
"IComposerClient.hal",
],
+}
+
+genrule {
+ name: "android.hardware.graphics.composer@2.1_genc++",
+ tools: ["hidl-gen"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.composer@2.1",
+ srcs: [
+ ":android.hardware.graphics.composer@2.1_hal",
+ ],
out: [
"android/hardware/graphics/composer/2.1/types.cpp",
"android/hardware/graphics/composer/2.1/ComposerAll.cpp",
@@ -23,10 +30,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.composer@2.1",
srcs: [
- "types.hal",
- "IComposer.hal",
- "IComposerCallback.hal",
- "IComposerClient.hal",
+ ":android.hardware.graphics.composer@2.1_hal",
],
out: [
"android/hardware/graphics/composer/2.1/types.h",
diff --git a/boot/1.0/vts/functional/Android.mk b/graphics/composer/2.1/Android.mk
similarity index 100%
rename from boot/1.0/vts/functional/Android.mk
rename to graphics/composer/2.1/Android.mk
diff --git a/graphics/composer/2.1/IComposer.hal b/graphics/composer/2.1/IComposer.hal
index 771fc7d..553a537 100644
--- a/graphics/composer/2.1/IComposer.hal
+++ b/graphics/composer/2.1/IComposer.hal
@@ -53,6 +53,9 @@
*
* @return capabilities is a list of supported capabilities.
*/
+ @entry
+ @exit
+ @callflow(next="*")
getCapabilities() generates (vec<Capability> capabilities);
/*
@@ -61,6 +64,9 @@
*
* @return debugInfo is a string of debug information.
*/
+ @entry
+ @exit
+ @callflow(next="*")
dumpDebugInfo() generates (string debugInfo);
/*
@@ -73,5 +79,7 @@
* NO_RESOURCES when no more client can be created currently.
* @return client is the newly created client.
*/
+ @entry
+ @callflow(next="*")
createClient() generates (Error error, IComposerClient client);
};
diff --git a/graphics/composer/2.1/IComposerCallback.hal b/graphics/composer/2.1/IComposerCallback.hal
index a8ca168..541d7eb 100644
--- a/graphics/composer/2.1/IComposerCallback.hal
+++ b/graphics/composer/2.1/IComposerCallback.hal
@@ -44,6 +44,7 @@
* @param connected indicates whether the display is connected or
* disconnected.
*/
+ @callflow(next="*")
onHotplug(Display display, Connection connected);
/*
@@ -57,6 +58,7 @@
*
* @param display is the display to refresh.
*/
+ @callflow(next="*")
oneway onRefresh(Display display);
/*
@@ -68,5 +70,6 @@
* @param timestamp is the CLOCK_MONOTONIC time at which the vsync event
* occurred, in nanoseconds.
*/
+ @callflow(next="*")
oneway onVsync(Display display, int64_t timestamp);
};
diff --git a/graphics/composer/2.1/IComposerClient.hal b/graphics/composer/2.1/IComposerClient.hal
index b0bd837..107ac5e 100644
--- a/graphics/composer/2.1/IComposerClient.hal
+++ b/graphics/composer/2.1/IComposerClient.hal
@@ -240,6 +240,8 @@
*
* @param callback is the IComposerCallback object.
*/
+ @entry
+ @callflow(next="*")
registerCallback(IComposerCallback callback);
/*
@@ -250,6 +252,7 @@
*
* @return count is the maximum number of virtual displays supported.
*/
+ @callflow(next="*")
getMaxVirtualDisplayCount() generates (uint32_t count);
/*
@@ -274,6 +277,7 @@
* @return display is the newly-created virtual display.
* @return format is the format of the buffer the device will produce.
*/
+ @callflow(next="*")
createVirtualDisplay(uint32_t width,
uint32_t height,
PixelFormat formatHint,
@@ -293,6 +297,7 @@
* BAD_PARAMETER when the display handle which was passed in does
* not refer to a virtual display.
*/
+ @callflow(next="*")
destroyVirtualDisplay(Display display) generates (Error error);
/*
@@ -306,6 +311,7 @@
* time.
* @return layer is the handle of the new layer.
*/
+ @callflow(next="*")
createLayer(Display display,
uint32_t bufferSlotCount)
generates (Error error,
@@ -320,6 +326,7 @@
* BAD_DISPLAY when an invalid display handle was passed in.
* BAD_LAYER when an invalid layer handle was passed in.
*/
+ @callflow(next="*")
destroyLayer(Display display, Layer layer) generates (Error error);
/*
@@ -336,6 +343,7 @@
* BAD_CONFIG when no configuration is currently active.
* @return config is the currently active display configuration.
*/
+ @callflow(next="*")
getActiveConfig(Display display) generates (Error error, Config config);
/*
@@ -357,6 +365,7 @@
* BAD_DISPLAY when an invalid display handle was passed in.
* UNSUPPORTED when the given configuration is not supported.
*/
+ @callflow(next="*")
getClientTargetSupport(Display display,
uint32_t width,
uint32_t height,
@@ -374,6 +383,7 @@
* BAD_DISPLAY when an invalid display handle was passed in.
* @return modes is an array of color modes.
*/
+ @callflow(next="*")
getColorModes(Display display)
generates (Error error,
vec<ColorMode> modes);
@@ -393,6 +403,7 @@
* UNSUPPORTED when attribute cannot be queried for the config.
* @return value is the value of the attribute.
*/
+ @callflow(next="*")
getDisplayAttribute(Display display,
Config config,
Attribute attribute)
@@ -408,6 +419,7 @@
* BAD_DISPLAY when an invalid display handle was passed in.
* @return configs is an array of configuration handles.
*/
+ @callflow(next="*")
getDisplayConfigs(Display display)
generates (Error error,
vec<Config> configs);
@@ -419,6 +431,7 @@
* BAD_DISPLAY when an invalid display handle was passed in.
* @return name is the name of the display.
*/
+ @callflow(next="*")
getDisplayName(Display display) generates (Error error, string name);
/*
@@ -429,6 +442,7 @@
* BAD_DISPLAY when an invalid display handle was passed in.
* @return type is the type of the display.
*/
+ @callflow(next="*")
getDisplayType(Display display) generates (Error error, DisplayType type);
/*
@@ -443,6 +457,7 @@
* BAD_DISPLAY when an invalid display handle was passed in.
* @return support is true only when the display supports doze modes.
*/
+ @callflow(next="*")
getDozeSupport(Display display) generates (Error error, bool support);
/*
@@ -463,6 +478,7 @@
* @return minLuminance is the desired content minimum luminance for this
* display in cd/m^2.
*/
+ @callflow(next="*")
getHdrCapabilities(Display display)
generates (Error error,
vec<Hdr> types,
@@ -479,6 +495,7 @@
* BAD_DISPLAY when an invalid display handle was passed in.
* NO_RESOURCES when unable to reserve the slots.
*/
+ @callflow(next="*")
setClientTargetSlotCount(Display display,
uint32_t clientTargetSlotCount)
generates (Error error);
@@ -495,6 +512,7 @@
* BAD_CONFIG when the configuration handle passed in is not valid
* for this display.
*/
+ @callflow(next="*")
setActiveConfig(Display display, Config config) generates (Error error);
/*
@@ -513,6 +531,7 @@
* BAD_PARAMETER when mode is not a valid color mode.
* UNSUPPORTED when mode is not supported on this display.
*/
+ @callflow(next="*")
setColorMode(Display display, ColorMode mode) generates (Error error);
/*
@@ -531,6 +550,7 @@
* BAD_PARAMETER when mode was not a valid power mode.
* UNSUPPORTED when mode is not supported on this display.
*/
+ @callflow(next="*")
setPowerMode(Display display, PowerMode mode) generates (Error error);
/*
@@ -545,6 +565,7 @@
* BAD_DISPLAY when an invalid display handle was passed in.
* BAD_PARAMETER when enabled was an invalid value.
*/
+ @callflow(next="*")
setVsyncEnabled(Display display, Vsync enabled) generates (Error error);
/*
@@ -554,6 +575,7 @@
* @return error is NONE upon success. Otherwise,
* NO_RESOURCES when failed to set the queue temporarily.
*/
+ @callflow(next="*")
setInputCommandQueue(fmq_sync<uint32_t> descriptor)
generates (Error error);
@@ -566,6 +588,7 @@
* NO_RESOURCES when failed to get the queue temporarily.
* @return descriptor is the descriptor of the output command queue.
*/
+ @callflow(next="*")
getOutputCommandQueue()
generates (Error error,
fmq_sync<uint32_t> descriptor);
@@ -589,6 +612,7 @@
* @param outHandles is an array of handles referenced by the output
* commands.
*/
+ @callflow(next="*")
executeCommands(uint32_t inLength,
vec<handle> inHandles)
generates (Error error,
diff --git a/graphics/composer/2.1/default/Android.bp b/graphics/composer/2.1/default/Android.bp
index a366fa2..4a5c70d 100644
--- a/graphics/composer/2.1/default/Android.bp
+++ b/graphics/composer/2.1/default/Android.bp
@@ -2,7 +2,6 @@
name: "libhwcomposer-client",
export_include_dirs: ["."],
srcs: ["ComposerClient.cpp"],
- cppflags: ["-DBINDERIZED"],
shared_libs: [
"android.hardware.graphics.allocator@2.0",
"android.hardware.graphics.composer@2.1",
@@ -21,8 +20,10 @@
cc_library_shared {
name: "android.hardware.graphics.composer@2.1-impl",
+ proprietary: true,
relative_install_path: "hw",
- srcs: ["Hwc.cpp", "ComposerClient.cpp"],
+ srcs: ["Hwc.cpp"],
+ static_libs: ["libhwcomposer-client"],
shared_libs: [
"android.hardware.graphics.allocator@2.0",
"android.hardware.graphics.composer@2.1",
@@ -41,14 +42,11 @@
cc_binary {
name: "android.hardware.graphics.composer@2.1-service",
+ proprietary: true,
relative_install_path: "hw",
- srcs: ["service.cpp", "Hwc.cpp"],
- cppflags: ["-DBINDERIZED"],
+ srcs: ["service.cpp"],
init_rc: ["android.hardware.graphics.composer@2.1-service.rc"],
-
- static_libs: [
- "libhwcomposer-client",
- ],
+ static_libs: ["libhwcomposer-client"],
shared_libs: [
"android.hardware.graphics.allocator@2.0",
"android.hardware.graphics.composer@2.1",
diff --git a/graphics/composer/2.1/default/ComposerClient.cpp b/graphics/composer/2.1/default/ComposerClient.cpp
index 49415ee..7a2cb25 100644
--- a/graphics/composer/2.1/default/ComposerClient.cpp
+++ b/graphics/composer/2.1/default/ComposerClient.cpp
@@ -99,7 +99,6 @@
// Some existing gralloc drivers do not support retaining more than once,
// when we are in passthrough mode.
-#ifdef BINDERIZED
bool openGralloc()
{
const hw_module_t* module = nullptr;
@@ -188,12 +187,6 @@
// gralloc0
const gralloc_module_t* mModule;
-#else
- bool openGralloc() { return true; }
- void closeGralloc() {}
- buffer_handle_t cloneBuffer(buffer_handle_t handle) { return handle; }
- void releaseBuffer(buffer_handle_t) {}
-#endif
};
HandleImporter sHandleImporter;
diff --git a/graphics/composer/2.1/default/android.hardware.graphics.composer@2.1-service.rc b/graphics/composer/2.1/default/android.hardware.graphics.composer@2.1-service.rc
index fc21d59..4f01bd9 100644
--- a/graphics/composer/2.1/default/android.hardware.graphics.composer@2.1-service.rc
+++ b/graphics/composer/2.1/default/android.hardware.graphics.composer@2.1-service.rc
@@ -1,5 +1,6 @@
-service hwcomposer-2-1 /system/bin/hw/android.hardware.graphics.composer@2.1-service
+service hwcomposer-2-1 /vendor/bin/hw/android.hardware.graphics.composer@2.1-service
class hal
user system
group graphics drmrpc readproc
+ capabilities SYS_NICE
onrestart restart surfaceflinger
diff --git a/graphics/composer/2.1/default/service.cpp b/graphics/composer/2.1/default/service.cpp
index c2a2b19..656673e 100644
--- a/graphics/composer/2.1/default/service.cpp
+++ b/graphics/composer/2.1/default/service.cpp
@@ -14,41 +14,30 @@
* limitations under the License.
*/
-#define LOG_TAG "HWComposerService"
+#define LOG_TAG "android.hardware.graphics.composer@2.1-service"
+
+#include <sched.h>
+
+#include <android/hardware/graphics/composer/2.1/IComposer.h>
#include <binder/ProcessState.h>
-#include <hidl/HidlTransportSupport.h>
-#include <utils/StrongPointer.h>
-#include "Hwc.h"
+#include <hidl/LegacySupport.h>
-using android::hardware::configureRpcThreadpool;
-using android::hardware::joinRpcThreadpool;
-using android::sp;
using android::hardware::graphics::composer::V2_1::IComposer;
-using android::hardware::graphics::composer::V2_1::implementation::HIDL_FETCH_IComposer;
+using android::hardware::defaultPassthroughServiceImplementation;
-int main()
-{
- const char instance[] = "hwcomposer";
-
- ALOGI("Service is starting.");
-
- configureRpcThreadpool(1, true /* callerWillJoin */);
- sp<IComposer> service = HIDL_FETCH_IComposer(instance);
- if (service == nullptr) {
- ALOGI("getService returned NULL");
- return -1;
- }
-
- LOG_FATAL_IF(service->isRemote(), "Service is REMOTE!");
-
- service->registerAsService(instance);
-
+int main() {
// the conventional HAL might start binder services
android::ProcessState::self()->setThreadPoolMaxThreadCount(4);
android::ProcessState::self()->startThreadPool();
- joinRpcThreadpool();
+ // same as SF main thread
+ struct sched_param param = {0};
+ param.sched_priority = 2;
+ if (sched_setscheduler(0, SCHED_FIFO | SCHED_RESET_ON_FORK,
+ ¶m) != 0) {
+ ALOGE("Couldn't set SCHED_FIFO: %d", errno);
+ }
- return 0;
+ return defaultPassthroughServiceImplementation<IComposer>("hwcomposer");
}
diff --git a/graphics/composer/2.1/vts/Composer.vts b/graphics/composer/2.1/vts/Composer.vts
new file mode 100644
index 0000000..e60e39c
--- /dev/null
+++ b/graphics/composer/2.1/vts/Composer.vts
@@ -0,0 +1,89 @@
+component_class: HAL_HIDL
+component_type_version: 2.1
+component_name: "IComposer"
+
+package: "android.hardware.graphics.composer"
+
+import: "android.hardware.graphics.common@1.0::types"
+import: "android.hardware.graphics.composer@2.1::IComposerCallback"
+import: "android.hardware.graphics.composer@2.1::IComposerClient"
+import: "android.hardware.graphics.composer@2.1::types"
+import: "android.hidl.base@1.0::types"
+
+interface: {
+ attribute: {
+ name: "::android::hardware::graphics::composer::V2_1::IComposer::Capability"
+ type: TYPE_ENUM
+ enum_value: {
+ scalar_type: "int32_t"
+
+ enumerator: "INVALID"
+ scalar_value: {
+ int32_t: 0
+ }
+ enumerator: "SIDEBAND_STREAM"
+ scalar_value: {
+ int32_t: 1
+ }
+ enumerator: "SKIP_CLIENT_COLOR_TRANSFORM"
+ scalar_value: {
+ int32_t: 2
+ }
+ }
+ }
+
+ api: {
+ name: "getCapabilities"
+ return_type_hidl: {
+ type: TYPE_VECTOR
+ vector_value: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::graphics::composer::V2_1::IComposer::Capability"
+ }
+ }
+ callflow: {
+ entry: true
+ }
+ callflow: {
+ exit: true
+ }
+ callflow: {
+ next: "*"
+ }
+ }
+
+ api: {
+ name: "dumpDebugInfo"
+ return_type_hidl: {
+ type: TYPE_STRING
+ }
+ callflow: {
+ entry: true
+ }
+ callflow: {
+ exit: true
+ }
+ callflow: {
+ next: "*"
+ }
+ }
+
+ api: {
+ name: "createClient"
+ return_type_hidl: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::graphics::composer::V2_1::Error"
+ }
+ return_type_hidl: {
+ type: TYPE_HIDL_INTERFACE
+ predefined_type: "::android::hardware::graphics::composer::V2_1::IComposerClient"
+ }
+ callflow: {
+ entry: true
+ }
+ callflow: {
+ next: "*"
+ }
+ }
+
+}
diff --git a/graphics/composer/2.1/vts/ComposerCallback.vts b/graphics/composer/2.1/vts/ComposerCallback.vts
new file mode 100644
index 0000000..b83cf94
--- /dev/null
+++ b/graphics/composer/2.1/vts/ComposerCallback.vts
@@ -0,0 +1,73 @@
+component_class: HAL_HIDL
+component_type_version: 2.1
+component_name: "IComposerCallback"
+
+package: "android.hardware.graphics.composer"
+
+import: "android.hardware.graphics.composer@2.1::types"
+import: "android.hidl.base@1.0::types"
+
+interface: {
+ attribute: {
+ name: "::android::hardware::graphics::composer::V2_1::IComposerCallback::Connection"
+ type: TYPE_ENUM
+ enum_value: {
+ scalar_type: "int32_t"
+
+ enumerator: "INVALID"
+ scalar_value: {
+ int32_t: 0
+ }
+ enumerator: "CONNECTED"
+ scalar_value: {
+ int32_t: 1
+ }
+ enumerator: "DISCONNECTED"
+ scalar_value: {
+ int32_t: 2
+ }
+ }
+ }
+
+ api: {
+ name: "onHotplug"
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint64_t"
+ }
+ arg: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::graphics::composer::V2_1::IComposerCallback::Connection"
+ }
+ callflow: {
+ next: "*"
+ }
+ }
+
+ api: {
+ name: "onRefresh"
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint64_t"
+ }
+ callflow: {
+ next: "*"
+ }
+ }
+
+ api: {
+ name: "onVsync"
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint64_t"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "int64_t"
+ }
+ callflow: {
+ next: "*"
+ }
+ }
+
+}
diff --git a/graphics/composer/2.1/vts/ComposerClient.vts b/graphics/composer/2.1/vts/ComposerClient.vts
new file mode 100644
index 0000000..ac1d7fb
--- /dev/null
+++ b/graphics/composer/2.1/vts/ComposerClient.vts
@@ -0,0 +1,916 @@
+component_class: HAL_HIDL
+component_type_version: 2.1
+component_name: "IComposerClient"
+
+package: "android.hardware.graphics.composer"
+
+import: "android.hardware.graphics.common@1.0::types"
+import: "android.hardware.graphics.composer@2.1::IComposerCallback"
+import: "android.hardware.graphics.composer@2.1::types"
+import: "android.hidl.base@1.0::types"
+
+interface: {
+ attribute: {
+ name: "::android::hardware::graphics::composer::V2_1::IComposerClient::Attribute"
+ type: TYPE_ENUM
+ enum_value: {
+ scalar_type: "int32_t"
+
+ enumerator: "INVALID"
+ scalar_value: {
+ int32_t: 0
+ }
+ enumerator: "WIDTH"
+ scalar_value: {
+ int32_t: 1
+ }
+ enumerator: "HEIGHT"
+ scalar_value: {
+ int32_t: 2
+ }
+ enumerator: "VSYNC_PERIOD"
+ scalar_value: {
+ int32_t: 3
+ }
+ enumerator: "DPI_X"
+ scalar_value: {
+ int32_t: 4
+ }
+ enumerator: "DPI_Y"
+ scalar_value: {
+ int32_t: 5
+ }
+ }
+ }
+
+ attribute: {
+ name: "::android::hardware::graphics::composer::V2_1::IComposerClient::DisplayRequest"
+ type: TYPE_ENUM
+ enum_value: {
+ scalar_type: "uint32_t"
+
+ enumerator: "FLIP_CLIENT_TARGET"
+ scalar_value: {
+ uint32_t: 1
+ }
+ enumerator: "WRITE_CLIENT_TARGET_TO_OUTPUT"
+ scalar_value: {
+ uint32_t: 2
+ }
+ }
+ }
+
+ attribute: {
+ name: "::android::hardware::graphics::composer::V2_1::IComposerClient::LayerRequest"
+ type: TYPE_ENUM
+ enum_value: {
+ scalar_type: "uint32_t"
+
+ enumerator: "CLEAR_CLIENT_TARGET"
+ scalar_value: {
+ uint32_t: 1
+ }
+ }
+ }
+
+ attribute: {
+ name: "::android::hardware::graphics::composer::V2_1::IComposerClient::PowerMode"
+ type: TYPE_ENUM
+ enum_value: {
+ scalar_type: "int32_t"
+
+ enumerator: "OFF"
+ scalar_value: {
+ int32_t: 0
+ }
+ enumerator: "DOZE"
+ scalar_value: {
+ int32_t: 1
+ }
+ enumerator: "DOZE_SUSPEND"
+ scalar_value: {
+ int32_t: 3
+ }
+ enumerator: "ON"
+ scalar_value: {
+ int32_t: 2
+ }
+ }
+ }
+
+ attribute: {
+ name: "::android::hardware::graphics::composer::V2_1::IComposerClient::Vsync"
+ type: TYPE_ENUM
+ enum_value: {
+ scalar_type: "int32_t"
+
+ enumerator: "INVALID"
+ scalar_value: {
+ int32_t: 0
+ }
+ enumerator: "ENABLE"
+ scalar_value: {
+ int32_t: 1
+ }
+ enumerator: "DISABLE"
+ scalar_value: {
+ int32_t: 2
+ }
+ }
+ }
+
+ attribute: {
+ name: "::android::hardware::graphics::composer::V2_1::IComposerClient::BlendMode"
+ type: TYPE_ENUM
+ enum_value: {
+ scalar_type: "int32_t"
+
+ enumerator: "INVALID"
+ scalar_value: {
+ int32_t: 0
+ }
+ enumerator: "NONE"
+ scalar_value: {
+ int32_t: 1
+ }
+ enumerator: "PREMULTIPLIED"
+ scalar_value: {
+ int32_t: 2
+ }
+ enumerator: "COVERAGE"
+ scalar_value: {
+ int32_t: 3
+ }
+ }
+ }
+
+ attribute: {
+ name: "::android::hardware::graphics::composer::V2_1::IComposerClient::Composition"
+ type: TYPE_ENUM
+ enum_value: {
+ scalar_type: "int32_t"
+
+ enumerator: "INVALID"
+ scalar_value: {
+ int32_t: 0
+ }
+ enumerator: "CLIENT"
+ scalar_value: {
+ int32_t: 1
+ }
+ enumerator: "DEVICE"
+ scalar_value: {
+ int32_t: 2
+ }
+ enumerator: "SOLID_COLOR"
+ scalar_value: {
+ int32_t: 3
+ }
+ enumerator: "CURSOR"
+ scalar_value: {
+ int32_t: 4
+ }
+ enumerator: "SIDEBAND"
+ scalar_value: {
+ int32_t: 5
+ }
+ }
+ }
+
+ attribute: {
+ name: "::android::hardware::graphics::composer::V2_1::IComposerClient::DisplayType"
+ type: TYPE_ENUM
+ enum_value: {
+ scalar_type: "int32_t"
+
+ enumerator: "INVALID"
+ scalar_value: {
+ int32_t: 0
+ }
+ enumerator: "PHYSICAL"
+ scalar_value: {
+ int32_t: 1
+ }
+ enumerator: "VIRTUAL"
+ scalar_value: {
+ int32_t: 2
+ }
+ }
+ }
+
+ attribute: {
+ name: "::android::hardware::graphics::composer::V2_1::IComposerClient::HandleIndex"
+ type: TYPE_ENUM
+ enum_value: {
+ scalar_type: "int32_t"
+
+ enumerator: "EMPTY"
+ scalar_value: {
+ int32_t: -1
+ }
+ enumerator: "CACHED"
+ scalar_value: {
+ int32_t: -2
+ }
+ }
+ }
+
+ attribute: {
+ name: "::android::hardware::graphics::composer::V2_1::IComposerClient::Rect"
+ type: TYPE_STRUCT
+ struct_value: {
+ name: "left"
+ type: TYPE_SCALAR
+ scalar_type: "int32_t"
+ }
+ struct_value: {
+ name: "top"
+ type: TYPE_SCALAR
+ scalar_type: "int32_t"
+ }
+ struct_value: {
+ name: "right"
+ type: TYPE_SCALAR
+ scalar_type: "int32_t"
+ }
+ struct_value: {
+ name: "bottom"
+ type: TYPE_SCALAR
+ scalar_type: "int32_t"
+ }
+ }
+
+ attribute: {
+ name: "::android::hardware::graphics::composer::V2_1::IComposerClient::FRect"
+ type: TYPE_STRUCT
+ struct_value: {
+ name: "left"
+ type: TYPE_SCALAR
+ scalar_type: "float_t"
+ }
+ struct_value: {
+ name: "top"
+ type: TYPE_SCALAR
+ scalar_type: "float_t"
+ }
+ struct_value: {
+ name: "right"
+ type: TYPE_SCALAR
+ scalar_type: "float_t"
+ }
+ struct_value: {
+ name: "bottom"
+ type: TYPE_SCALAR
+ scalar_type: "float_t"
+ }
+ }
+
+ attribute: {
+ name: "::android::hardware::graphics::composer::V2_1::IComposerClient::Color"
+ type: TYPE_STRUCT
+ struct_value: {
+ name: "r"
+ type: TYPE_SCALAR
+ scalar_type: "uint8_t"
+ }
+ struct_value: {
+ name: "g"
+ type: TYPE_SCALAR
+ scalar_type: "uint8_t"
+ }
+ struct_value: {
+ name: "b"
+ type: TYPE_SCALAR
+ scalar_type: "uint8_t"
+ }
+ struct_value: {
+ name: "a"
+ type: TYPE_SCALAR
+ scalar_type: "uint8_t"
+ }
+ }
+
+ attribute: {
+ name: "::android::hardware::graphics::composer::V2_1::IComposerClient::Command"
+ type: TYPE_ENUM
+ enum_value: {
+ scalar_type: "int32_t"
+
+ enumerator: "LENGTH_MASK"
+ scalar_value: {
+ int32_t: 65535
+ }
+ enumerator: "OPCODE_SHIFT"
+ scalar_value: {
+ int32_t: 16
+ }
+ enumerator: "OPCODE_MASK"
+ scalar_value: {
+ int32_t: -65536
+ }
+ enumerator: "SELECT_DISPLAY"
+ scalar_value: {
+ int32_t: 0
+ }
+ enumerator: "SELECT_LAYER"
+ scalar_value: {
+ int32_t: 65536
+ }
+ enumerator: "SET_ERROR"
+ scalar_value: {
+ int32_t: 16777216
+ }
+ enumerator: "SET_CHANGED_COMPOSITION_TYPES"
+ scalar_value: {
+ int32_t: 16842752
+ }
+ enumerator: "SET_DISPLAY_REQUESTS"
+ scalar_value: {
+ int32_t: 16908288
+ }
+ enumerator: "SET_PRESENT_FENCE"
+ scalar_value: {
+ int32_t: 16973824
+ }
+ enumerator: "SET_RELEASE_FENCES"
+ scalar_value: {
+ int32_t: 17039360
+ }
+ enumerator: "SET_COLOR_TRANSFORM"
+ scalar_value: {
+ int32_t: 33554432
+ }
+ enumerator: "SET_CLIENT_TARGET"
+ scalar_value: {
+ int32_t: 33619968
+ }
+ enumerator: "SET_OUTPUT_BUFFER"
+ scalar_value: {
+ int32_t: 33685504
+ }
+ enumerator: "VALIDATE_DISPLAY"
+ scalar_value: {
+ int32_t: 33751040
+ }
+ enumerator: "ACCEPT_DISPLAY_CHANGES"
+ scalar_value: {
+ int32_t: 33816576
+ }
+ enumerator: "PRESENT_DISPLAY"
+ scalar_value: {
+ int32_t: 33882112
+ }
+ enumerator: "SET_LAYER_CURSOR_POSITION"
+ scalar_value: {
+ int32_t: 50331648
+ }
+ enumerator: "SET_LAYER_BUFFER"
+ scalar_value: {
+ int32_t: 50397184
+ }
+ enumerator: "SET_LAYER_SURFACE_DAMAGE"
+ scalar_value: {
+ int32_t: 50462720
+ }
+ enumerator: "SET_LAYER_BLEND_MODE"
+ scalar_value: {
+ int32_t: 67108864
+ }
+ enumerator: "SET_LAYER_COLOR"
+ scalar_value: {
+ int32_t: 67174400
+ }
+ enumerator: "SET_LAYER_COMPOSITION_TYPE"
+ scalar_value: {
+ int32_t: 67239936
+ }
+ enumerator: "SET_LAYER_DATASPACE"
+ scalar_value: {
+ int32_t: 67305472
+ }
+ enumerator: "SET_LAYER_DISPLAY_FRAME"
+ scalar_value: {
+ int32_t: 67371008
+ }
+ enumerator: "SET_LAYER_PLANE_ALPHA"
+ scalar_value: {
+ int32_t: 67436544
+ }
+ enumerator: "SET_LAYER_SIDEBAND_STREAM"
+ scalar_value: {
+ int32_t: 67502080
+ }
+ enumerator: "SET_LAYER_SOURCE_CROP"
+ scalar_value: {
+ int32_t: 67567616
+ }
+ enumerator: "SET_LAYER_TRANSFORM"
+ scalar_value: {
+ int32_t: 67633152
+ }
+ enumerator: "SET_LAYER_VISIBLE_REGION"
+ scalar_value: {
+ int32_t: 67698688
+ }
+ enumerator: "SET_LAYER_Z_ORDER"
+ scalar_value: {
+ int32_t: 67764224
+ }
+ }
+ }
+
+ api: {
+ name: "registerCallback"
+ arg: {
+ type: TYPE_HIDL_CALLBACK
+ predefined_type: "::android::hardware::graphics::composer::V2_1::IComposerCallback"
+ }
+ callflow: {
+ entry: true
+ }
+ callflow: {
+ next: "*"
+ }
+ }
+
+ api: {
+ name: "getMaxVirtualDisplayCount"
+ return_type_hidl: {
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+ callflow: {
+ next: "*"
+ }
+ }
+
+ api: {
+ name: "createVirtualDisplay"
+ return_type_hidl: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::graphics::composer::V2_1::Error"
+ }
+ return_type_hidl: {
+ type: TYPE_SCALAR
+ scalar_type: "uint64_t"
+ }
+ return_type_hidl: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::graphics::common::V1_0::PixelFormat"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+ arg: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::graphics::common::V1_0::PixelFormat"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+ callflow: {
+ next: "*"
+ }
+ }
+
+ api: {
+ name: "destroyVirtualDisplay"
+ return_type_hidl: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::graphics::composer::V2_1::Error"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint64_t"
+ }
+ callflow: {
+ next: "*"
+ }
+ }
+
+ api: {
+ name: "createLayer"
+ return_type_hidl: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::graphics::composer::V2_1::Error"
+ }
+ return_type_hidl: {
+ type: TYPE_SCALAR
+ scalar_type: "uint64_t"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint64_t"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+ callflow: {
+ next: "*"
+ }
+ }
+
+ api: {
+ name: "destroyLayer"
+ return_type_hidl: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::graphics::composer::V2_1::Error"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint64_t"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint64_t"
+ }
+ callflow: {
+ next: "*"
+ }
+ }
+
+ api: {
+ name: "getActiveConfig"
+ return_type_hidl: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::graphics::composer::V2_1::Error"
+ }
+ return_type_hidl: {
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint64_t"
+ }
+ callflow: {
+ next: "*"
+ }
+ }
+
+ api: {
+ name: "getClientTargetSupport"
+ return_type_hidl: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::graphics::composer::V2_1::Error"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint64_t"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+ arg: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::graphics::common::V1_0::PixelFormat"
+ }
+ arg: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::graphics::common::V1_0::Dataspace"
+ }
+ callflow: {
+ next: "*"
+ }
+ }
+
+ api: {
+ name: "getColorModes"
+ return_type_hidl: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::graphics::composer::V2_1::Error"
+ }
+ return_type_hidl: {
+ type: TYPE_VECTOR
+ vector_value: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::graphics::common::V1_0::ColorMode"
+ }
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint64_t"
+ }
+ callflow: {
+ next: "*"
+ }
+ }
+
+ api: {
+ name: "getDisplayAttribute"
+ return_type_hidl: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::graphics::composer::V2_1::Error"
+ }
+ return_type_hidl: {
+ type: TYPE_SCALAR
+ scalar_type: "int32_t"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint64_t"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+ arg: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::graphics::composer::V2_1::IComposerClient::Attribute"
+ }
+ callflow: {
+ next: "*"
+ }
+ }
+
+ api: {
+ name: "getDisplayConfigs"
+ return_type_hidl: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::graphics::composer::V2_1::Error"
+ }
+ return_type_hidl: {
+ type: TYPE_VECTOR
+ vector_value: {
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint64_t"
+ }
+ callflow: {
+ next: "*"
+ }
+ }
+
+ api: {
+ name: "getDisplayName"
+ return_type_hidl: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::graphics::composer::V2_1::Error"
+ }
+ return_type_hidl: {
+ type: TYPE_STRING
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint64_t"
+ }
+ callflow: {
+ next: "*"
+ }
+ }
+
+ api: {
+ name: "getDisplayType"
+ return_type_hidl: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::graphics::composer::V2_1::Error"
+ }
+ return_type_hidl: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::graphics::composer::V2_1::IComposerClient::DisplayType"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint64_t"
+ }
+ callflow: {
+ next: "*"
+ }
+ }
+
+ api: {
+ name: "getDozeSupport"
+ return_type_hidl: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::graphics::composer::V2_1::Error"
+ }
+ return_type_hidl: {
+ type: TYPE_SCALAR
+ scalar_type: "bool_t"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint64_t"
+ }
+ callflow: {
+ next: "*"
+ }
+ }
+
+ api: {
+ name: "getHdrCapabilities"
+ return_type_hidl: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::graphics::composer::V2_1::Error"
+ }
+ return_type_hidl: {
+ type: TYPE_VECTOR
+ vector_value: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::graphics::common::V1_0::Hdr"
+ }
+ }
+ return_type_hidl: {
+ type: TYPE_SCALAR
+ scalar_type: "float_t"
+ }
+ return_type_hidl: {
+ type: TYPE_SCALAR
+ scalar_type: "float_t"
+ }
+ return_type_hidl: {
+ type: TYPE_SCALAR
+ scalar_type: "float_t"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint64_t"
+ }
+ callflow: {
+ next: "*"
+ }
+ }
+
+ api: {
+ name: "setClientTargetSlotCount"
+ return_type_hidl: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::graphics::composer::V2_1::Error"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint64_t"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+ callflow: {
+ next: "*"
+ }
+ }
+
+ api: {
+ name: "setActiveConfig"
+ return_type_hidl: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::graphics::composer::V2_1::Error"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint64_t"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+ callflow: {
+ next: "*"
+ }
+ }
+
+ api: {
+ name: "setColorMode"
+ return_type_hidl: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::graphics::composer::V2_1::Error"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint64_t"
+ }
+ arg: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::graphics::common::V1_0::ColorMode"
+ }
+ callflow: {
+ next: "*"
+ }
+ }
+
+ api: {
+ name: "setPowerMode"
+ return_type_hidl: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::graphics::composer::V2_1::Error"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint64_t"
+ }
+ arg: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::graphics::composer::V2_1::IComposerClient::PowerMode"
+ }
+ callflow: {
+ next: "*"
+ }
+ }
+
+ api: {
+ name: "setVsyncEnabled"
+ return_type_hidl: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::graphics::composer::V2_1::Error"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint64_t"
+ }
+ arg: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::graphics::composer::V2_1::IComposerClient::Vsync"
+ }
+ callflow: {
+ next: "*"
+ }
+ }
+
+ api: {
+ name: "setInputCommandQueue"
+ return_type_hidl: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::graphics::composer::V2_1::Error"
+ }
+ arg: {
+ type: TYPE_FMQ_SYNC
+ fmq_value: {
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+ }
+ callflow: {
+ next: "*"
+ }
+ }
+
+ api: {
+ name: "getOutputCommandQueue"
+ return_type_hidl: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::graphics::composer::V2_1::Error"
+ }
+ return_type_hidl: {
+ type: TYPE_FMQ_SYNC
+ fmq_value: {
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+ }
+ callflow: {
+ next: "*"
+ }
+ }
+
+ api: {
+ name: "executeCommands"
+ return_type_hidl: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::graphics::composer::V2_1::Error"
+ }
+ return_type_hidl: {
+ type: TYPE_SCALAR
+ scalar_type: "bool_t"
+ }
+ return_type_hidl: {
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+ return_type_hidl: {
+ type: TYPE_VECTOR
+ vector_value: {
+ type: TYPE_HANDLE
+ }
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+ arg: {
+ type: TYPE_VECTOR
+ vector_value: {
+ type: TYPE_HANDLE
+ }
+ }
+ callflow: {
+ next: "*"
+ }
+ }
+
+}
diff --git a/graphics/composer/2.1/vts/functional/Android.bp b/graphics/composer/2.1/vts/functional/Android.bp
new file mode 100644
index 0000000..aa2eae3
--- /dev/null
+++ b/graphics/composer/2.1/vts/functional/Android.bp
@@ -0,0 +1,41 @@
+//
+// Copyright (C) 2016 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.
+//
+
+cc_test {
+ name: "graphics_composer_hidl_hal_test",
+ gtest: true,
+ srcs: ["graphics_composer_hidl_hal_test.cpp"],
+ shared_libs: [
+ "android.hardware.graphics.allocator@2.0",
+ "android.hardware.graphics.composer@2.1",
+ "android.hardware.graphics.mapper@2.0",
+ "libbase",
+ "libcutils",
+ "libfmq",
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "liblog",
+ "libnativehelper",
+ "libsync",
+ "libutils",
+ ],
+ static_libs: ["libgtest", "libhwcomposer-command-buffer"],
+ cflags: [
+ "-O0",
+ "-g",
+ ]
+}
diff --git a/graphics/composer/2.1/vts/functional/graphics_composer_hidl_hal_test.cpp b/graphics/composer/2.1/vts/functional/graphics_composer_hidl_hal_test.cpp
new file mode 100644
index 0000000..e3e35bb
--- /dev/null
+++ b/graphics/composer/2.1/vts/functional/graphics_composer_hidl_hal_test.cpp
@@ -0,0 +1,1131 @@
+/*
+ * Copyright (C) 2016 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.
+ */
+
+#define LOG_TAG "graphics_composer_hidl_hal_test"
+
+#include <IComposerCommandBuffer.h>
+#include <android-base/logging.h>
+#include <android/hardware/graphics/allocator/2.0/IAllocator.h>
+#include <android/hardware/graphics/composer/2.1/IComposer.h>
+#include <android/hardware/graphics/mapper/2.0/IMapper.h>
+
+#include <gtest/gtest.h>
+#include <unistd.h>
+
+#include <algorithm>
+#include <array>
+#include <memory>
+#include <mutex>
+#include <unordered_set>
+#include <vector>
+
+namespace android {
+namespace hardware {
+namespace graphics {
+namespace composer {
+namespace V2_1 {
+namespace tests {
+namespace {
+
+using android::hardware::graphics::allocator::V2_0::Buffer;
+using android::hardware::graphics::allocator::V2_0::BufferDescriptor;
+using android::hardware::graphics::allocator::V2_0::ConsumerUsage;
+using android::hardware::graphics::allocator::V2_0::IAllocator;
+using android::hardware::graphics::allocator::V2_0::IAllocatorClient;
+using android::hardware::graphics::allocator::V2_0::ProducerUsage;
+using android::hardware::graphics::common::V1_0::ColorMode;
+using android::hardware::graphics::common::V1_0::ColorTransform;
+using android::hardware::graphics::common::V1_0::Dataspace;
+using android::hardware::graphics::common::V1_0::PixelFormat;
+using android::hardware::graphics::common::V1_0::Transform;
+using android::hardware::graphics::mapper::V2_0::IMapper;
+using GrallocError = android::hardware::graphics::allocator::V2_0::Error;
+
+// IComposerCallback to be installed with IComposerClient::registerCallback.
+class GraphicsComposerCallback : public IComposerCallback {
+ public:
+ void setVsyncAllowed(bool allowed) {
+ std::lock_guard<std::mutex> lock(mMutex);
+ mVsyncAllowed = allowed;
+ }
+
+ std::vector<Display> getDisplays() const {
+ std::lock_guard<std::mutex> lock(mMutex);
+ return std::vector<Display>(mDisplays.begin(), mDisplays.end());
+ }
+
+ int getInvalidHotplugCount() const {
+ std::lock_guard<std::mutex> lock(mMutex);
+ return mInvalidHotplugCount;
+ }
+
+ int getInvalidRefreshCount() const {
+ std::lock_guard<std::mutex> lock(mMutex);
+ return mInvalidRefreshCount;
+ }
+
+ int getInvalidVsyncCount() const {
+ std::lock_guard<std::mutex> lock(mMutex);
+ return mInvalidVsyncCount;
+ }
+
+ private:
+ Return<void> onHotplug(Display display, Connection connection) override {
+ std::lock_guard<std::mutex> lock(mMutex);
+
+ if (connection == Connection::CONNECTED) {
+ if (!mDisplays.insert(display).second) {
+ mInvalidHotplugCount++;
+ }
+ } else if (connection == Connection::DISCONNECTED) {
+ if (!mDisplays.erase(display)) {
+ mInvalidHotplugCount++;
+ }
+ }
+
+ return Void();
+ }
+
+ Return<void> onRefresh(Display display) override {
+ std::lock_guard<std::mutex> lock(mMutex);
+
+ if (mDisplays.count(display) == 0) {
+ mInvalidRefreshCount++;
+ }
+
+ return Void();
+ }
+
+ Return<void> onVsync(Display display, int64_t) override {
+ std::lock_guard<std::mutex> lock(mMutex);
+
+ if (!mVsyncAllowed || mDisplays.count(display) == 0) {
+ mInvalidVsyncCount++;
+ }
+
+ return Void();
+ }
+
+ mutable std::mutex mMutex;
+ // the set of all currently connected displays
+ std::unordered_set<Display> mDisplays;
+ // true only when vsync is enabled
+ bool mVsyncAllowed = false;
+
+ // track invalid callbacks
+ int mInvalidHotplugCount = 0;
+ int mInvalidRefreshCount = 0;
+ int mInvalidVsyncCount = 0;
+};
+
+class GraphicsComposerHidlTest : public ::testing::Test {
+ protected:
+ void SetUp() override {
+ mComposer = IComposer::getService("hwcomposer");
+ ASSERT_NE(nullptr, mComposer.get());
+
+ mComposerClient = createClient();
+ ASSERT_NE(nullptr, mComposerClient.get());
+
+ initCapabilities();
+
+ mComposerCallback = new GraphicsComposerCallback;
+ mComposerClient->registerCallback(mComposerCallback);
+
+ // assume the first display is primary and is never removed
+ mPrimaryDisplay = waitForFirstDisplay();
+ }
+
+ void TearDown() override {
+ if (mComposerCallback != nullptr) {
+ EXPECT_EQ(0, mComposerCallback->getInvalidHotplugCount());
+ EXPECT_EQ(0, mComposerCallback->getInvalidRefreshCount());
+ EXPECT_EQ(0, mComposerCallback->getInvalidVsyncCount());
+ }
+ }
+
+ /**
+ * Initialize the set of supported capabilities.
+ */
+ void initCapabilities() {
+ mComposer->getCapabilities([this](const auto& capabilities) {
+ std::vector<IComposer::Capability> caps = capabilities;
+ mCapabilities.insert(caps.cbegin(), caps.cend());
+ });
+ }
+
+ /**
+ * Test whether a capability is supported.
+ */
+ bool hasCapability(IComposer::Capability capability) const {
+ return (mCapabilities.count(capability) > 0);
+ }
+
+ IComposerClient::DisplayType getDisplayType(Display display) {
+ IComposerClient::DisplayType type = IComposerClient::DisplayType::INVALID;
+ mComposerClient->getDisplayType(
+ display, [&](const auto& tmpError, const auto& tmpType) {
+ ASSERT_EQ(Error::NONE, tmpError);
+ type = tmpType;
+ });
+ return type;
+ }
+
+ Error createVirtualDisplay(Display* outDisplay) {
+ auto ret_count = mComposerClient->getMaxVirtualDisplayCount();
+ if (ret_count == 0) {
+ return Error::UNSUPPORTED;
+ }
+
+ Error err = Error::NO_RESOURCES;
+ Display display;
+ mComposerClient->createVirtualDisplay(
+ 64, 64, PixelFormat::IMPLEMENTATION_DEFINED, kBufferSlotCount,
+ [&](const auto& tmpError, const auto& tmpDisplay, const auto&) {
+ err = tmpError;
+ display = tmpDisplay;
+ });
+
+ *outDisplay = display;
+ return err;
+ }
+
+ void destroyVirtualDisplay(Display display) {
+ auto ret = mComposerClient->destroyVirtualDisplay(display);
+ ASSERT_EQ(Error::NONE, static_cast<Error>(ret));
+ }
+
+ Error createLayer(Layer* outLayer) {
+ Error err = Error::NO_RESOURCES;
+ Layer layer;
+ mComposerClient->createLayer(
+ mPrimaryDisplay, kBufferSlotCount,
+ [&](const auto& tmpError, const auto& tmpLayer) {
+ err = tmpError;
+ layer = tmpLayer;
+ });
+
+ *outLayer = layer;
+ return err;
+ }
+
+ void destroyLayer(Layer layer) {
+ auto ret = mComposerClient->destroyLayer(mPrimaryDisplay, layer);
+ ASSERT_EQ(Error::NONE, static_cast<Error>(ret));
+ }
+
+ int32_t getDisplayAttribute(Config config,
+ IComposerClient::Attribute attribute) {
+ int32_t value = -1;
+ mComposerClient->getDisplayAttribute(
+ mPrimaryDisplay, config, attribute,
+ [&](const auto& tmpError, const auto& tmpValue) {
+ ASSERT_EQ(Error::NONE, tmpError);
+ value = tmpValue;
+ });
+ return value;
+ }
+
+ std::vector<Config> getDisplayConfigs() {
+ std::vector<Config> configs;
+ mComposerClient->getDisplayConfigs(
+ mPrimaryDisplay, [&](const auto& tmpError, const auto& tmpConfigs) {
+ ASSERT_EQ(Error::NONE, tmpError);
+
+ configs = tmpConfigs;
+ ASSERT_FALSE(configs.empty());
+ });
+
+ return configs;
+ }
+
+ std::vector<ColorMode> getColorModes() {
+ std::vector<ColorMode> modes;
+ mComposerClient->getColorModes(
+ mPrimaryDisplay, [&](const auto& tmpError, const auto& tmpModes) {
+ ASSERT_EQ(Error::NONE, tmpError);
+
+ modes = tmpModes;
+ ASSERT_NE(modes.end(),
+ std::find(modes.begin(), modes.end(), ColorMode::NATIVE));
+ });
+
+ return modes;
+ }
+
+ std::vector<IComposerClient::PowerMode> getPowerModes() {
+ std::vector<IComposerClient::PowerMode> modes;
+ modes.push_back(IComposerClient::PowerMode::OFF);
+
+ mComposerClient->getDozeSupport(
+ mPrimaryDisplay, [&](const auto& tmpError, const auto& tmpSupport) {
+ ASSERT_EQ(Error::NONE, tmpError);
+ if (tmpSupport) {
+ modes.push_back(IComposerClient::PowerMode::DOZE);
+ modes.push_back(IComposerClient::PowerMode::DOZE_SUSPEND);
+ }
+ });
+
+ // push ON last
+ modes.push_back(IComposerClient::PowerMode::ON);
+
+ return modes;
+ }
+
+ void setActiveConfig(Config config) {
+ auto ret = mComposerClient->setActiveConfig(mPrimaryDisplay, config);
+ ASSERT_EQ(Error::NONE, static_cast<Error>(ret));
+ }
+
+ void setColorMode(ColorMode mode) {
+ auto ret = mComposerClient->setColorMode(mPrimaryDisplay, mode);
+ ASSERT_EQ(Error::NONE, static_cast<Error>(ret));
+ }
+
+ void setPowerMode(IComposerClient::PowerMode mode) {
+ auto ret = mComposerClient->setPowerMode(mPrimaryDisplay, mode);
+ ASSERT_EQ(Error::NONE, static_cast<Error>(ret));
+ }
+
+ void setVsyncEnabled(bool enable) {
+ auto ret = mComposerClient->setVsyncEnabled(
+ mPrimaryDisplay,
+ enable ? IComposerClient::Vsync::ENABLE
+ : IComposerClient::Vsync::DISABLE);
+ ASSERT_EQ(Error::NONE, static_cast<Error>(ret));
+ }
+ // use the slot count usually set by SF
+ static constexpr uint32_t kBufferSlotCount = 64;
+
+ sp<IComposer> mComposer;
+ sp<IComposerClient> mComposerClient;
+ sp<GraphicsComposerCallback> mComposerCallback;
+ // the first display and is assumed never to be removed
+ Display mPrimaryDisplay;
+
+ private:
+ sp<IComposerClient> createClient() {
+ sp<IComposerClient> client;
+ mComposer->createClient([&](const auto& tmpError, const auto& tmpClient) {
+ if (tmpError == Error::NONE) {
+ client = tmpClient;
+ }
+ });
+
+ return client;
+ }
+
+ Display waitForFirstDisplay() {
+ while (true) {
+ std::vector<Display> displays = mComposerCallback->getDisplays();
+ if (displays.empty()) {
+ usleep(5 * 1000);
+ continue;
+ }
+
+ return displays[0];
+ }
+ }
+
+ // the set of all supported capabilities
+ std::unordered_set<IComposer::Capability> mCapabilities;
+};
+
+/**
+ * Test IComposer::getCapabilities.
+ *
+ * Test that IComposer::getCapabilities returns no invalid capabilities.
+ */
+TEST_F(GraphicsComposerHidlTest, GetCapabilities) {
+ mComposer->getCapabilities([](const auto& tmpCapabilities) {
+ std::vector<IComposer::Capability> capabilities = tmpCapabilities;
+ ASSERT_EQ(capabilities.end(),
+ std::find(capabilities.begin(), capabilities.end(),
+ IComposer::Capability::INVALID));
+ });
+}
+
+/**
+ * Test IComposer::dumpDebugInfo.
+ */
+TEST_F(GraphicsComposerHidlTest, DumpDebugInfo) {
+ mComposer->dumpDebugInfo([](const auto&) {
+ // nothing to do
+ });
+}
+
+/**
+ * Test IComposer::createClient.
+ *
+ * Test that IComposerClient is a singleton.
+ */
+TEST_F(GraphicsComposerHidlTest, CreateClientSingleton) {
+ mComposer->createClient([&](const auto& tmpError, const auto&) {
+ EXPECT_EQ(Error::NO_RESOURCES, tmpError);
+ });
+}
+
+/**
+ * Test IComposerClient::createVirtualDisplay and
+ * IComposerClient::destroyVirtualDisplay.
+ *
+ * Test that virtual displays can be created and has the correct display type.
+ */
+TEST_F(GraphicsComposerHidlTest, CreateVirtualDisplay) {
+ Display display;
+ Error err = createVirtualDisplay(&display);
+ if (err == Error::UNSUPPORTED) {
+ GTEST_SUCCEED() << "no virtual display support";
+ return;
+ }
+ ASSERT_EQ(Error::NONE, err);
+
+ // test display type
+ IComposerClient::DisplayType type = getDisplayType(display);
+ EXPECT_EQ(IComposerClient::DisplayType::VIRTUAL, type);
+
+ destroyVirtualDisplay(display);
+}
+
+/**
+ * Test IComposerClient::createLayer and IComposerClient::destroyLayer.
+ *
+ * Test that layers can be created and destroyed.
+ */
+TEST_F(GraphicsComposerHidlTest, CreateLayer) {
+ Layer layer;
+ Error err = createLayer(&layer);
+ ASSERT_EQ(Error::NONE, err);
+
+ destroyLayer(layer);
+}
+
+/**
+ * Test IComposerClient::getDisplayName.
+ */
+TEST_F(GraphicsComposerHidlTest, GetDisplayName) {
+ mComposerClient->getDisplayName(mPrimaryDisplay,
+ [&](const auto& tmpError, const auto&) {
+ ASSERT_EQ(Error::NONE, tmpError);
+ });
+}
+
+/**
+ * Test IComposerClient::getDisplayType.
+ *
+ * Test that IComposerClient::getDisplayType returns the correct display type
+ * for the primary display.
+ */
+TEST_F(GraphicsComposerHidlTest, GetDisplayType) {
+ IComposerClient::DisplayType type = getDisplayType(mPrimaryDisplay);
+ EXPECT_EQ(IComposerClient::DisplayType::PHYSICAL, type);
+}
+
+/**
+ * Test IComposerClient::getClientTargetSupport.
+ *
+ * Test that IComposerClient::getClientTargetSupport returns true for the
+ * required client targets.
+ */
+TEST_F(GraphicsComposerHidlTest, GetClientTargetSupport) {
+ std::vector<Config> configs = getDisplayConfigs();
+ for (auto config : configs) {
+ int32_t width =
+ getDisplayAttribute(config, IComposerClient::Attribute::WIDTH);
+ int32_t height =
+ getDisplayAttribute(config, IComposerClient::Attribute::HEIGHT);
+ ASSERT_LT(0, width);
+ ASSERT_LT(0, height);
+
+ setActiveConfig(config);
+
+ auto ret = mComposerClient->getClientTargetSupport(
+ mPrimaryDisplay, width, height, PixelFormat::RGBA_8888,
+ Dataspace::UNKNOWN);
+ ASSERT_EQ(Error::NONE, static_cast<Error>(ret));
+ }
+}
+
+/**
+ * Test IComposerClient::getDisplayAttribute.
+ *
+ * Test that IComposerClient::getDisplayAttribute succeeds for the required
+ * formats, and succeeds or fails correctly for optional attributes.
+ */
+TEST_F(GraphicsComposerHidlTest, GetDisplayAttribute) {
+ std::vector<Config> configs = getDisplayConfigs();
+ for (auto config : configs) {
+ const std::array<IComposerClient::Attribute, 3> requiredAttributes = {{
+ IComposerClient::Attribute::WIDTH, IComposerClient::Attribute::HEIGHT,
+ IComposerClient::Attribute::VSYNC_PERIOD,
+ }};
+ for (auto attribute : requiredAttributes) {
+ getDisplayAttribute(config, attribute);
+ }
+
+ const std::array<IComposerClient::Attribute, 2> optionalAttributes = {{
+ IComposerClient::Attribute::DPI_X, IComposerClient::Attribute::DPI_Y,
+ }};
+ for (auto attribute : optionalAttributes) {
+ mComposerClient->getDisplayAttribute(
+ mPrimaryDisplay, config, attribute,
+ [&](const auto& tmpError, const auto&) {
+ EXPECT_TRUE(tmpError == Error::NONE ||
+ tmpError == Error::UNSUPPORTED);
+ });
+ }
+ }
+}
+
+/**
+ * Test IComposerClient::getHdrCapabilities.
+ */
+TEST_F(GraphicsComposerHidlTest, GetHdrCapabilities) {
+ mComposerClient->getHdrCapabilities(
+ mPrimaryDisplay,
+ [&](const auto& tmpError, const auto&, const auto&, const auto&,
+ const auto&) { ASSERT_EQ(Error::NONE, tmpError); });
+}
+
+/**
+ * Test IComposerClient::setClientTargetSlotCount.
+ */
+TEST_F(GraphicsComposerHidlTest, SetClientTargetSlotCount) {
+ auto ret = mComposerClient->setClientTargetSlotCount(mPrimaryDisplay,
+ kBufferSlotCount);
+ ASSERT_EQ(Error::NONE, static_cast<Error>(ret));
+}
+
+/**
+ * Test IComposerClient::setActiveConfig.
+ *
+ * Test that IComposerClient::setActiveConfig succeeds for all display
+ * configs.
+ */
+TEST_F(GraphicsComposerHidlTest, SetActiveConfig) {
+ std::vector<Config> configs = getDisplayConfigs();
+ for (auto config : configs) {
+ setActiveConfig(config);
+
+ mComposerClient->getActiveConfig(
+ mPrimaryDisplay, [&](const auto& tmpError, const auto& tmpConfig) {
+ EXPECT_EQ(Error::NONE, tmpError);
+ EXPECT_EQ(config, tmpConfig);
+ });
+ }
+}
+
+/**
+ * Test IComposerClient::setColorMode.
+ *
+ * Test that IComposerClient::setColorMode succeeds for all color modes.
+ */
+TEST_F(GraphicsComposerHidlTest, SetColorMode) {
+ std::vector<ColorMode> modes = getColorModes();
+ for (auto mode : modes) {
+ setColorMode(mode);
+ }
+}
+
+/**
+ * Test IComposerClient::setPowerMode.
+ *
+ * Test that IComposerClient::setPowerMode succeeds for all power modes.
+ */
+TEST_F(GraphicsComposerHidlTest, SetPowerMode) {
+ std::vector<IComposerClient::PowerMode> modes = getPowerModes();
+ for (auto mode : modes) {
+ setPowerMode(mode);
+ }
+}
+
+/**
+ * Test IComposerClient::setVsyncEnabled.
+ *
+ * Test that IComposerClient::setVsyncEnabled succeeds and there is no
+ * spurious vsync events.
+ */
+TEST_F(GraphicsComposerHidlTest, SetVsyncEnabled) {
+ mComposerCallback->setVsyncAllowed(true);
+
+ setVsyncEnabled(true);
+ usleep(60 * 1000);
+ setVsyncEnabled(false);
+
+ mComposerCallback->setVsyncAllowed(false);
+}
+
+// Tests for IComposerClient::Command.
+class GraphicsComposerHidlCommandTest : public GraphicsComposerHidlTest {
+ protected:
+ void SetUp() override {
+ ASSERT_NO_FATAL_FAILURE(GraphicsComposerHidlTest::SetUp());
+ ASSERT_NO_FATAL_FAILURE(SetUpGralloc());
+
+ mWriter = std::make_unique<CommandWriterBase>(1024);
+ mReader = std::make_unique<CommandReader>();
+ }
+
+ void TearDown() override {
+ ASSERT_NO_FATAL_FAILURE(GraphicsComposerHidlTest::TearDown());
+ }
+
+ const native_handle_t* cloneBuffer(const native_handle_t* handle) {
+ auto clone = native_handle_clone(handle);
+ if (!clone) {
+ return nullptr;
+ }
+
+ GrallocError err = mMapper->retain(clone);
+ if (err != GrallocError::NONE) {
+ native_handle_close(clone);
+ native_handle_delete(const_cast<native_handle_t*>(clone));
+ return nullptr;
+ }
+
+ return clone;
+ }
+
+ const native_handle_t* allocate(
+ const IAllocatorClient::BufferDescriptorInfo& info) {
+ // create descriptor
+ GrallocError err = GrallocError::NO_RESOURCES;
+ BufferDescriptor descriptor;
+ mAllocatorClient->createDescriptor(
+ info, [&](const auto& tmpError, const auto& tmpDescriptor) {
+ err = tmpError;
+ descriptor = tmpDescriptor;
+ });
+ if (err != GrallocError::NONE) {
+ return nullptr;
+ }
+
+ // allocate buffer
+ hidl_vec<BufferDescriptor> descriptors;
+ hidl_vec<Buffer> buffers;
+ descriptors.setToExternal(&descriptor, 1);
+ err = GrallocError::NO_RESOURCES;
+ mAllocatorClient->allocate(
+ descriptors, [&](const auto& tmpError, const auto& tmpBuffers) {
+ err = tmpError;
+ buffers = tmpBuffers;
+ });
+ if ((err != GrallocError::NONE && err != GrallocError::NOT_SHARED) ||
+ buffers.size() != 1) {
+ mAllocatorClient->destroyDescriptor(descriptors[0]);
+ return nullptr;
+ }
+
+ // export handle
+ err = GrallocError::NO_RESOURCES;
+ const native_handle_t* handle = nullptr;
+ mAllocatorClient->exportHandle(
+ descriptors[0], buffers[0],
+ [&](const auto& tmpError, const auto& tmpHandle) {
+ err = tmpError;
+ if (err != GrallocError::NONE) {
+ return;
+ }
+
+ handle = cloneBuffer(tmpHandle.getNativeHandle());
+ if (!handle) {
+ err = GrallocError::NO_RESOURCES;
+ return;
+ }
+ });
+
+ mAllocatorClient->destroyDescriptor(descriptors[0]);
+ mAllocatorClient->free(buffers[0]);
+
+ if (err != GrallocError::NONE) {
+ return nullptr;
+ }
+
+ return handle;
+ }
+
+ const native_handle_t* allocate() {
+ IAllocatorClient::BufferDescriptorInfo info{};
+ info.width = 64;
+ info.height = 64;
+ info.layerCount = 1;
+ info.format = PixelFormat::RGBA_8888;
+ info.producerUsageMask = static_cast<uint64_t>(ProducerUsage::CPU_WRITE);
+ info.consumerUsageMask = static_cast<uint64_t>(ConsumerUsage::CPU_READ);
+
+ return allocate(info);
+ }
+
+ void free(const native_handle_t* handle) {
+ auto ret = mMapper->release(handle);
+ ASSERT_EQ(GrallocError::NONE, static_cast<GrallocError>(ret));
+ }
+
+ void execute() {
+ bool queueChanged = false;
+ uint32_t commandLength = 0;
+ hidl_vec<hidl_handle> commandHandles;
+ ASSERT_TRUE(
+ mWriter->writeQueue(&queueChanged, &commandLength, &commandHandles));
+
+ if (queueChanged) {
+ auto ret =
+ mComposerClient->setInputCommandQueue(*mWriter->getMQDescriptor());
+ ASSERT_EQ(Error::NONE, static_cast<Error>(ret));
+ return;
+ }
+
+ mComposerClient->executeCommands(
+ commandLength, commandHandles,
+ [&](const auto& tmpError, const auto& tmpOutQueueChanged,
+ const auto& tmpOutLength, const auto& tmpOutHandles) {
+ ASSERT_EQ(Error::NONE, tmpError);
+
+ if (tmpOutQueueChanged) {
+ mComposerClient->getOutputCommandQueue(
+ [&](const auto& tmpError, const auto& tmpDescriptor) {
+ ASSERT_EQ(Error::NONE, tmpError);
+ mReader->setMQDescriptor(tmpDescriptor);
+ });
+ }
+
+ ASSERT_TRUE(mReader->readQueue(tmpOutLength, tmpOutHandles));
+ mReader->parse();
+ });
+ }
+
+ // A command parser that checks that no error nor unexpected commands are
+ // returned.
+ class CommandReader : public CommandReaderBase {
+ public:
+ // Parse all commands in the return command queue. Call GTEST_FAIL() for
+ // unexpected errors or commands.
+ void parse() {
+ while (!isEmpty()) {
+ IComposerClient::Command command;
+ uint16_t length;
+ ASSERT_TRUE(beginCommand(&command, &length));
+
+ switch (command) {
+ case IComposerClient::Command::SET_ERROR: {
+ ASSERT_EQ(2, length);
+ auto loc = read();
+ auto err = readSigned();
+ GTEST_FAIL() << "unexpected error " << err << " at location "
+ << loc;
+ } break;
+ case IComposerClient::Command::SELECT_DISPLAY:
+ case IComposerClient::Command::SET_CHANGED_COMPOSITION_TYPES:
+ case IComposerClient::Command::SET_DISPLAY_REQUESTS:
+ case IComposerClient::Command::SET_PRESENT_FENCE:
+ case IComposerClient::Command::SET_RELEASE_FENCES:
+ break;
+ default:
+ GTEST_FAIL() << "unexpected return command " << std::hex
+ << static_cast<int>(command);
+ break;
+ }
+
+ endCommand();
+ }
+ }
+ };
+
+ std::unique_ptr<CommandWriterBase> mWriter;
+ std::unique_ptr<CommandReader> mReader;
+
+ private:
+ void SetUpGralloc() {
+ mAllocator = IAllocator::getService("gralloc");
+ ASSERT_NE(nullptr, mAllocator.get());
+
+ mAllocator->createClient([this](const auto& error, const auto& client) {
+ if (error == GrallocError::NONE) {
+ mAllocatorClient = client;
+ }
+ });
+ ASSERT_NE(nullptr, mAllocatorClient.get());
+
+ mMapper = IMapper::getService("gralloc-mapper");
+ ASSERT_NE(nullptr, mMapper.get());
+ ASSERT_FALSE(mMapper->isRemote());
+ }
+
+ sp<IAllocator> mAllocator;
+ sp<IAllocatorClient> mAllocatorClient;
+ sp<IMapper> mMapper;
+};
+
+/**
+ * Test IComposerClient::Command::SET_COLOR_TRANSFORM.
+ */
+TEST_F(GraphicsComposerHidlCommandTest, SET_COLOR_TRANSFORM) {
+ const std::array<float, 16> identity = {{
+ 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f,
+ 0.0f, 0.0f, 0.0f, 1.0f,
+ }};
+
+ mWriter->selectDisplay(mPrimaryDisplay);
+ mWriter->setColorTransform(identity.data(), ColorTransform::IDENTITY);
+
+ execute();
+}
+
+/**
+ * Test IComposerClient::Command::SET_CLIENT_TARGET.
+ */
+TEST_F(GraphicsComposerHidlCommandTest, SET_CLIENT_TARGET) {
+ mComposerClient->setClientTargetSlotCount(mPrimaryDisplay, kBufferSlotCount);
+
+ mWriter->selectDisplay(mPrimaryDisplay);
+ mWriter->setClientTarget(0, nullptr, -1, Dataspace::UNKNOWN,
+ std::vector<IComposerClient::Rect>());
+
+ execute();
+}
+
+/**
+ * Test IComposerClient::Command::SET_OUTPUT_BUFFER.
+ */
+TEST_F(GraphicsComposerHidlCommandTest, SET_OUTPUT_BUFFER) {
+ auto handle = allocate();
+ ASSERT_NE(nullptr, handle);
+
+ Display display;
+ Error err = createVirtualDisplay(&display);
+ if (err == Error::UNSUPPORTED) {
+ GTEST_SUCCEED() << "no virtual display support";
+ return;
+ }
+ ASSERT_EQ(Error::NONE, err);
+
+ mWriter->selectDisplay(display);
+ mWriter->setOutputBuffer(0, handle, -1);
+
+ destroyVirtualDisplay(display);
+ free(handle);
+}
+
+/**
+ * Test IComposerClient::Command::VALIDATE_DISPLAY.
+ */
+TEST_F(GraphicsComposerHidlCommandTest, VALIDATE_DISPLAY) {
+ mWriter->selectDisplay(mPrimaryDisplay);
+ mWriter->validateDisplay();
+ execute();
+}
+
+/**
+ * Test IComposerClient::Command::ACCEPT_DISPLAY_CHANGES.
+ */
+TEST_F(GraphicsComposerHidlCommandTest, ACCEPT_DISPLAY_CHANGES) {
+ mWriter->selectDisplay(mPrimaryDisplay);
+ mWriter->validateDisplay();
+ mWriter->acceptDisplayChanges();
+ execute();
+}
+
+/**
+ * Test IComposerClient::Command::PRESENT_DISPLAY.
+ */
+TEST_F(GraphicsComposerHidlCommandTest, PRESENT_DISPLAY) {
+ mWriter->selectDisplay(mPrimaryDisplay);
+ mWriter->validateDisplay();
+ mWriter->presentDisplay();
+ execute();
+}
+
+/**
+ * Test IComposerClient::Command::SET_LAYER_CURSOR_POSITION.
+ */
+TEST_F(GraphicsComposerHidlCommandTest, SET_LAYER_CURSOR_POSITION) {
+ Layer layer;
+ Error err = createLayer(&layer);
+ ASSERT_EQ(Error::NONE, err);
+
+ mWriter->selectDisplay(mPrimaryDisplay);
+ mWriter->selectLayer(layer);
+ mWriter->setLayerCursorPosition(1, 1);
+ mWriter->setLayerCursorPosition(0, 0);
+ execute();
+
+ destroyLayer(layer);
+}
+
+/**
+ * Test IComposerClient::Command::SET_LAYER_BUFFER.
+ */
+TEST_F(GraphicsComposerHidlCommandTest, SET_LAYER_BUFFER) {
+ auto handle = allocate();
+ ASSERT_NE(nullptr, handle);
+
+ Layer layer;
+ Error err = createLayer(&layer);
+ ASSERT_EQ(Error::NONE, err);
+
+ mWriter->selectDisplay(mPrimaryDisplay);
+ mWriter->selectLayer(layer);
+ mWriter->setLayerBuffer(0, handle, -1);
+ execute();
+
+ destroyLayer(layer);
+ free(handle);
+}
+
+/**
+ * Test IComposerClient::Command::SET_LAYER_SURFACE_DAMAGE.
+ */
+TEST_F(GraphicsComposerHidlCommandTest, SET_LAYER_SURFACE_DAMAGE) {
+ Layer layer;
+ Error err = createLayer(&layer);
+ ASSERT_EQ(Error::NONE, err);
+
+ IComposerClient::Rect empty{0, 0, 0, 0};
+ IComposerClient::Rect unit{0, 0, 1, 1};
+
+ mWriter->selectDisplay(mPrimaryDisplay);
+ mWriter->selectLayer(layer);
+ mWriter->setLayerSurfaceDamage(std::vector<IComposerClient::Rect>(1, empty));
+ mWriter->setLayerSurfaceDamage(std::vector<IComposerClient::Rect>(1, unit));
+ mWriter->setLayerSurfaceDamage(std::vector<IComposerClient::Rect>());
+ execute();
+
+ destroyLayer(layer);
+}
+
+/**
+ * Test IComposerClient::Command::SET_LAYER_BLEND_MODE.
+ */
+TEST_F(GraphicsComposerHidlCommandTest, SET_LAYER_BLEND_MODE) {
+ Layer layer;
+ Error err = createLayer(&layer);
+ ASSERT_EQ(Error::NONE, err);
+
+ mWriter->selectDisplay(mPrimaryDisplay);
+ mWriter->selectLayer(layer);
+ mWriter->setLayerBlendMode(IComposerClient::BlendMode::NONE);
+ mWriter->setLayerBlendMode(IComposerClient::BlendMode::PREMULTIPLIED);
+ mWriter->setLayerBlendMode(IComposerClient::BlendMode::COVERAGE);
+ execute();
+
+ destroyLayer(layer);
+}
+
+/**
+ * Test IComposerClient::Command::SET_LAYER_COLOR.
+ */
+TEST_F(GraphicsComposerHidlCommandTest, SET_LAYER_COLOR) {
+ Layer layer;
+ Error err = createLayer(&layer);
+ ASSERT_EQ(Error::NONE, err);
+
+ mWriter->selectDisplay(mPrimaryDisplay);
+ mWriter->selectLayer(layer);
+ mWriter->setLayerColor(IComposerClient::Color{0xff, 0xff, 0xff, 0xff});
+ mWriter->setLayerColor(IComposerClient::Color{0, 0, 0, 0});
+ execute();
+
+ destroyLayer(layer);
+}
+
+/**
+ * Test IComposerClient::Command::SET_LAYER_COMPOSITION_TYPE.
+ */
+TEST_F(GraphicsComposerHidlCommandTest, SET_LAYER_COMPOSITION_TYPE) {
+ Layer layer;
+ Error err = createLayer(&layer);
+ ASSERT_EQ(Error::NONE, err);
+
+ mWriter->selectDisplay(mPrimaryDisplay);
+ mWriter->selectLayer(layer);
+ mWriter->setLayerCompositionType(IComposerClient::Composition::CLIENT);
+ mWriter->setLayerCompositionType(IComposerClient::Composition::DEVICE);
+ mWriter->setLayerCompositionType(IComposerClient::Composition::SOLID_COLOR);
+ mWriter->setLayerCompositionType(IComposerClient::Composition::CURSOR);
+ execute();
+
+ destroyLayer(layer);
+}
+
+/**
+ * Test IComposerClient::Command::SET_LAYER_DATASPACE.
+ */
+TEST_F(GraphicsComposerHidlCommandTest, SET_LAYER_DATASPACE) {
+ Layer layer;
+ Error err = createLayer(&layer);
+ ASSERT_EQ(Error::NONE, err);
+
+ mWriter->selectDisplay(mPrimaryDisplay);
+ mWriter->selectLayer(layer);
+ mWriter->setLayerDataspace(Dataspace::UNKNOWN);
+ execute();
+
+ destroyLayer(layer);
+}
+
+/**
+ * Test IComposerClient::Command::SET_LAYER_DISPLAY_FRAME.
+ */
+TEST_F(GraphicsComposerHidlCommandTest, SET_LAYER_DISPLAY_FRAME) {
+ Layer layer;
+ Error err = createLayer(&layer);
+ ASSERT_EQ(Error::NONE, err);
+
+ mWriter->selectDisplay(mPrimaryDisplay);
+ mWriter->selectLayer(layer);
+ mWriter->setLayerDisplayFrame(IComposerClient::Rect{0, 0, 1, 1});
+ execute();
+
+ destroyLayer(layer);
+}
+
+/**
+ * Test IComposerClient::Command::SET_LAYER_PLANE_ALPHA.
+ */
+TEST_F(GraphicsComposerHidlCommandTest, SET_LAYER_PLANE_ALPHA) {
+ Layer layer;
+ Error err = createLayer(&layer);
+ ASSERT_EQ(Error::NONE, err);
+
+ mWriter->selectDisplay(mPrimaryDisplay);
+ mWriter->selectLayer(layer);
+ mWriter->setLayerPlaneAlpha(0.0f);
+ mWriter->setLayerPlaneAlpha(1.0f);
+ execute();
+
+ destroyLayer(layer);
+}
+
+/**
+ * Test IComposerClient::Command::SET_LAYER_SIDEBAND_STREAM.
+ */
+TEST_F(GraphicsComposerHidlCommandTest, SET_LAYER_SIDEBAND_STREAM) {
+ if (!hasCapability(IComposer::Capability::SIDEBAND_STREAM)) {
+ GTEST_SUCCEED() << "no sideband stream support";
+ return;
+ }
+
+ auto handle = allocate();
+ ASSERT_NE(nullptr, handle);
+
+ Layer layer;
+ Error err = createLayer(&layer);
+ ASSERT_EQ(Error::NONE, err);
+
+ mWriter->selectDisplay(mPrimaryDisplay);
+ mWriter->selectLayer(layer);
+ mWriter->setLayerSidebandStream(handle);
+ execute();
+
+ destroyLayer(layer);
+ free(handle);
+}
+
+/**
+ * Test IComposerClient::Command::SET_LAYER_SOURCE_CROP.
+ */
+TEST_F(GraphicsComposerHidlCommandTest, SET_LAYER_SOURCE_CROP) {
+ Layer layer;
+ Error err = createLayer(&layer);
+ ASSERT_EQ(Error::NONE, err);
+
+ mWriter->selectDisplay(mPrimaryDisplay);
+ mWriter->selectLayer(layer);
+ mWriter->setLayerSourceCrop(IComposerClient::FRect{0.0f, 0.0f, 1.0f, 1.0f});
+ execute();
+
+ destroyLayer(layer);
+}
+
+/**
+ * Test IComposerClient::Command::SET_LAYER_TRANSFORM.
+ */
+TEST_F(GraphicsComposerHidlCommandTest, SET_LAYER_TRANSFORM) {
+ Layer layer;
+ Error err = createLayer(&layer);
+ ASSERT_EQ(Error::NONE, err);
+
+ mWriter->selectDisplay(mPrimaryDisplay);
+ mWriter->selectLayer(layer);
+ mWriter->setLayerTransform(static_cast<Transform>(0));
+ mWriter->setLayerTransform(Transform::FLIP_H);
+ mWriter->setLayerTransform(Transform::FLIP_V);
+ mWriter->setLayerTransform(Transform::ROT_90);
+ mWriter->setLayerTransform(Transform::ROT_180);
+ mWriter->setLayerTransform(Transform::ROT_270);
+ mWriter->setLayerTransform(
+ static_cast<Transform>(Transform::FLIP_H | Transform::ROT_90));
+ mWriter->setLayerTransform(
+ static_cast<Transform>(Transform::FLIP_V | Transform::ROT_90));
+ execute();
+
+ destroyLayer(layer);
+}
+
+/**
+ * Test IComposerClient::Command::SET_LAYER_VISIBLE_REGION.
+ */
+TEST_F(GraphicsComposerHidlCommandTest, SET_LAYER_VISIBLE_REGION) {
+ Layer layer;
+ Error err = createLayer(&layer);
+ ASSERT_EQ(Error::NONE, err);
+
+ IComposerClient::Rect empty{0, 0, 0, 0};
+ IComposerClient::Rect unit{0, 0, 1, 1};
+
+ mWriter->selectDisplay(mPrimaryDisplay);
+ mWriter->selectLayer(layer);
+ mWriter->setLayerVisibleRegion(std::vector<IComposerClient::Rect>(1, empty));
+ mWriter->setLayerVisibleRegion(std::vector<IComposerClient::Rect>(1, unit));
+ mWriter->setLayerVisibleRegion(std::vector<IComposerClient::Rect>());
+ execute();
+
+ destroyLayer(layer);
+}
+
+/**
+ * Test IComposerClient::Command::SET_LAYER_Z_ORDER.
+ */
+TEST_F(GraphicsComposerHidlCommandTest, SET_LAYER_Z_ORDER) {
+ Layer layer;
+ Error err = createLayer(&layer);
+ ASSERT_EQ(Error::NONE, err);
+
+ mWriter->selectDisplay(mPrimaryDisplay);
+ mWriter->selectLayer(layer);
+ mWriter->setLayerZOrder(10);
+ mWriter->setLayerZOrder(0);
+ execute();
+
+ destroyLayer(layer);
+}
+
+} // namespace anonymous
+} // namespace tests
+} // namespace V2_1
+} // namespace composer
+} // namespace graphics
+} // namespace hardware
+} // namespace android
+
+int main(int argc, char** argv) {
+ ::testing::InitGoogleTest(&argc, argv);
+
+ int status = RUN_ALL_TESTS();
+ LOG(INFO) << "Test result = " << status;
+
+ return status;
+}
diff --git a/graphics/composer/2.1/vts/types.vts b/graphics/composer/2.1/vts/types.vts
new file mode 100644
index 0000000..ccbd9d8
--- /dev/null
+++ b/graphics/composer/2.1/vts/types.vts
@@ -0,0 +1,48 @@
+component_class: HAL_HIDL
+component_type_version: 2.1
+component_name: "types"
+
+package: "android.hardware.graphics.composer"
+
+
+attribute: {
+ name: "::android::hardware::graphics::composer::V2_1::Error"
+ type: TYPE_ENUM
+ enum_value: {
+ scalar_type: "int32_t"
+
+ enumerator: "NONE"
+ scalar_value: {
+ int32_t: 0
+ }
+ enumerator: "BAD_CONFIG"
+ scalar_value: {
+ int32_t: 1
+ }
+ enumerator: "BAD_DISPLAY"
+ scalar_value: {
+ int32_t: 2
+ }
+ enumerator: "BAD_LAYER"
+ scalar_value: {
+ int32_t: 3
+ }
+ enumerator: "BAD_PARAMETER"
+ scalar_value: {
+ int32_t: 4
+ }
+ enumerator: "NO_RESOURCES"
+ scalar_value: {
+ int32_t: 6
+ }
+ enumerator: "NOT_VALIDATED"
+ scalar_value: {
+ int32_t: 7
+ }
+ enumerator: "UNSUPPORTED"
+ scalar_value: {
+ int32_t: 8
+ }
+ }
+}
+
diff --git a/boot/1.0/vts/functional/Android.mk b/graphics/composer/Android.mk
similarity index 100%
copy from boot/1.0/vts/functional/Android.mk
copy to graphics/composer/Android.mk
diff --git a/graphics/mapper/2.0/Android.bp b/graphics/mapper/2.0/Android.bp
index 4adccb9..b835b4a 100644
--- a/graphics/mapper/2.0/Android.bp
+++ b/graphics/mapper/2.0/Android.bp
@@ -1,12 +1,19 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
+filegroup {
+ name: "android.hardware.graphics.mapper@2.0_hal",
+ srcs: [
+ "types.hal",
+ "IMapper.hal",
+ ],
+}
+
genrule {
name: "android.hardware.graphics.mapper@2.0_genc++",
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.mapper@2.0",
srcs: [
- "types.hal",
- "IMapper.hal",
+ ":android.hardware.graphics.mapper@2.0_hal",
],
out: [
"android/hardware/graphics/mapper/2.0/types.cpp",
@@ -19,8 +26,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.mapper@2.0",
srcs: [
- "types.hal",
- "IMapper.hal",
+ ":android.hardware.graphics.mapper@2.0_hal",
],
out: [
"android/hardware/graphics/mapper/2.0/types.h",
diff --git a/graphics/mapper/2.0/default/Android.bp b/graphics/mapper/2.0/default/Android.bp
index c3d2281..ca15961 100644
--- a/graphics/mapper/2.0/default/Android.bp
+++ b/graphics/mapper/2.0/default/Android.bp
@@ -15,6 +15,7 @@
cc_library_shared {
name: "android.hardware.graphics.mapper@2.0-impl",
+ proprietary: true,
relative_install_path: "hw",
srcs: ["GrallocMapper.cpp"],
cppflags: ["-Wall", "-Wextra"],
diff --git a/graphics/mapper/2.0/vts/Android.mk b/graphics/mapper/2.0/vts/Android.mk
deleted file mode 100644
index 6185ddc..0000000
--- a/graphics/mapper/2.0/vts/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(LOCAL_PATH)/functional/vts/testcases/hal/graphics/mapper/hidl/target/Android.mk
diff --git a/graphics/mapper/2.0/vts/Mapper.vts b/graphics/mapper/2.0/vts/Mapper.vts
index 26e049f..baf95dc 100644
--- a/graphics/mapper/2.0/vts/Mapper.vts
+++ b/graphics/mapper/2.0/vts/Mapper.vts
@@ -7,6 +7,7 @@
import: "android.hardware.graphics.allocator@2.0::types"
import: "android.hardware.graphics.common@1.0::types"
import: "android.hardware.graphics.mapper@2.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
attribute: {
diff --git a/graphics/mapper/2.0/vts/functional/Android.bp b/graphics/mapper/2.0/vts/functional/Android.bp
index 27ea350..efb868b 100644
--- a/graphics/mapper/2.0/vts/functional/Android.bp
+++ b/graphics/mapper/2.0/vts/functional/Android.bp
@@ -34,11 +34,7 @@
],
static_libs: ["libgtest"],
cflags: [
- "--coverage",
"-O0",
"-g",
- ],
- ldflags: [
- "--coverage",
- ],
+ ]
}
diff --git a/graphics/mapper/2.0/vts/functional/vts/testcases/hal/graphics/mapper/hidl/target/Android.mk b/graphics/mapper/2.0/vts/functional/vts/testcases/hal/graphics/mapper/hidl/target/Android.mk
deleted file mode 100644
index 5f7fae8..0000000
--- a/graphics/mapper/2.0/vts/functional/vts/testcases/hal/graphics/mapper/hidl/target/Android.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := HalGraphicsMapperHidlTargetTest
-VTS_CONFIG_SRC_DIR := testcases/hal/graphics/mapper/hidl/target
-include test/vts/tools/build/Android.host_config.mk
diff --git a/graphics/mapper/2.0/vts/functional/vts/testcases/hal/graphics/mapper/hidl/target/AndroidTest.xml b/graphics/mapper/2.0/vts/functional/vts/testcases/hal/graphics/mapper/hidl/target/AndroidTest.xml
deleted file mode 100644
index b602ec4..0000000
--- a/graphics/mapper/2.0/vts/functional/vts/testcases/hal/graphics/mapper/hidl/target/AndroidTest.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<configuration description="Config for VTS Graphics Mapper HIDL HAL's basic target-side test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="HalGraphicsMapperHidlTargetTest" />
- <option name="binary-test-sources" value="
- _32bit::DATA/nativetest/graphics_mapper_hidl_hal_test/graphics_mapper_hidl_hal_test,
- _64bit::DATA/nativetest64/graphics_mapper_hidl_hal_test/graphics_mapper_hidl_hal_test,
- " />
- <option name="binary-test-type" value="gtest" />
- <option name="test-timeout" value="1m" />
- </test>
-</configuration>
diff --git a/health/1.0/Android.bp b/health/1.0/Android.bp
index b0b9549..a428c7d 100644
--- a/health/1.0/Android.bp
+++ b/health/1.0/Android.bp
@@ -1,12 +1,19 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
+filegroup {
+ name: "android.hardware.health@1.0_hal",
+ srcs: [
+ "types.hal",
+ "IHealth.hal",
+ ],
+}
+
genrule {
name: "android.hardware.health@1.0_genc++",
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.health@1.0",
srcs: [
- "types.hal",
- "IHealth.hal",
+ ":android.hardware.health@1.0_hal",
],
out: [
"android/hardware/health/1.0/types.cpp",
@@ -19,8 +26,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.health@1.0",
srcs: [
- "types.hal",
- "IHealth.hal",
+ ":android.hardware.health@1.0_hal",
],
out: [
"android/hardware/health/1.0/types.h",
diff --git a/health/1.0/Android.mk b/health/1.0/Android.mk
index f05d227..ebb89a7 100644
--- a/health/1.0/Android.mk
+++ b/health/1.0/Android.mk
@@ -8,7 +8,7 @@
LOCAL_MODULE := android.hardware.health@1.0-java
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -140,7 +140,7 @@
LOCAL_MODULE := android.hardware.health@1.0-java-static
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -272,7 +272,7 @@
LOCAL_MODULE := android.hardware.health@1.0-java-constants
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
#
diff --git a/health/1.0/default/Android.mk b/health/1.0/default/Android.mk
index 89d28cb..3c97185 100644
--- a/health/1.0/default/Android.mk
+++ b/health/1.0/default/Android.mk
@@ -2,6 +2,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.health@1.0-impl
+LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_C_INCLUDES := system/core/healthd/include system/core/base/include
LOCAL_SRC_FILES := \
@@ -37,6 +38,7 @@
include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
+LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_MODULE := android.hardware.health@1.0-service
LOCAL_INIT_RC := android.hardware.health@1.0-service.rc
diff --git a/health/1.0/default/android.hardware.health@1.0-service.rc b/health/1.0/default/android.hardware.health@1.0-service.rc
index a0d6a56..13cd7a5 100644
--- a/health/1.0/default/android.hardware.health@1.0-service.rc
+++ b/health/1.0/default/android.hardware.health@1.0-service.rc
@@ -1,4 +1,4 @@
-service health-hal-1-0 /system/bin/hw/android.hardware.health@1.0-service
+service health-hal-1-0 /vendor/bin/hw/android.hardware.health@1.0-service
class hal
user system
group system
diff --git a/ir/1.0/Android.bp b/ir/1.0/Android.bp
index fb9f070..da49579 100644
--- a/ir/1.0/Android.bp
+++ b/ir/1.0/Android.bp
@@ -1,12 +1,19 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
+filegroup {
+ name: "android.hardware.ir@1.0_hal",
+ srcs: [
+ "types.hal",
+ "IConsumerIr.hal",
+ ],
+}
+
genrule {
name: "android.hardware.ir@1.0_genc++",
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.ir@1.0",
srcs: [
- "types.hal",
- "IConsumerIr.hal",
+ ":android.hardware.ir@1.0_hal",
],
out: [
"android/hardware/ir/1.0/types.cpp",
@@ -19,8 +26,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.ir@1.0",
srcs: [
- "types.hal",
- "IConsumerIr.hal",
+ ":android.hardware.ir@1.0_hal",
],
out: [
"android/hardware/ir/1.0/types.h",
@@ -54,106 +60,3 @@
"android.hidl.base@1.0",
],
}
-
-genrule {
- name: "android.hardware.ir.vts.driver@1.0_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.ir@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/ir/1.0/ $(genDir)/android/hardware/ir/1.0/",
- srcs: [
- "types.hal",
- "IConsumerIr.hal",
- ],
- out: [
- "android/hardware/ir/1.0/types.vts.cpp",
- "android/hardware/ir/1.0/ConsumerIr.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.ir.vts.driver@1.0_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.ir@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/ir/1.0/ $(genDir)/android/hardware/ir/1.0/",
- srcs: [
- "types.hal",
- "IConsumerIr.hal",
- ],
- out: [
- "android/hardware/ir/1.0/types.vts.h",
- "android/hardware/ir/1.0/ConsumerIr.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.ir.vts.driver@1.0",
- generated_sources: ["android.hardware.ir.vts.driver@1.0_genc++"],
- generated_headers: ["android.hardware.ir.vts.driver@1.0_genc++_headers"],
- export_generated_headers: ["android.hardware.ir.vts.driver@1.0_genc++_headers"],
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libvts_common",
- "libvts_datatype",
- "libvts_measurement",
- "libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
- "android.hidl.base@1.0",
- "android.hardware.ir@1.0",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "android.hidl.base@1.0",
- ],
-}
-
-genrule {
- name: "android.hardware.ir@1.0-IConsumerIr-vts.profiler_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.ir@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/ir/1.0/ $(genDir)/android/hardware/ir/1.0/",
- srcs: [
- "IConsumerIr.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/ir/1.0/ConsumerIr.vts.cpp",
- "android/hardware/ir/1.0/types.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.ir@1.0-IConsumerIr-vts.profiler_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.ir@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/ir/1.0/ $(genDir)/android/hardware/ir/1.0/",
- srcs: [
- "IConsumerIr.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/ir/1.0/ConsumerIr.vts.h",
- "android/hardware/ir/1.0/types.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.ir@1.0-IConsumerIr-vts.profiler",
- generated_sources: ["android.hardware.ir@1.0-IConsumerIr-vts.profiler_genc++"],
- generated_headers: ["android.hardware.ir@1.0-IConsumerIr-vts.profiler_genc++_headers"],
- export_generated_headers: ["android.hardware.ir@1.0-IConsumerIr-vts.profiler_genc++_headers"],
- shared_libs: [
- "libbase",
- "libhidlbase",
- "libhidltransport",
- "libvts_profiling",
- "libvts_multidevice_proto",
- "libprotobuf-cpp-full",
- "android.hidl.base@1.0",
- "android.hardware.ir@1.0",
- ],
-}
diff --git a/ir/1.0/Android.mk b/ir/1.0/Android.mk
index 660b32b..d43286c 100644
--- a/ir/1.0/Android.mk
+++ b/ir/1.0/Android.mk
@@ -8,7 +8,7 @@
LOCAL_MODULE := android.hardware.ir@1.0-java
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -64,7 +64,7 @@
LOCAL_MODULE := android.hardware.ir@1.0-java-static
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
diff --git a/ir/1.0/default/Android.bp b/ir/1.0/default/Android.bp
index 7c441da..ed0b807 100644
--- a/ir/1.0/default/Android.bp
+++ b/ir/1.0/default/Android.bp
@@ -15,6 +15,7 @@
cc_library_shared {
name: "android.hardware.ir@1.0-impl",
relative_install_path: "hw",
+ proprietary: true,
srcs: ["ConsumerIr.cpp"],
shared_libs: [
"libhidlbase",
@@ -30,6 +31,7 @@
cc_binary {
relative_install_path: "hw",
name: "android.hardware.ir@1.0-service",
+ proprietary: true,
init_rc: ["android.hardware.ir@1.0-service.rc"],
srcs: ["service.cpp"],
diff --git a/ir/1.0/default/android.hardware.ir@1.0-service.rc b/ir/1.0/default/android.hardware.ir@1.0-service.rc
index 5b05ba2..47f34fe 100644
--- a/ir/1.0/default/android.hardware.ir@1.0-service.rc
+++ b/ir/1.0/default/android.hardware.ir@1.0-service.rc
@@ -1,4 +1,4 @@
-service ir-hal-1-0 /system/bin/hw/android.hardware.ir@1.0-service
+service ir-hal-1-0 /vendor/bin/hw/android.hardware.ir@1.0-service
class hal
user system
group system
\ No newline at end of file
diff --git a/ir/1.0/vts/Android.mk b/ir/1.0/vts/Android.mk
deleted file mode 100644
index 90c50c8..0000000
--- a/ir/1.0/vts/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(LOCAL_PATH)/functional/vts/testcases/hal/ir/hidl/target/Android.mk
diff --git a/ir/1.0/vts/ConsumerIr.vts b/ir/1.0/vts/ConsumerIr.vts
index bebc6cf..c31331e 100644
--- a/ir/1.0/vts/ConsumerIr.vts
+++ b/ir/1.0/vts/ConsumerIr.vts
@@ -5,6 +5,7 @@
package: "android.hardware.ir"
import: "android.hardware.ir@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
api: {
diff --git a/ir/1.0/vts/functional/Android.bp b/ir/1.0/vts/functional/Android.bp
index c5265de..1acd2a0 100644
--- a/ir/1.0/vts/functional/Android.bp
+++ b/ir/1.0/vts/functional/Android.bp
@@ -30,11 +30,7 @@
],
static_libs: ["libgtest"],
cflags: [
- "--coverage",
"-O0",
"-g",
],
- ldflags: [
- "--coverage"
- ]
}
diff --git a/ir/1.0/vts/functional/vts/testcases/hal/ir/hidl/target/Android.mk b/ir/1.0/vts/functional/vts/testcases/hal/ir/hidl/target/Android.mk
deleted file mode 100644
index a69fd08..0000000
--- a/ir/1.0/vts/functional/vts/testcases/hal/ir/hidl/target/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := HalIrHidlTargetTest
-VTS_CONFIG_SRC_DIR := testcases/hal/ir/hidl/target
-include test/vts/tools/build/Android.host_config.mk
diff --git a/ir/1.0/vts/functional/vts/testcases/hal/ir/hidl/target/AndroidTest.xml b/ir/1.0/vts/functional/vts/testcases/hal/ir/hidl/target/AndroidTest.xml
deleted file mode 100644
index bf3d236..0000000
--- a/ir/1.0/vts/functional/vts/testcases/hal/ir/hidl/target/AndroidTest.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<configuration description="Config for VTS IR HIDL HAL's target-side test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="HalIrHidlTargetTest"/>
- <option name="binary-test-sources" value="
- _32bit::DATA/nativetest/ir_hidl_hal_test/ir_hidl_hal_test,
- _64bit::DATA/nativetest64/ir_hidl_hal_test/ir_hidl_hal_test,
- "/>
- <option name="binary-test-type" value="hal_hidl_gtest" />
- <option name="precondition-hwbinder-service" value="android.hardware.ir" />
- <option name="test-timeout" value="1m" />
- </test>
-</configuration>
diff --git a/ir/1.0/vts/types.vts b/ir/1.0/vts/types.vts
index d308b1f..f1e9cbe 100644
--- a/ir/1.0/vts/types.vts
+++ b/ir/1.0/vts/types.vts
@@ -18,4 +18,5 @@
type: TYPE_SCALAR
scalar_type: "uint32_t"
}
-}
\ No newline at end of file
+}
+
diff --git a/keymaster/3.0/Android.bp b/keymaster/3.0/Android.bp
index a8247e1..074bb68 100644
--- a/keymaster/3.0/Android.bp
+++ b/keymaster/3.0/Android.bp
@@ -1,12 +1,19 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
+filegroup {
+ name: "android.hardware.keymaster@3.0_hal",
+ srcs: [
+ "types.hal",
+ "IKeymasterDevice.hal",
+ ],
+}
+
genrule {
name: "android.hardware.keymaster@3.0_genc++",
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.keymaster@3.0",
srcs: [
- "types.hal",
- "IKeymasterDevice.hal",
+ ":android.hardware.keymaster@3.0_hal",
],
out: [
"android/hardware/keymaster/3.0/types.cpp",
@@ -19,8 +26,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.keymaster@3.0",
srcs: [
- "types.hal",
- "IKeymasterDevice.hal",
+ ":android.hardware.keymaster@3.0_hal",
],
out: [
"android/hardware/keymaster/3.0/types.h",
diff --git a/keymaster/3.0/default/Android.mk b/keymaster/3.0/default/Android.mk
index 36d8890..87a8a05 100644
--- a/keymaster/3.0/default/Android.mk
+++ b/keymaster/3.0/default/Android.mk
@@ -2,6 +2,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.keymaster@3.0-impl
+LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_SRC_FILES := \
KeymasterDevice.cpp \
@@ -22,6 +23,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE_RELATIVE_PATH := hw
+LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE := android.hardware.keymaster@3.0-service
LOCAL_INIT_RC := android.hardware.keymaster@3.0-service.rc
LOCAL_SRC_FILES := \
diff --git a/keymaster/3.0/default/KeymasterDevice.cpp b/keymaster/3.0/default/KeymasterDevice.cpp
index 563ff84..24cf53a 100644
--- a/keymaster/3.0/default/KeymasterDevice.cpp
+++ b/keymaster/3.0/default/KeymasterDevice.cpp
@@ -375,6 +375,7 @@
}
Return<ErrorCode> KeymasterDevice::addRngEntropy(const hidl_vec<uint8_t>& data) {
+ if (!data.size()) return ErrorCode::OK;
return legacy_enum_conversion(
keymaster_device_->add_rng_entropy(keymaster_device_, &data[0], data.size()));
}
diff --git a/keymaster/3.0/default/android.hardware.keymaster@3.0-service.rc b/keymaster/3.0/default/android.hardware.keymaster@3.0-service.rc
index 86ed1e7..fd43178 100644
--- a/keymaster/3.0/default/android.hardware.keymaster@3.0-service.rc
+++ b/keymaster/3.0/default/android.hardware.keymaster@3.0-service.rc
@@ -1,4 +1,4 @@
-service keymaster-3-0 /system/bin/hw/android.hardware.keymaster@3.0-service
+service keymaster-3-0 /vendor/bin/hw/android.hardware.keymaster@3.0-service
class hal
user system
group system drmrpc
diff --git a/keymaster/3.0/default/service.cpp b/keymaster/3.0/default/service.cpp
index dd8c0b2..c4387c3 100644
--- a/keymaster/3.0/default/service.cpp
+++ b/keymaster/3.0/default/service.cpp
@@ -26,10 +26,8 @@
using android::hardware::joinRpcThreadpool;
using android::hardware::keymaster::V3_0::IKeymasterDevice;
-using android::hardware::registerPassthroughServiceImplementation;
+using android::hardware::defaultPassthroughServiceImplementation;
int main() {
- configureRpcThreadpool(1, true /*callerWillJoin*/);
- registerPassthroughServiceImplementation<IKeymasterDevice>("keymaster");
- joinRpcThreadpool();
+ return defaultPassthroughServiceImplementation<IKeymasterDevice>("keymaster", 1);
}
diff --git a/light/2.0/Android.bp b/light/2.0/Android.bp
index 118be88..093a9f3 100644
--- a/light/2.0/Android.bp
+++ b/light/2.0/Android.bp
@@ -1,12 +1,19 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
+filegroup {
+ name: "android.hardware.light@2.0_hal",
+ srcs: [
+ "types.hal",
+ "ILight.hal",
+ ],
+}
+
genrule {
name: "android.hardware.light@2.0_genc++",
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.light@2.0",
srcs: [
- "types.hal",
- "ILight.hal",
+ ":android.hardware.light@2.0_hal",
],
out: [
"android/hardware/light/2.0/types.cpp",
@@ -19,8 +26,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.light@2.0",
srcs: [
- "types.hal",
- "ILight.hal",
+ ":android.hardware.light@2.0_hal",
],
out: [
"android/hardware/light/2.0/types.h",
@@ -54,106 +60,3 @@
"android.hidl.base@1.0",
],
}
-
-genrule {
- name: "android.hardware.light.vts.driver@2.0_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.light@2.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/light/2.0/ $(genDir)/android/hardware/light/2.0/",
- srcs: [
- "types.hal",
- "ILight.hal",
- ],
- out: [
- "android/hardware/light/2.0/types.vts.cpp",
- "android/hardware/light/2.0/Light.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.light.vts.driver@2.0_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.light@2.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/light/2.0/ $(genDir)/android/hardware/light/2.0/",
- srcs: [
- "types.hal",
- "ILight.hal",
- ],
- out: [
- "android/hardware/light/2.0/types.vts.h",
- "android/hardware/light/2.0/Light.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.light.vts.driver@2.0",
- generated_sources: ["android.hardware.light.vts.driver@2.0_genc++"],
- generated_headers: ["android.hardware.light.vts.driver@2.0_genc++_headers"],
- export_generated_headers: ["android.hardware.light.vts.driver@2.0_genc++_headers"],
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libvts_common",
- "libvts_datatype",
- "libvts_measurement",
- "libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
- "android.hidl.base@1.0",
- "android.hardware.light@2.0",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "android.hidl.base@1.0",
- ],
-}
-
-genrule {
- name: "android.hardware.light@2.0-ILight-vts.profiler_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.light@2.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/light/2.0/ $(genDir)/android/hardware/light/2.0/",
- srcs: [
- "ILight.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/light/2.0/Light.vts.cpp",
- "android/hardware/light/2.0/types.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.light@2.0-ILight-vts.profiler_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.light@2.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/light/2.0/ $(genDir)/android/hardware/light/2.0/",
- srcs: [
- "ILight.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/light/2.0/Light.vts.h",
- "android/hardware/light/2.0/types.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.light@2.0-ILight-vts.profiler",
- generated_sources: ["android.hardware.light@2.0-ILight-vts.profiler_genc++"],
- generated_headers: ["android.hardware.light@2.0-ILight-vts.profiler_genc++_headers"],
- export_generated_headers: ["android.hardware.light@2.0-ILight-vts.profiler_genc++_headers"],
- shared_libs: [
- "libbase",
- "libhidlbase",
- "libhidltransport",
- "libvts_profiling",
- "libvts_multidevice_proto",
- "libprotobuf-cpp-full",
- "android.hidl.base@1.0",
- "android.hardware.light@2.0",
- ],
-}
diff --git a/light/2.0/Android.mk b/light/2.0/Android.mk
index ef19bad..7bb4293 100644
--- a/light/2.0/Android.mk
+++ b/light/2.0/Android.mk
@@ -8,7 +8,7 @@
LOCAL_MODULE := android.hardware.light@2.0-java
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -140,7 +140,7 @@
LOCAL_MODULE := android.hardware.light@2.0-java-static
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
diff --git a/light/2.0/default/Android.mk b/light/2.0/default/Android.mk
index d14d7c0..7bd096c 100644
--- a/light/2.0/default/Android.mk
+++ b/light/2.0/default/Android.mk
@@ -2,6 +2,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.light@2.0-impl
+LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_SRC_FILES := \
Light.cpp \
@@ -22,6 +23,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE_RELATIVE_PATH := hw
+LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE := android.hardware.light@2.0-service
LOCAL_INIT_RC := android.hardware.light@2.0-service.rc
LOCAL_SRC_FILES := \
diff --git a/light/2.0/default/android.hardware.light@2.0-service.rc b/light/2.0/default/android.hardware.light@2.0-service.rc
index 3ba97d8..c3284c6 100644
--- a/light/2.0/default/android.hardware.light@2.0-service.rc
+++ b/light/2.0/default/android.hardware.light@2.0-service.rc
@@ -1,4 +1,4 @@
-service light-hal-2-0 /system/bin/hw/android.hardware.light@2.0-service
+service light-hal-2-0 /vendor/bin/hw/android.hardware.light@2.0-service
class hal
user system
group system
\ No newline at end of file
diff --git a/light/2.0/vts/Light.vts b/light/2.0/vts/Light.vts
index 5d49822..163405f 100644
--- a/light/2.0/vts/Light.vts
+++ b/light/2.0/vts/Light.vts
@@ -5,6 +5,7 @@
package: "android.hardware.light"
import: "android.hardware.light@2.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
api: {
diff --git a/light/2.0/vts/functional/Android.bp b/light/2.0/vts/functional/Android.bp
index 889457f..53f5d7f 100644
--- a/light/2.0/vts/functional/Android.bp
+++ b/light/2.0/vts/functional/Android.bp
@@ -27,12 +27,8 @@
],
static_libs: ["libgtest"],
cflags: [
- "--coverage",
"-O0",
"-g",
- ],
- ldflags: [
- "--coverage"
]
}
diff --git a/light/2.0/vts/functional/Android.mk b/light/2.0/vts/functional/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/light/2.0/vts/functional/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/light/2.0/vts/functional/vts/Android.mk b/light/2.0/vts/functional/vts/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/light/2.0/vts/functional/vts/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/light/2.0/vts/functional/vts/testcases/Android.mk b/light/2.0/vts/functional/vts/testcases/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/light/2.0/vts/functional/vts/testcases/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/light/2.0/vts/functional/vts/testcases/hal/Android.mk b/light/2.0/vts/functional/vts/testcases/hal/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/light/2.0/vts/functional/vts/testcases/hal/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/light/2.0/vts/functional/vts/testcases/hal/light/Android.mk b/light/2.0/vts/functional/vts/testcases/hal/light/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/light/2.0/vts/functional/vts/testcases/hal/light/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/light/2.0/vts/functional/vts/testcases/hal/light/hidl/Android.mk b/light/2.0/vts/functional/vts/testcases/hal/light/hidl/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/light/2.0/vts/functional/vts/testcases/hal/light/hidl/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/light/2.0/vts/functional/vts/testcases/hal/light/hidl/target/Android.mk b/light/2.0/vts/functional/vts/testcases/hal/light/hidl/target/Android.mk
deleted file mode 100644
index 4761a3e..0000000
--- a/light/2.0/vts/functional/vts/testcases/hal/light/hidl/target/Android.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := LightHidlTargetTest
-VTS_CONFIG_SRC_DIR := testcases/hal/light/hidl/target
-include test/vts/tools/build/Android.host_config.mk
diff --git a/light/2.0/vts/functional/vts/testcases/hal/light/hidl/target/AndroidTest.xml b/light/2.0/vts/functional/vts/testcases/hal/light/hidl/target/AndroidTest.xml
deleted file mode 100644
index 240f1f0..0000000
--- a/light/2.0/vts/functional/vts/testcases/hal/light/hidl/target/AndroidTest.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<configuration description="Config for VTS Light HIDL HAL's target-side test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="LightHidlTargetTest" />
- <option name="binary-test-sources" value="
- _32bit::DATA/nativetest/light_hidl_hal_test/light_hidl_hal_test,
- _64bit::DATA/nativetest64/light_hidl_hal_test/light_hidl_hal_test,
- "/>
- <option name="binary-test-type" value="gtest" />
- <option name="test-timeout" value="1m" />
- </test>
-</configuration>
-
diff --git a/light/2.0/vts/functional/vts/testcases/hal/light/hidl/target_profiling/Android.mk b/light/2.0/vts/functional/vts/testcases/hal/light/hidl/target_profiling/Android.mk
deleted file mode 100644
index 939929d..0000000
--- a/light/2.0/vts/functional/vts/testcases/hal/light/hidl/target_profiling/Android.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := LightHidlTargetProfilingTest
-VTS_CONFIG_SRC_DIR := testcases/hal/light/hidl/target_profiling
-include test/vts/tools/build/Android.host_config.mk
diff --git a/light/2.0/vts/functional/vts/testcases/hal/light/hidl/target_profiling/AndroidTest.xml b/light/2.0/vts/functional/vts/testcases/hal/light/hidl/target_profiling/AndroidTest.xml
deleted file mode 100644
index 455802d..0000000
--- a/light/2.0/vts/functional/vts/testcases/hal/light/hidl/target_profiling/AndroidTest.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<configuration description="Config for VTS Light HIDL HAL's target-side test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="LightHidlTargetProfilingTest" />
- <option name="binary-test-sources" value="
- _32bit::DATA/nativetest/light_hidl_hal_test/light_hidl_hal_test,
- _64bit::DATA/nativetest64/light_hidl_hal_test/light_hidl_hal_test,
- "/>
- <option name="binary-test-type" value="gtest" />
- <option name="test-timeout" value="1m" />
- <option name="enable-profiling" value="true" />
- </test>
-</configuration>
-
diff --git a/media/1.0/Android.bp b/media/1.0/Android.bp
index d533e5a..7518eb3 100644
--- a/media/1.0/Android.bp
+++ b/media/1.0/Android.bp
@@ -1,11 +1,18 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
+filegroup {
+ name: "android.hardware.media@1.0_hal",
+ srcs: [
+ "types.hal",
+ ],
+}
+
genrule {
name: "android.hardware.media@1.0_genc++",
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.media@1.0",
srcs: [
- "types.hal",
+ ":android.hardware.media@1.0_hal",
],
out: [
"android/hardware/media/1.0/types.cpp",
@@ -17,7 +24,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.media@1.0",
srcs: [
- "types.hal",
+ ":android.hardware.media@1.0_hal",
],
out: [
"android/hardware/media/1.0/types.h",
diff --git a/media/omx/1.0/Android.bp b/media/omx/1.0/Android.bp
index f79aabb..85d15ae 100644
--- a/media/omx/1.0/Android.bp
+++ b/media/omx/1.0/Android.bp
@@ -1,9 +1,7 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
-genrule {
- name: "android.hardware.media.omx@1.0_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.media.omx@1.0",
+filegroup {
+ name: "android.hardware.media.omx@1.0_hal",
srcs: [
"types.hal",
"IGraphicBufferSource.hal",
@@ -14,6 +12,15 @@
"IOmxObserver.hal",
"IOmxProducerListener.hal",
],
+}
+
+genrule {
+ name: "android.hardware.media.omx@1.0_genc++",
+ tools: ["hidl-gen"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.media.omx@1.0",
+ srcs: [
+ ":android.hardware.media.omx@1.0_hal",
+ ],
out: [
"android/hardware/media/omx/1.0/types.cpp",
"android/hardware/media/omx/1.0/GraphicBufferSourceAll.cpp",
@@ -31,14 +38,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.media.omx@1.0",
srcs: [
- "types.hal",
- "IGraphicBufferSource.hal",
- "IOmx.hal",
- "IOmxBufferProducer.hal",
- "IOmxBufferSource.hal",
- "IOmxNode.hal",
- "IOmxObserver.hal",
- "IOmxProducerListener.hal",
+ ":android.hardware.media.omx@1.0_hal",
],
out: [
"android/hardware/media/omx/1.0/types.h",
@@ -54,8 +54,8 @@
"android/hardware/media/omx/1.0/BsOmx.h",
"android/hardware/media/omx/1.0/IOmxBufferProducer.h",
"android/hardware/media/omx/1.0/IHwOmxBufferProducer.h",
- "android/hardware/media/omx/1.0/BnOmxBufferProducer.h",
- "android/hardware/media/omx/1.0/BpOmxBufferProducer.h",
+ "android/hardware/media/omx/1.0/BnHwOmxBufferProducer.h",
+ "android/hardware/media/omx/1.0/BpHwOmxBufferProducer.h",
"android/hardware/media/omx/1.0/BsOmxBufferProducer.h",
"android/hardware/media/omx/1.0/IOmxBufferSource.h",
"android/hardware/media/omx/1.0/IHwOmxBufferSource.h",
@@ -74,8 +74,8 @@
"android/hardware/media/omx/1.0/BsOmxObserver.h",
"android/hardware/media/omx/1.0/IOmxProducerListener.h",
"android/hardware/media/omx/1.0/IHwOmxProducerListener.h",
- "android/hardware/media/omx/1.0/BnOmxProducerListener.h",
- "android/hardware/media/omx/1.0/BpOmxProducerListener.h",
+ "android/hardware/media/omx/1.0/BnHwOmxProducerListener.h",
+ "android/hardware/media/omx/1.0/BpHwOmxProducerListener.h",
"android/hardware/media/omx/1.0/BsOmxProducerListener.h",
],
}
diff --git a/media/omx/1.0/IOmxBufferProducer.hal b/media/omx/1.0/IOmxBufferProducer.hal
index 12b5d14..7e2172b 100644
--- a/media/omx/1.0/IOmxBufferProducer.hal
+++ b/media/omx/1.0/IOmxBufferProducer.hal
@@ -72,12 +72,27 @@
};
/**
+ * Ref: frameworks/native/include/gui/FrameTimestamp.h: CompositorTiming
+ *
+ * The most recent compositor timing info sent from consumer to producer
+ * through a HIDL interface.
+ */
+ struct CompositorTiming {
+ int64_t deadlineNs;
+ int64_t intervalNs;
+ int64_t presentLatencyNs;
+ };
+
+ /**
* Ref: frameworks/native/include/gui/FrameTimestamp.h: FrameEventHistoryDelta
*
* A collection of updates from consumer to producer that can be sent
* through a HIDL interface.
*/
- typedef vec<FrameEventsDelta> FrameEventHistoryDelta;
+ struct FrameEventHistoryDelta {
+ vec<FrameEventsDelta> deltas;
+ CompositorTiming compositorTiming;
+ };
/**
* Modes for disconnection.
@@ -121,6 +136,7 @@
uint32_t transformHint;
uint32_t numPendingBuffers;
uint64_t nextFrameNumber;
+ bool bufferReplaced;
FrameEventHistoryDelta frameTimestamps;
};
diff --git a/memtrack/1.0/Android.bp b/memtrack/1.0/Android.bp
index 36e7594..9f4c7f6 100644
--- a/memtrack/1.0/Android.bp
+++ b/memtrack/1.0/Android.bp
@@ -1,12 +1,19 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
+filegroup {
+ name: "android.hardware.memtrack@1.0_hal",
+ srcs: [
+ "types.hal",
+ "IMemtrack.hal",
+ ],
+}
+
genrule {
name: "android.hardware.memtrack@1.0_genc++",
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.memtrack@1.0",
srcs: [
- "types.hal",
- "IMemtrack.hal",
+ ":android.hardware.memtrack@1.0_hal",
],
out: [
"android/hardware/memtrack/1.0/types.cpp",
@@ -19,8 +26,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.memtrack@1.0",
srcs: [
- "types.hal",
- "IMemtrack.hal",
+ ":android.hardware.memtrack@1.0_hal",
],
out: [
"android/hardware/memtrack/1.0/types.h",
@@ -54,106 +60,3 @@
"android.hidl.base@1.0",
],
}
-
-genrule {
- name: "android.hardware.memtrack.vts.driver@1.0_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.memtrack@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/memtrack/1.0/ $(genDir)/android/hardware/memtrack/1.0/",
- srcs: [
- "types.hal",
- "IMemtrack.hal",
- ],
- out: [
- "android/hardware/memtrack/1.0/types.vts.cpp",
- "android/hardware/memtrack/1.0/Memtrack.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.memtrack.vts.driver@1.0_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.memtrack@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/memtrack/1.0/ $(genDir)/android/hardware/memtrack/1.0/",
- srcs: [
- "types.hal",
- "IMemtrack.hal",
- ],
- out: [
- "android/hardware/memtrack/1.0/types.vts.h",
- "android/hardware/memtrack/1.0/Memtrack.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.memtrack.vts.driver@1.0",
- generated_sources: ["android.hardware.memtrack.vts.driver@1.0_genc++"],
- generated_headers: ["android.hardware.memtrack.vts.driver@1.0_genc++_headers"],
- export_generated_headers: ["android.hardware.memtrack.vts.driver@1.0_genc++_headers"],
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libvts_common",
- "libvts_datatype",
- "libvts_measurement",
- "libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
- "android.hidl.base@1.0",
- "android.hardware.memtrack@1.0",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "android.hidl.base@1.0",
- ],
-}
-
-genrule {
- name: "android.hardware.memtrack@1.0-IMemtrack-vts.profiler_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.memtrack@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/memtrack/1.0/ $(genDir)/android/hardware/memtrack/1.0/",
- srcs: [
- "IMemtrack.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/memtrack/1.0/Memtrack.vts.cpp",
- "android/hardware/memtrack/1.0/types.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.memtrack@1.0-IMemtrack-vts.profiler_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.memtrack@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/memtrack/1.0/ $(genDir)/android/hardware/memtrack/1.0/",
- srcs: [
- "IMemtrack.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/memtrack/1.0/Memtrack.vts.h",
- "android/hardware/memtrack/1.0/types.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.memtrack@1.0-IMemtrack-vts.profiler",
- generated_sources: ["android.hardware.memtrack@1.0-IMemtrack-vts.profiler_genc++"],
- generated_headers: ["android.hardware.memtrack@1.0-IMemtrack-vts.profiler_genc++_headers"],
- export_generated_headers: ["android.hardware.memtrack@1.0-IMemtrack-vts.profiler_genc++_headers"],
- shared_libs: [
- "libbase",
- "libhidlbase",
- "libhidltransport",
- "libvts_profiling",
- "libvts_multidevice_proto",
- "libprotobuf-cpp-full",
- "android.hidl.base@1.0",
- "android.hardware.memtrack@1.0",
- ],
-}
diff --git a/memtrack/1.0/Android.mk b/memtrack/1.0/Android.mk
index eeb67f6..62bee97 100644
--- a/memtrack/1.0/Android.mk
+++ b/memtrack/1.0/Android.mk
@@ -8,7 +8,7 @@
LOCAL_MODULE := android.hardware.memtrack@1.0-java
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -121,7 +121,7 @@
LOCAL_MODULE := android.hardware.memtrack@1.0-java-static
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
diff --git a/memtrack/1.0/default/Android.bp b/memtrack/1.0/default/Android.bp
index 91fa1ea..b43a159 100644
--- a/memtrack/1.0/default/Android.bp
+++ b/memtrack/1.0/default/Android.bp
@@ -14,6 +14,7 @@
cc_library_shared {
name: "android.hardware.memtrack@1.0-impl",
+ proprietary: true,
relative_install_path: "hw",
srcs: ["Memtrack.cpp"],
@@ -32,6 +33,7 @@
cc_binary {
relative_install_path: "hw",
+ proprietary: true,
name: "android.hardware.memtrack@1.0-service",
init_rc: ["android.hardware.memtrack@1.0-service.rc"],
srcs: ["service.cpp"],
diff --git a/memtrack/1.0/default/android.hardware.memtrack@1.0-service.rc b/memtrack/1.0/default/android.hardware.memtrack@1.0-service.rc
index 14e7d00..c975a18 100644
--- a/memtrack/1.0/default/android.hardware.memtrack@1.0-service.rc
+++ b/memtrack/1.0/default/android.hardware.memtrack@1.0-service.rc
@@ -1,4 +1,4 @@
-service memtrack-hal-1-0 /system/bin/hw/android.hardware.memtrack@1.0-service
+service memtrack-hal-1-0 /vendor/bin/hw/android.hardware.memtrack@1.0-service
class hal
user system
group system
diff --git a/memtrack/1.0/vts/Android.mk b/memtrack/1.0/vts/Android.mk
deleted file mode 100644
index fbb5951..0000000
--- a/memtrack/1.0/vts/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(LOCAL_PATH)/functional/vts/testcases/hal/memtrack/hidl/Android.mk
diff --git a/memtrack/1.0/vts/Memtrack.vts b/memtrack/1.0/vts/Memtrack.vts
index 9fce2a0..42a422e 100644
--- a/memtrack/1.0/vts/Memtrack.vts
+++ b/memtrack/1.0/vts/Memtrack.vts
@@ -5,6 +5,7 @@
package: "android.hardware.memtrack"
import: "android.hardware.memtrack@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
api: {
diff --git a/memtrack/1.0/vts/functional/Android.bp b/memtrack/1.0/vts/functional/Android.bp
index b3e560a..0f57adc 100644
--- a/memtrack/1.0/vts/functional/Android.bp
+++ b/memtrack/1.0/vts/functional/Android.bp
@@ -30,11 +30,7 @@
],
static_libs: ["libgtest"],
cflags: [
- "--coverage",
"-O0",
"-g",
- ],
- ldflags: [
- "--coverage"
]
}
diff --git a/memtrack/1.0/vts/functional/vts/testcases/hal/memtrack/hidl/Android.mk b/memtrack/1.0/vts/functional/vts/testcases/hal/memtrack/hidl/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/memtrack/1.0/vts/functional/vts/testcases/hal/memtrack/hidl/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/memtrack/1.0/vts/functional/vts/testcases/hal/memtrack/hidl/target/Android.mk b/memtrack/1.0/vts/functional/vts/testcases/hal/memtrack/hidl/target/Android.mk
deleted file mode 100644
index 8dcaabb..0000000
--- a/memtrack/1.0/vts/functional/vts/testcases/hal/memtrack/hidl/target/Android.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := HalMemtrackHidlTargetTest
-VTS_CONFIG_SRC_DIR := testcases/hal/memtrack/hidl/target
-include test/vts/tools/build/Android.host_config.mk
diff --git a/memtrack/1.0/vts/functional/vts/testcases/hal/memtrack/hidl/target/AndroidTest.xml b/memtrack/1.0/vts/functional/vts/testcases/hal/memtrack/hidl/target/AndroidTest.xml
deleted file mode 100644
index 9b00b4c..0000000
--- a/memtrack/1.0/vts/functional/vts/testcases/hal/memtrack/hidl/target/AndroidTest.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<configuration description="Config for VTS Memtrack HIDL HAL's target-side test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="HalMemtrackHidlTargetTest"/>
- <option name="binary-test-sources" value="
- _32bit::DATA/nativetest/memtrack_hidl_hal_test/memtrack_hidl_hal_test,
- _64bit::DATA/nativetest64/memtrack_hidl_hal_test/memtrack_hidl_hal_test,
- "/>
- <option name="binary-test-type" value="gtest" />
- <option name="test-timeout" value="5m" />
- </test>
-</configuration>
diff --git a/memtrack/1.0/vts/functional/vts/testcases/hal/memtrack/hidl/target_profiling/Android.mk b/memtrack/1.0/vts/functional/vts/testcases/hal/memtrack/hidl/target_profiling/Android.mk
deleted file mode 100644
index d397621..0000000
--- a/memtrack/1.0/vts/functional/vts/testcases/hal/memtrack/hidl/target_profiling/Android.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := HalMemtrackHidlTargetProfilingTest
-VTS_CONFIG_SRC_DIR := testcases/hal/memtrack/hidl/target_profiling
-include test/vts/tools/build/Android.host_config.mk
diff --git a/memtrack/1.0/vts/functional/vts/testcases/hal/memtrack/hidl/target_profiling/AndroidTest.xml b/memtrack/1.0/vts/functional/vts/testcases/hal/memtrack/hidl/target_profiling/AndroidTest.xml
deleted file mode 100644
index d813be1..0000000
--- a/memtrack/1.0/vts/functional/vts/testcases/hal/memtrack/hidl/target_profiling/AndroidTest.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<configuration description="Config for VTS Memtrack HIDL HAL's target-side test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="HalMemtrackHidlTargetProfilingTest"/>
- <option name="binary-test-sources" value="
- _32bit::DATA/nativetest/memtrack_hidl_hal_test/memtrack_hidl_hal_test,
- _64bit::DATA/nativetest64/memtrack_hidl_hal_test/memtrack_hidl_hal_test,
- "/>
- <option name="binary-test-type" value="gtest" />
- <option name="test-timeout" value="5m" />
- <option name="enable-profiling" value="true" />
- </test>
-</configuration>
diff --git a/nfc/1.0/Android.bp b/nfc/1.0/Android.bp
index 0fda103..e7305b4 100644
--- a/nfc/1.0/Android.bp
+++ b/nfc/1.0/Android.bp
@@ -1,13 +1,20 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
+filegroup {
+ name: "android.hardware.nfc@1.0_hal",
+ srcs: [
+ "types.hal",
+ "INfc.hal",
+ "INfcClientCallback.hal",
+ ],
+}
+
genrule {
name: "android.hardware.nfc@1.0_genc++",
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.nfc@1.0",
srcs: [
- "types.hal",
- "INfc.hal",
- "INfcClientCallback.hal",
+ ":android.hardware.nfc@1.0_hal",
],
out: [
"android/hardware/nfc/1.0/types.cpp",
@@ -21,9 +28,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.nfc@1.0",
srcs: [
- "types.hal",
- "INfc.hal",
- "INfcClientCallback.hal",
+ ":android.hardware.nfc@1.0_hal",
],
out: [
"android/hardware/nfc/1.0/types.h",
@@ -62,155 +67,3 @@
"android.hidl.base@1.0",
],
}
-
-genrule {
- name: "android.hardware.nfc.vts.driver@1.0_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.nfc@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/nfc/1.0/ $(genDir)/android/hardware/nfc/1.0/",
- srcs: [
- "types.hal",
- "INfc.hal",
- "INfcClientCallback.hal",
- ],
- out: [
- "android/hardware/nfc/1.0/types.vts.cpp",
- "android/hardware/nfc/1.0/Nfc.vts.cpp",
- "android/hardware/nfc/1.0/NfcClientCallback.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.nfc.vts.driver@1.0_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.nfc@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/nfc/1.0/ $(genDir)/android/hardware/nfc/1.0/",
- srcs: [
- "types.hal",
- "INfc.hal",
- "INfcClientCallback.hal",
- ],
- out: [
- "android/hardware/nfc/1.0/types.vts.h",
- "android/hardware/nfc/1.0/Nfc.vts.h",
- "android/hardware/nfc/1.0/NfcClientCallback.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.nfc.vts.driver@1.0",
- generated_sources: ["android.hardware.nfc.vts.driver@1.0_genc++"],
- generated_headers: ["android.hardware.nfc.vts.driver@1.0_genc++_headers"],
- export_generated_headers: ["android.hardware.nfc.vts.driver@1.0_genc++_headers"],
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libvts_common",
- "libvts_datatype",
- "libvts_measurement",
- "libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
- "android.hidl.base@1.0",
- "android.hardware.nfc@1.0",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "android.hidl.base@1.0",
- ],
-}
-
-genrule {
- name: "android.hardware.nfc@1.0-INfc-vts.profiler_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.nfc@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/nfc/1.0/ $(genDir)/android/hardware/nfc/1.0/",
- srcs: [
- "INfc.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/nfc/1.0/Nfc.vts.cpp",
- "android/hardware/nfc/1.0/types.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.nfc@1.0-INfc-vts.profiler_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.nfc@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/nfc/1.0/ $(genDir)/android/hardware/nfc/1.0/",
- srcs: [
- "INfc.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/nfc/1.0/Nfc.vts.h",
- "android/hardware/nfc/1.0/types.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.nfc@1.0-INfc-vts.profiler",
- generated_sources: ["android.hardware.nfc@1.0-INfc-vts.profiler_genc++"],
- generated_headers: ["android.hardware.nfc@1.0-INfc-vts.profiler_genc++_headers"],
- export_generated_headers: ["android.hardware.nfc@1.0-INfc-vts.profiler_genc++_headers"],
- shared_libs: [
- "libbase",
- "libhidlbase",
- "libhidltransport",
- "libvts_profiling",
- "libvts_multidevice_proto",
- "libprotobuf-cpp-full",
- "android.hidl.base@1.0",
- "android.hardware.nfc@1.0",
- ],
-}
-
-genrule {
- name: "android.hardware.nfc@1.0-INfcClientCallback-vts.profiler_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.nfc@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/nfc/1.0/ $(genDir)/android/hardware/nfc/1.0/",
- srcs: [
- "INfcClientCallback.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/nfc/1.0/NfcClientCallback.vts.cpp",
- "android/hardware/nfc/1.0/types.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.nfc@1.0-INfcClientCallback-vts.profiler_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.nfc@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/nfc/1.0/ $(genDir)/android/hardware/nfc/1.0/",
- srcs: [
- "INfcClientCallback.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/nfc/1.0/NfcClientCallback.vts.h",
- "android/hardware/nfc/1.0/types.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.nfc@1.0-INfcClientCallback-vts.profiler",
- generated_sources: ["android.hardware.nfc@1.0-INfcClientCallback-vts.profiler_genc++"],
- generated_headers: ["android.hardware.nfc@1.0-INfcClientCallback-vts.profiler_genc++_headers"],
- export_generated_headers: ["android.hardware.nfc@1.0-INfcClientCallback-vts.profiler_genc++_headers"],
- shared_libs: [
- "libbase",
- "libhidlbase",
- "libhidltransport",
- "libvts_profiling",
- "libvts_multidevice_proto",
- "libprotobuf-cpp-full",
- "android.hidl.base@1.0",
- "android.hardware.nfc@1.0",
- ],
-}
diff --git a/nfc/1.0/Android.mk b/nfc/1.0/Android.mk
index 823bde5..6f09764 100644
--- a/nfc/1.0/Android.mk
+++ b/nfc/1.0/Android.mk
@@ -8,7 +8,7 @@
LOCAL_MODULE := android.hardware.nfc@1.0-java
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -106,7 +106,7 @@
LOCAL_MODULE := android.hardware.nfc@1.0-java-static
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -204,7 +204,7 @@
LOCAL_MODULE := android.hardware.nfc@1.0-java-constants
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
#
diff --git a/nfc/1.0/default/Android.bp b/nfc/1.0/default/Android.bp
index b484ba6..02f5664 100644
--- a/nfc/1.0/default/Android.bp
+++ b/nfc/1.0/default/Android.bp
@@ -1,6 +1,7 @@
cc_library_shared {
name: "android.hardware.nfc@1.0-impl",
relative_install_path: "hw",
+ proprietary: true,
srcs: ["Nfc.cpp"],
shared_libs: [
"liblog",
diff --git a/nfc/1.0/default/Android.mk b/nfc/1.0/default/Android.mk
index a6c7d5c..fbb340f 100644
--- a/nfc/1.0/default/Android.mk
+++ b/nfc/1.0/default/Android.mk
@@ -2,6 +2,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE_RELATIVE_PATH := hw
+LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE := android.hardware.nfc@1.0-service
LOCAL_INIT_RC := android.hardware.nfc@1.0-service.rc
LOCAL_SRC_FILES := \
@@ -22,4 +23,5 @@
libhidltransport \
android.hardware.nfc@1.0 \
+
include $(BUILD_EXECUTABLE)
diff --git a/nfc/1.0/default/android.hardware.nfc@1.0-service.rc b/nfc/1.0/default/android.hardware.nfc@1.0-service.rc
index 7b67577..c9b8014 100644
--- a/nfc/1.0/default/android.hardware.nfc@1.0-service.rc
+++ b/nfc/1.0/default/android.hardware.nfc@1.0-service.rc
@@ -1,4 +1,4 @@
-service nfc_hal_service /system/bin/hw/android.hardware.nfc@1.0-service
+service nfc_hal_service /vendor/bin/hw/android.hardware.nfc@1.0-service
class hal
user nfc
group nfc
diff --git a/nfc/1.0/vts/Nfc.vts b/nfc/1.0/vts/Nfc.vts
index 9261a60..48b2750 100644
--- a/nfc/1.0/vts/Nfc.vts
+++ b/nfc/1.0/vts/Nfc.vts
@@ -6,6 +6,7 @@
import: "android.hardware.nfc@1.0::INfcClientCallback"
import: "android.hardware.nfc@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
api: {
@@ -16,8 +17,7 @@
}
arg: {
type: TYPE_HIDL_CALLBACK
- predefined_type: "INfcClientCallback"
- is_callback: true
+ predefined_type: "::android::hardware::nfc::V1_0::INfcClientCallback"
}
callflow: {
entry: true
@@ -87,13 +87,6 @@
next: "powerCycle"
next: "controlGranted"
}
- callflow: {
- next: "write"
- next: "close"
- next: "coreInitialized"
- next: "powerCycle"
- next: "controlGranted"
- }
}
api: {
@@ -105,9 +98,6 @@
callflow: {
exit: true
}
- callflow: {
- exit: true
- }
}
api: {
@@ -123,13 +113,6 @@
next: "coreInitialized"
next: "powerCycle"
}
- callflow: {
- next: "write"
- next: "close"
- next: "prediscover"
- next: "coreInitialized"
- next: "powerCycle"
- }
}
api: {
@@ -145,13 +128,6 @@
next: "controlGranted"
next: "close"
}
- callflow: {
- next: "write"
- next: "coreInitialized"
- next: "prediscover"
- next: "controlGranted"
- next: "close"
- }
}
}
diff --git a/nfc/1.0/vts/NfcClientCallback.vts b/nfc/1.0/vts/NfcClientCallback.vts
index e39ea7c..b06f12b 100644
--- a/nfc/1.0/vts/NfcClientCallback.vts
+++ b/nfc/1.0/vts/NfcClientCallback.vts
@@ -5,6 +5,7 @@
package: "android.hardware.nfc"
import: "android.hardware.nfc@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
api: {
diff --git a/nfc/1.0/vts/functional/Android.bp b/nfc/1.0/vts/functional/Android.bp
index 021f7c1..0f9eb3d 100644
--- a/nfc/1.0/vts/functional/Android.bp
+++ b/nfc/1.0/vts/functional/Android.bp
@@ -31,11 +31,7 @@
],
static_libs: ["libgtest"],
cflags: [
- "--coverage",
"-O0",
"-g",
],
- ldflags: [
- "--coverage"
- ]
}
diff --git a/nfc/1.0/vts/functional/Android.mk b/nfc/1.0/vts/functional/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/nfc/1.0/vts/functional/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/nfc/1.0/vts/functional/vts/Android.mk b/nfc/1.0/vts/functional/vts/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/nfc/1.0/vts/functional/vts/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/nfc/1.0/vts/functional/vts/testcases/Android.mk b/nfc/1.0/vts/functional/vts/testcases/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/nfc/1.0/vts/functional/vts/testcases/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/Android.mk b/nfc/1.0/vts/functional/vts/testcases/hal/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/nfc/1.0/vts/functional/vts/testcases/hal/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/Android.mk b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/__init__.py b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/__init__.py
+++ /dev/null
diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/Android.mk b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/__init__.py b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/__init__.py
+++ /dev/null
diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/Android.mk b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/NfcHidlBasicTest.py b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/NfcHidlBasicTest.py
deleted file mode 100644
index cb40931..0000000
--- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/NfcHidlBasicTest.py
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/usr/bin/env python3.4
-#
-# Copyright (C) 2016 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.
-#
-
-import logging
-import time
-
-from vts.runners.host import asserts
-from vts.runners.host import base_test_with_webdb
-from vts.runners.host import test_runner
-from vts.utils.python.controllers import android_device
-from vts.utils.python.coverage import coverage_utils
-
-PASSTHROUGH_MODE_KEY = "passthrough_mode"
-
-
-class NfcHidlBasicTest(base_test_with_webdb.BaseTestWithWebDbClass):
- """A simple testcase for the NFC HIDL HAL."""
-
- def setUpClass(self):
- """Creates a mirror and turns on the framework-layer NFC service."""
- self.dut = self.registerController(android_device)[0]
-
- self.getUserParams(opt_param_names=[PASSTHROUGH_MODE_KEY])
-
- self.dut.shell.InvokeTerminal("one")
- self.dut.shell.one.Execute("setenforce 0") # SELinux permissive mode
- self.dut.shell.one.Execute("svc nfc disable") # Turn off
- time.sleep(5)
-
- if getattr(self, PASSTHROUGH_MODE_KEY, True):
- self.dut.shell.one.Execute(
- "setprop vts.hal.vts.hidl.get_stub true")
- else:
- self.dut.shell.one.Execute(
- "setprop vts.hal.vts.hidl.get_stub false")
-
- self.dut.hal.InitHidlHal(
- target_type="nfc",
- target_basepaths=self.dut.libPaths,
- target_version=1.0,
- target_package="android.hardware.nfc",
- target_component_name="INfc",
- bits=64 if self.dut.is64Bit else 32)
-
- def tearDownClass(self):
- """Turns off the framework-layer NFC service."""
- # Ideally, we would want to store the nfc service's state before
- # turning that off in setUpClass and restore the original state.
- self.dut.shell.one.Execute("svc nfc disable") # make sure it's off
-
- def testBase(self):
- """A simple test case which just calls each registered function."""
- # TODO: extend to make realistic testcases
- # For example, call after CORE_INIT_RSP is received.
- # result = self.dut.hal.nfc.coreInitialized([1])
- # logging.info("coreInitialized result: %s", result)
-
- def send_event(NfcEvent, NfcStatus):
- logging.info("callback send_event")
- logging.info("arg0 %s", NfcEvent)
- logging.info("arg1 %s", NfcStatus)
-
- def send_data(NfcData):
- logging.info("callback send_data")
- logging.info("arg0 %s", NfcData)
-
- client_callback = self.dut.hal.nfc.GetHidlCallbackInterface(
- "INfcClientCallback",
- sendEvent=send_event,
- sendData=send_data)
-
- result = self.dut.hal.nfc.open(client_callback)
- logging.info("open result: %s", result)
-
- result = self.dut.hal.nfc.prediscover()
- logging.info("prediscover result: %s", result)
-
- result = self.dut.hal.nfc.controlGranted()
- logging.info("controlGranted result: %s", result)
-
- result = self.dut.hal.nfc.powerCycle()
- logging.info("powerCycle result: %s", result)
-
- nfc_types = self.dut.hal.nfc.GetHidlTypeInterface("types")
- logging.info("nfc_types: %s", nfc_types)
-
- result = self.dut.hal.nfc.write([0, 1, 2, 3, 4, 5])
- logging.info("write result: %s", result)
-
- result = self.dut.hal.nfc.close()
- logging.info("close result: %s", result)
-
- self.SetCoverageData(coverage_utils.GetGcdaDict(self.dut))
-
-if __name__ == "__main__":
- test_runner.main()
diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/__init__.py b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/__init__.py
+++ /dev/null
diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/binderize/Android.mk b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/binderize/Android.mk
deleted file mode 100644
index cd58d32..0000000
--- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/binderize/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := NfcHidlBinderizeBasicTest
-VTS_CONFIG_SRC_DIR := testcases/hal/nfc/hidl/host/binderize
-include test/vts/tools/build/Android.host_config.mk
diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/binderize/AndroidTest.xml b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/binderize/AndroidTest.xml
deleted file mode 100644
index 9671977..0000000
--- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/binderize/AndroidTest.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<configuration description="Config for VTS HAL NFC (Binder Mode) test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- <option name="cleanup" value="true" />
- <option name="push" value="spec/hardware/interfaces/nfc/1.0/vts/Nfc.vts->/data/local/tmp/spec/Nfc.vts" />
- <option name="push" value="spec/hardware/interfaces/nfc/1.0/vts/NfcClientCallback.vts->/data/local/tmp/spec/NfcClientCallback.vts" />
- <option name="push" value="spec/hardware/interfaces/nfc/1.0/vts/types.vts->/data/local/tmp/spec/types.vts" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="NfcHidlBinderizeBasicTest" />
- <option name="test-case-path" value="vts/testcases/hal/nfc/hidl/host/NfcHidlBasicTest" />
- <option name="test-config-path" value="vts/testcases/hal/nfc/hidl/host/binderize/NfcHidlBinderizeBasicTest.config" />
- </test>
-</configuration>
diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/binderize/NfcHidlBinderizeBasicTest.config b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/binderize/NfcHidlBinderizeBasicTest.config
deleted file mode 100644
index 5a94c6f..0000000
--- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/binderize/NfcHidlBinderizeBasicTest.config
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "passthrough_mode": False
-}
diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/binderize/__init__.py b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/binderize/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/binderize/__init__.py
+++ /dev/null
diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/passthrough/Android.mk b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/passthrough/Android.mk
deleted file mode 100644
index e274107..0000000
--- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/passthrough/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := NfcHidlPassthroughBasicTest
-VTS_CONFIG_SRC_DIR := testcases/hal/nfc/hidl/host/passthrough
-include test/vts/tools/build/Android.host_config.mk
diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/passthrough/AndroidTest.xml b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/passthrough/AndroidTest.xml
deleted file mode 100644
index 2f5fdfa..0000000
--- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/passthrough/AndroidTest.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<configuration description="Config for VTS HAL NFC (Passthrough) test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- <option name="cleanup" value="true" />
- <option name="push" value="spec/hardware/interfaces/nfc/1.0/vts/Nfc.vts->/data/local/tmp/spec/Nfc.vts" />
- <option name="push" value="spec/hardware/interfaces/nfc/1.0/vts/NfcClientCallback.vts->/data/local/tmp/spec/NfcClientCallback.vts" />
- <option name="push" value="spec/hardware/interfaces/nfc/1.0/vts/types.vts->/data/local/tmp/spec/types.vts" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="NfcHidlPassthroughBasicTest" />
- <option name="test-case-path" value="vts/testcases/hal/nfc/hidl/host/NfcHidlBasicTest" />
- <option name="test-config-path" value="vts/testcases/hal/nfc/hidl/host/passthrough/NfcHidlPassthroughBasicTest.config" />
- </test>
-</configuration>
diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/passthrough/NfcHidlPassthroughBasicTest.config b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/passthrough/NfcHidlPassthroughBasicTest.config
deleted file mode 100644
index 9173e19..0000000
--- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/passthrough/NfcHidlPassthroughBasicTest.config
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "passthrough_mode": true
-}
diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target/Android.mk b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target/Android.mk
deleted file mode 100644
index da9b6af..0000000
--- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target/Android.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := HalNfcHidlTargetBasicTest
-VTS_CONFIG_SRC_DIR := testcases/hal/nfc/hidl/target
-include test/vts/tools/build/Android.host_config.mk
diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target/AndroidTest.xml b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target/AndroidTest.xml
deleted file mode 100644
index 9576183..0000000
--- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target/AndroidTest.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<configuration description="Config for VTS NFC HIDL HAL's basic target-side test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="HalNfcHidlTargetBasicTest" />
- <option name="binary-test-sources" value="
- _32bit::DATA/nativetest/nfc_hidl_hal_test/nfc_hidl_hal_test,
- _64bit::DATA/nativetest64/nfc_hidl_hal_test/nfc_hidl_hal_test,
- "/>
- <option name="binary-test-type" value="gtest" />
- <option name="test-timeout" value="10m" />
- </test>
-</configuration>
diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target_profiling/Android.mk b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target_profiling/Android.mk
deleted file mode 100644
index c7bf853..0000000
--- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target_profiling/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-## Copyright (C) 2016 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.
-# #
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := NfcHidlTargetProfilingTest
-VTS_CONFIG_SRC_DIR := testcases/hal/nfc/hidl/target_profiling
-include test/vts/tools/build/Android.host_config.mk
diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target_profiling/AndroidTest.xml b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target_profiling/AndroidTest.xml
deleted file mode 100644
index 3b570f9..0000000
--- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target_profiling/AndroidTest.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<configuration description="Config for VTS NFC HIDL HAL's target-side profiling test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="NfcHidlTargetProfilingTest" />
- <option name="binary-test-sources" value="
- _32bit::DATA/nativetest/nfc_hidl_hal_test/nfc_hidl_hal_test,
- _64bit::DATA/nativetest64/nfc_hidl_hal_test/nfc_hidl_hal_test,
- "/>
- <option name="binary-test-type" value="gtest" />
- <option name="test-timeout" value="25m" />
- <option name="enable-profiling" value="true" />
- </test>
-</configuration>
diff --git a/power/1.0/Android.bp b/power/1.0/Android.bp
index db8c721..453d525 100644
--- a/power/1.0/Android.bp
+++ b/power/1.0/Android.bp
@@ -1,12 +1,19 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
+filegroup {
+ name: "android.hardware.power@1.0_hal",
+ srcs: [
+ "types.hal",
+ "IPower.hal",
+ ],
+}
+
genrule {
name: "android.hardware.power@1.0_genc++",
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.power@1.0",
srcs: [
- "types.hal",
- "IPower.hal",
+ ":android.hardware.power@1.0_hal",
],
out: [
"android/hardware/power/1.0/types.cpp",
@@ -19,8 +26,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.power@1.0",
srcs: [
- "types.hal",
- "IPower.hal",
+ ":android.hardware.power@1.0_hal",
],
out: [
"android/hardware/power/1.0/types.h",
@@ -54,106 +60,3 @@
"android.hidl.base@1.0",
],
}
-
-genrule {
- name: "android.hardware.power.vts.driver@1.0_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.power@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/power/1.0/ $(genDir)/android/hardware/power/1.0/",
- srcs: [
- "types.hal",
- "IPower.hal",
- ],
- out: [
- "android/hardware/power/1.0/types.vts.cpp",
- "android/hardware/power/1.0/Power.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.power.vts.driver@1.0_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.power@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/power/1.0/ $(genDir)/android/hardware/power/1.0/",
- srcs: [
- "types.hal",
- "IPower.hal",
- ],
- out: [
- "android/hardware/power/1.0/types.vts.h",
- "android/hardware/power/1.0/Power.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.power.vts.driver@1.0",
- generated_sources: ["android.hardware.power.vts.driver@1.0_genc++"],
- generated_headers: ["android.hardware.power.vts.driver@1.0_genc++_headers"],
- export_generated_headers: ["android.hardware.power.vts.driver@1.0_genc++_headers"],
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libvts_common",
- "libvts_datatype",
- "libvts_measurement",
- "libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
- "android.hidl.base@1.0",
- "android.hardware.power@1.0",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "android.hidl.base@1.0",
- ],
-}
-
-genrule {
- name: "android.hardware.power@1.0-IPower-vts.profiler_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.power@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/power/1.0/ $(genDir)/android/hardware/power/1.0/",
- srcs: [
- "IPower.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/power/1.0/Power.vts.cpp",
- "android/hardware/power/1.0/types.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.power@1.0-IPower-vts.profiler_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.power@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/power/1.0/ $(genDir)/android/hardware/power/1.0/",
- srcs: [
- "IPower.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/power/1.0/Power.vts.h",
- "android/hardware/power/1.0/types.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.power@1.0-IPower-vts.profiler",
- generated_sources: ["android.hardware.power@1.0-IPower-vts.profiler_genc++"],
- generated_headers: ["android.hardware.power@1.0-IPower-vts.profiler_genc++_headers"],
- export_generated_headers: ["android.hardware.power@1.0-IPower-vts.profiler_genc++_headers"],
- shared_libs: [
- "libbase",
- "libhidlbase",
- "libhidltransport",
- "libvts_profiling",
- "libvts_multidevice_proto",
- "libprotobuf-cpp-full",
- "android.hidl.base@1.0",
- "android.hardware.power@1.0",
- ],
-}
diff --git a/power/1.0/Android.mk b/power/1.0/Android.mk
index 4e11867..98d95a8 100644
--- a/power/1.0/Android.mk
+++ b/power/1.0/Android.mk
@@ -8,7 +8,7 @@
LOCAL_MODULE := android.hardware.power@1.0-java
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -140,7 +140,7 @@
LOCAL_MODULE := android.hardware.power@1.0-java-static
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
diff --git a/power/1.0/default/Android.bp b/power/1.0/default/Android.bp
index 1a5a897..71daaeb 100644
--- a/power/1.0/default/Android.bp
+++ b/power/1.0/default/Android.bp
@@ -14,9 +14,15 @@
cc_library_shared {
name: "android.hardware.power@1.0-impl",
+ proprietary: true,
relative_install_path: "hw",
srcs: ["Power.cpp"],
+ cflags: [
+ "-Wall",
+ "-Werror",
+ ],
+
shared_libs: [
"liblog",
"libhardware",
@@ -30,11 +36,17 @@
}
cc_binary {
+ proprietary: true,
relative_install_path: "hw",
name: "android.hardware.power@1.0-service",
init_rc: ["android.hardware.power@1.0-service.rc"],
srcs: ["service.cpp"],
+ cflags: [
+ "-Wall",
+ "-Werror",
+ ],
+
shared_libs: [
"liblog",
"libdl",
diff --git a/power/1.0/default/Power.cpp b/power/1.0/default/Power.cpp
index 2ddac0a..6ea9167 100644
--- a/power/1.0/default/Power.cpp
+++ b/power/1.0/default/Power.cpp
@@ -81,7 +81,7 @@
number_platform_modes = mModule->get_number_of_platform_modes(mModule);
if (number_platform_modes)
{
- if (SIZE_MAX / sizeof(size_t) <= number_platform_modes) // overflow
+ if ((ssize_t) (SIZE_MAX / sizeof(size_t)) <= number_platform_modes) // overflow
goto done;
voters = new (std::nothrow) size_t [number_platform_modes];
if (voters == nullptr)
@@ -91,7 +91,7 @@
if (ret != 0)
goto done;
- if (SIZE_MAX / sizeof(power_state_platform_sleep_state_t)
+ if ((ssize_t) (SIZE_MAX / sizeof(power_state_platform_sleep_state_t))
<= number_platform_modes) // overflow
goto done;
legacy_states = new (std::nothrow)
diff --git a/power/1.0/default/android.hardware.power@1.0-service.rc b/power/1.0/default/android.hardware.power@1.0-service.rc
index 6063541..1777e90 100644
--- a/power/1.0/default/android.hardware.power@1.0-service.rc
+++ b/power/1.0/default/android.hardware.power@1.0-service.rc
@@ -1,4 +1,4 @@
-service power-hal-1-0 /system/bin/hw/android.hardware.power@1.0-service
+service power-hal-1-0 /vendor/bin/hw/android.hardware.power@1.0-service
class hal
user system
group system
diff --git a/power/1.0/vts/Power.vts b/power/1.0/vts/Power.vts
index 1711290..4d3d4ff 100644
--- a/power/1.0/vts/Power.vts
+++ b/power/1.0/vts/Power.vts
@@ -5,6 +5,7 @@
package: "android.hardware.power"
import: "android.hardware.power@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
api: {
diff --git a/power/1.0/vts/functional/Android.bp b/power/1.0/vts/functional/Android.bp
index 81dc316..7aa2611 100644
--- a/power/1.0/vts/functional/Android.bp
+++ b/power/1.0/vts/functional/Android.bp
@@ -31,11 +31,7 @@
],
static_libs: ["libgtest"],
cflags: [
- "--coverage",
"-O0",
"-g",
- ],
- ldflags: [
- "--coverage"
]
}
diff --git a/power/1.0/vts/functional/Android.mk b/power/1.0/vts/functional/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/power/1.0/vts/functional/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/power/1.0/vts/functional/vts/Android.mk b/power/1.0/vts/functional/vts/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/power/1.0/vts/functional/vts/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/power/1.0/vts/functional/vts/testcases/Android.mk b/power/1.0/vts/functional/vts/testcases/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/power/1.0/vts/functional/vts/testcases/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/power/1.0/vts/functional/vts/testcases/hal/Android.mk b/power/1.0/vts/functional/vts/testcases/hal/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/power/1.0/vts/functional/vts/testcases/hal/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/power/1.0/vts/functional/vts/testcases/hal/power/Android.mk b/power/1.0/vts/functional/vts/testcases/hal/power/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/power/1.0/vts/functional/vts/testcases/hal/power/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/power/1.0/vts/functional/vts/testcases/hal/power/__init__.py b/power/1.0/vts/functional/vts/testcases/hal/power/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/power/1.0/vts/functional/vts/testcases/hal/power/__init__.py
+++ /dev/null
diff --git a/power/1.0/vts/functional/vts/testcases/hal/power/hidl/Android.mk b/power/1.0/vts/functional/vts/testcases/hal/power/hidl/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/power/1.0/vts/functional/vts/testcases/hal/power/hidl/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/power/1.0/vts/functional/vts/testcases/hal/power/hidl/target/Android.mk b/power/1.0/vts/functional/vts/testcases/hal/power/hidl/target/Android.mk
deleted file mode 100644
index c66b6fb..0000000
--- a/power/1.0/vts/functional/vts/testcases/hal/power/hidl/target/Android.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := HalPowerHidlTargetTest
-VTS_CONFIG_SRC_DIR := testcases/hal/power/hidl/target
-include test/vts/tools/build/Android.host_config.mk
-
diff --git a/power/1.0/vts/functional/vts/testcases/hal/power/hidl/target/AndroidTest.xml b/power/1.0/vts/functional/vts/testcases/hal/power/hidl/target/AndroidTest.xml
deleted file mode 100644
index bb80de2..0000000
--- a/power/1.0/vts/functional/vts/testcases/hal/power/hidl/target/AndroidTest.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<configuration description="Config for VTS Power HIDL HAL's target-side test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="HalPowerHidlTargetTest"/>
- <option name="binary-test-sources" value="
- _32bit::DATA/nativetest/power_hidl_hal_test/power_hidl_hal_test,
- _64bit::DATA/nativetest64/power_hidl_hal_test/power_hidl_hal_test,
- "/>
- <option name="binary-test-type" value="gtest" />
- <option name="test-timeout" value="1m" />
- </test>
-</configuration>
diff --git a/power/1.0/vts/functional/vts/testcases/hal/power/hidl/target_profiling/Android.mk b/power/1.0/vts/functional/vts/testcases/hal/power/hidl/target_profiling/Android.mk
deleted file mode 100644
index 6f9e399..0000000
--- a/power/1.0/vts/functional/vts/testcases/hal/power/hidl/target_profiling/Android.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := HalPowerHidlTargetProfilingTest
-VTS_CONFIG_SRC_DIR := testcases/hal/power/hidl/target_profiling
-include test/vts/tools/build/Android.host_config.mk
-
diff --git a/power/1.0/vts/functional/vts/testcases/hal/power/hidl/target_profiling/AndroidTest.xml b/power/1.0/vts/functional/vts/testcases/hal/power/hidl/target_profiling/AndroidTest.xml
deleted file mode 100644
index 263086c..0000000
--- a/power/1.0/vts/functional/vts/testcases/hal/power/hidl/target_profiling/AndroidTest.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<configuration description="Config for VTS Power HIDL HAL's target-side test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="HalPowerHidlTargetProfilingTest"/>
- <option name="binary-test-sources" value="
- _32bit::DATA/nativetest/power_hidl_hal_test/power_hidl_hal_test,
- _64bit::DATA/nativetest64/power_hidl_hal_test/power_hidl_hal_test,
- "/>
- <option name="binary-test-type" value="gtest" />
- <option name="test-timeout" value="1m" />
- <option name="enable-profiling" value="true" />
- </test>
-</configuration>
diff --git a/radio/1.0/Android.bp b/radio/1.0/Android.bp
index e17d949..f59cf66 100644
--- a/radio/1.0/Android.bp
+++ b/radio/1.0/Android.bp
@@ -1,9 +1,7 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
-genrule {
- name: "android.hardware.radio@1.0_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio@1.0",
+filegroup {
+ name: "android.hardware.radio@1.0_hal",
srcs: [
"types.hal",
"IRadio.hal",
@@ -12,6 +10,15 @@
"ISap.hal",
"ISapCallback.hal",
],
+}
+
+genrule {
+ name: "android.hardware.radio@1.0_genc++",
+ tools: ["hidl-gen"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio@1.0",
+ srcs: [
+ ":android.hardware.radio@1.0_hal",
+ ],
out: [
"android/hardware/radio/1.0/types.cpp",
"android/hardware/radio/1.0/RadioAll.cpp",
@@ -27,12 +34,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio@1.0",
srcs: [
- "types.hal",
- "IRadio.hal",
- "IRadioIndication.hal",
- "IRadioResponse.hal",
- "ISap.hal",
- "ISapCallback.hal",
+ ":android.hardware.radio@1.0_hal",
],
out: [
"android/hardware/radio/1.0/types.h",
@@ -86,302 +88,3 @@
"android.hidl.base@1.0",
],
}
-
-genrule {
- name: "android.hardware.radio.vts.driver@1.0_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/radio/1.0/ $(genDir)/android/hardware/radio/1.0/",
- srcs: [
- "types.hal",
- "IRadio.hal",
- "IRadioIndication.hal",
- "IRadioResponse.hal",
- "ISap.hal",
- "ISapCallback.hal",
- ],
- out: [
- "android/hardware/radio/1.0/types.vts.cpp",
- "android/hardware/radio/1.0/Radio.vts.cpp",
- "android/hardware/radio/1.0/RadioIndication.vts.cpp",
- "android/hardware/radio/1.0/RadioResponse.vts.cpp",
- "android/hardware/radio/1.0/Sap.vts.cpp",
- "android/hardware/radio/1.0/SapCallback.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.radio.vts.driver@1.0_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/radio/1.0/ $(genDir)/android/hardware/radio/1.0/",
- srcs: [
- "types.hal",
- "IRadio.hal",
- "IRadioIndication.hal",
- "IRadioResponse.hal",
- "ISap.hal",
- "ISapCallback.hal",
- ],
- out: [
- "android/hardware/radio/1.0/types.vts.h",
- "android/hardware/radio/1.0/Radio.vts.h",
- "android/hardware/radio/1.0/RadioIndication.vts.h",
- "android/hardware/radio/1.0/RadioResponse.vts.h",
- "android/hardware/radio/1.0/Sap.vts.h",
- "android/hardware/radio/1.0/SapCallback.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.radio.vts.driver@1.0",
- generated_sources: ["android.hardware.radio.vts.driver@1.0_genc++"],
- generated_headers: ["android.hardware.radio.vts.driver@1.0_genc++_headers"],
- export_generated_headers: ["android.hardware.radio.vts.driver@1.0_genc++_headers"],
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libvts_common",
- "libvts_datatype",
- "libvts_measurement",
- "libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
- "android.hidl.base@1.0",
- "android.hardware.radio@1.0",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "android.hidl.base@1.0",
- ],
-}
-
-genrule {
- name: "android.hardware.radio@1.0-IRadio-vts.profiler_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/radio/1.0/ $(genDir)/android/hardware/radio/1.0/",
- srcs: [
- "IRadio.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/radio/1.0/Radio.vts.cpp",
- "android/hardware/radio/1.0/types.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.radio@1.0-IRadio-vts.profiler_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/radio/1.0/ $(genDir)/android/hardware/radio/1.0/",
- srcs: [
- "IRadio.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/radio/1.0/Radio.vts.h",
- "android/hardware/radio/1.0/types.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.radio@1.0-IRadio-vts.profiler",
- generated_sources: ["android.hardware.radio@1.0-IRadio-vts.profiler_genc++"],
- generated_headers: ["android.hardware.radio@1.0-IRadio-vts.profiler_genc++_headers"],
- export_generated_headers: ["android.hardware.radio@1.0-IRadio-vts.profiler_genc++_headers"],
- shared_libs: [
- "libbase",
- "libhidlbase",
- "libhidltransport",
- "libvts_profiling",
- "libvts_multidevice_proto",
- "libprotobuf-cpp-full",
- "android.hidl.base@1.0",
- "android.hardware.radio@1.0",
- ],
-}
-
-genrule {
- name: "android.hardware.radio@1.0-IRadioIndication-vts.profiler_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/radio/1.0/ $(genDir)/android/hardware/radio/1.0/",
- srcs: [
- "IRadioIndication.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/radio/1.0/RadioIndication.vts.cpp",
- "android/hardware/radio/1.0/types.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.radio@1.0-IRadioIndication-vts.profiler_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/radio/1.0/ $(genDir)/android/hardware/radio/1.0/",
- srcs: [
- "IRadioIndication.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/radio/1.0/RadioIndication.vts.h",
- "android/hardware/radio/1.0/types.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.radio@1.0-IRadioIndication-vts.profiler",
- generated_sources: ["android.hardware.radio@1.0-IRadioIndication-vts.profiler_genc++"],
- generated_headers: ["android.hardware.radio@1.0-IRadioIndication-vts.profiler_genc++_headers"],
- export_generated_headers: ["android.hardware.radio@1.0-IRadioIndication-vts.profiler_genc++_headers"],
- shared_libs: [
- "libbase",
- "libhidlbase",
- "libhidltransport",
- "libvts_profiling",
- "libvts_multidevice_proto",
- "libprotobuf-cpp-full",
- "android.hidl.base@1.0",
- "android.hardware.radio@1.0",
- ],
-}
-
-genrule {
- name: "android.hardware.radio@1.0-IRadioResponse-vts.profiler_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/radio/1.0/ $(genDir)/android/hardware/radio/1.0/",
- srcs: [
- "IRadioResponse.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/radio/1.0/RadioResponse.vts.cpp",
- "android/hardware/radio/1.0/types.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.radio@1.0-IRadioResponse-vts.profiler_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/radio/1.0/ $(genDir)/android/hardware/radio/1.0/",
- srcs: [
- "IRadioResponse.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/radio/1.0/RadioResponse.vts.h",
- "android/hardware/radio/1.0/types.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.radio@1.0-IRadioResponse-vts.profiler",
- generated_sources: ["android.hardware.radio@1.0-IRadioResponse-vts.profiler_genc++"],
- generated_headers: ["android.hardware.radio@1.0-IRadioResponse-vts.profiler_genc++_headers"],
- export_generated_headers: ["android.hardware.radio@1.0-IRadioResponse-vts.profiler_genc++_headers"],
- shared_libs: [
- "libbase",
- "libhidlbase",
- "libhidltransport",
- "libvts_profiling",
- "libvts_multidevice_proto",
- "libprotobuf-cpp-full",
- "android.hidl.base@1.0",
- "android.hardware.radio@1.0",
- ],
-}
-
-genrule {
- name: "android.hardware.radio@1.0-ISap-vts.profiler_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/radio/1.0/ $(genDir)/android/hardware/radio/1.0/",
- srcs: [
- "ISap.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/radio/1.0/Sap.vts.cpp",
- "android/hardware/radio/1.0/types.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.radio@1.0-ISap-vts.profiler_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/radio/1.0/ $(genDir)/android/hardware/radio/1.0/",
- srcs: [
- "ISap.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/radio/1.0/Sap.vts.h",
- "android/hardware/radio/1.0/types.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.radio@1.0-ISap-vts.profiler",
- generated_sources: ["android.hardware.radio@1.0-ISap-vts.profiler_genc++"],
- generated_headers: ["android.hardware.radio@1.0-ISap-vts.profiler_genc++_headers"],
- export_generated_headers: ["android.hardware.radio@1.0-ISap-vts.profiler_genc++_headers"],
- shared_libs: [
- "libbase",
- "libhidlbase",
- "libhidltransport",
- "libvts_profiling",
- "libvts_multidevice_proto",
- "libprotobuf-cpp-full",
- "android.hidl.base@1.0",
- "android.hardware.radio@1.0",
- ],
-}
-
-genrule {
- name: "android.hardware.radio@1.0-ISapCallback-vts.profiler_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/radio/1.0/ $(genDir)/android/hardware/radio/1.0/",
- srcs: [
- "ISapCallback.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/radio/1.0/SapCallback.vts.cpp",
- "android/hardware/radio/1.0/types.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.radio@1.0-ISapCallback-vts.profiler_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.radio@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/radio/1.0/ $(genDir)/android/hardware/radio/1.0/",
- srcs: [
- "ISapCallback.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/radio/1.0/SapCallback.vts.h",
- "android/hardware/radio/1.0/types.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.radio@1.0-ISapCallback-vts.profiler",
- generated_sources: ["android.hardware.radio@1.0-ISapCallback-vts.profiler_genc++"],
- generated_headers: ["android.hardware.radio@1.0-ISapCallback-vts.profiler_genc++_headers"],
- export_generated_headers: ["android.hardware.radio@1.0-ISapCallback-vts.profiler_genc++_headers"],
- shared_libs: [
- "libbase",
- "libhidlbase",
- "libhidltransport",
- "libvts_profiling",
- "libvts_multidevice_proto",
- "libprotobuf-cpp-full",
- "android.hidl.base@1.0",
- "android.hardware.radio@1.0",
- ],
-}
diff --git a/radio/1.0/Android.mk b/radio/1.0/Android.mk
index 059ebcb..7f4c7d4 100644
--- a/radio/1.0/Android.mk
+++ b/radio/1.0/Android.mk
@@ -8,7 +8,7 @@
LOCAL_MODULE := android.hardware.radio@1.0-java
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -55,6 +55,25 @@
LOCAL_GENERATED_SOURCES += $(GEN)
#
+# Build types.hal (ApnTypes)
+#
+GEN := $(intermediates)/android/hardware/radio/V1_0/ApnTypes.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
+ android.hardware.radio@1.0::types.ApnTypes
+
+$(GEN): $(LOCAL_PATH)/types.hal
+ $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+
+#
# Build types.hal (AppState)
#
GEN := $(intermediates)/android/hardware/radio/V1_0/AppState.java
@@ -1214,9 +1233,9 @@
LOCAL_GENERATED_SOURCES += $(GEN)
#
-# Build types.hal (DataProfile)
+# Build types.hal (DataProfileId)
#
-GEN := $(intermediates)/android/hardware/radio/V1_0/DataProfile.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/DataProfileId.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1226,7 +1245,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.radio@1.0::types.DataProfile
+ android.hardware.radio@1.0::types.DataProfileId
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -1290,6 +1309,25 @@
LOCAL_GENERATED_SOURCES += $(GEN)
#
+# Build types.hal (DeviceStateType)
+#
+GEN := $(intermediates)/android/hardware/radio/V1_0/DeviceStateType.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
+ android.hardware.radio@1.0::types.DeviceStateType
+
+$(GEN): $(LOCAL_PATH)/types.hal
+ $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+
+#
# Build types.hal (Dial)
#
GEN := $(intermediates)/android/hardware/radio/V1_0/Dial.java
@@ -1537,6 +1575,25 @@
LOCAL_GENERATED_SOURCES += $(GEN)
#
+# Build types.hal (IndicationFilter)
+#
+GEN := $(intermediates)/android/hardware/radio/V1_0/IndicationFilter.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
+ android.hardware.radio@1.0::types.IndicationFilter
+
+$(GEN): $(LOCAL_PATH)/types.hal
+ $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+
+#
# Build types.hal (LastCallFailCause)
#
GEN := $(intermediates)/android/hardware/radio/V1_0/LastCallFailCause.java
@@ -1651,6 +1708,25 @@
LOCAL_GENERATED_SOURCES += $(GEN)
#
+# Build types.hal (MvnoType)
+#
+GEN := $(intermediates)/android/hardware/radio/V1_0/MvnoType.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
+ android.hardware.radio@1.0::types.MvnoType
+
+$(GEN): $(LOCAL_PATH)/types.hal
+ $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+
+#
# Build types.hal (NeighboringCell)
#
GEN := $(intermediates)/android/hardware/radio/V1_0/NeighboringCell.java
@@ -2947,7 +3023,7 @@
LOCAL_MODULE := android.hardware.radio@1.0-java-static
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -2994,6 +3070,25 @@
LOCAL_GENERATED_SOURCES += $(GEN)
#
+# Build types.hal (ApnTypes)
+#
+GEN := $(intermediates)/android/hardware/radio/V1_0/ApnTypes.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
+ android.hardware.radio@1.0::types.ApnTypes
+
+$(GEN): $(LOCAL_PATH)/types.hal
+ $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+
+#
# Build types.hal (AppState)
#
GEN := $(intermediates)/android/hardware/radio/V1_0/AppState.java
@@ -4153,9 +4248,9 @@
LOCAL_GENERATED_SOURCES += $(GEN)
#
-# Build types.hal (DataProfile)
+# Build types.hal (DataProfileId)
#
-GEN := $(intermediates)/android/hardware/radio/V1_0/DataProfile.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/DataProfileId.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4165,7 +4260,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.radio@1.0::types.DataProfile
+ android.hardware.radio@1.0::types.DataProfileId
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -4229,6 +4324,25 @@
LOCAL_GENERATED_SOURCES += $(GEN)
#
+# Build types.hal (DeviceStateType)
+#
+GEN := $(intermediates)/android/hardware/radio/V1_0/DeviceStateType.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
+ android.hardware.radio@1.0::types.DeviceStateType
+
+$(GEN): $(LOCAL_PATH)/types.hal
+ $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+
+#
# Build types.hal (Dial)
#
GEN := $(intermediates)/android/hardware/radio/V1_0/Dial.java
@@ -4476,6 +4590,25 @@
LOCAL_GENERATED_SOURCES += $(GEN)
#
+# Build types.hal (IndicationFilter)
+#
+GEN := $(intermediates)/android/hardware/radio/V1_0/IndicationFilter.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
+ android.hardware.radio@1.0::types.IndicationFilter
+
+$(GEN): $(LOCAL_PATH)/types.hal
+ $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+
+#
# Build types.hal (LastCallFailCause)
#
GEN := $(intermediates)/android/hardware/radio/V1_0/LastCallFailCause.java
@@ -4590,6 +4723,25 @@
LOCAL_GENERATED_SOURCES += $(GEN)
#
+# Build types.hal (MvnoType)
+#
+GEN := $(intermediates)/android/hardware/radio/V1_0/MvnoType.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
+ android.hardware.radio@1.0::types.MvnoType
+
+$(GEN): $(LOCAL_PATH)/types.hal
+ $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+
+#
# Build types.hal (NeighboringCell)
#
GEN := $(intermediates)/android/hardware/radio/V1_0/NeighboringCell.java
diff --git a/radio/1.0/IRadio.hal b/radio/1.0/IRadio.hal
index 1cb7040..bda7d65 100644
--- a/radio/1.0/IRadio.hal
+++ b/radio/1.0/IRadio.hal
@@ -375,23 +375,16 @@
* number of simultaneous data call contexts.
*
* @param serial Serial number of request.
- * @param radioTechnology Radio technology to use: 0-CDMA, 1-GSM/UMTS, 2...
- * for values above 2 this is RadioTechnology + 2.
- * @param profile is a RadioDataProfile (support is optional)
- * @param apn is the APN to connect to if radio technology is GSM/UMTS. This APN must
- * override the one in the profile. empty string indicates no APN overrride.
- * @param user is the username for APN, or empty string
- * @param password is the password for APN, or empty string
- * @param authType is the PAP / CHAP auth type.
- * @param protocol is the connection type to request must be one of the
- * PDP_type values in TS 27.007 section 10.1.1.
- * For example, "IP", "IPV6", "IPV4V6", or "PPP".
+ * @param radioTechnology Radio technology to use.
+ * @param dataProfileInfo data profile info.
+ * @param modemCognitive Indicating this profile was sent to the modem through setDataProfile
+ * earlier.
+ * @param roamingAllowed Indicating data roaming is allowed or not by the user.
*
* Response function is IRadioResponse.setupDataCallResponse()
*/
- oneway setupDataCall(int32_t serial, int32_t radioTechnology,
- int32_t profile, string apn, string user, string password, ApnAuthType authType,
- string protocol);
+ oneway setupDataCall(int32_t serial, RadioTechnology radioTechnology,
+ DataProfileInfo dataProfileInfo, bool modemCognitive, bool roamingAllowed);
/*
* Request ICC I/O operation.
@@ -847,7 +840,7 @@
* @param serial Serial number of request.
* @param accept true = accept the call setup, false = reject the call setup
*
- * Response callback is IRadioCallback.handleStkCallSetupRequestFromSimResponse()
+ * Response callback is IRadioResponse.handleStkCallSetupRequestFromSimResponse()
*/
oneway handleStkCallSetupRequestFromSim(int32_t serial,
bool accept);
@@ -857,7 +850,7 @@
*
* @param serial Serial number of request.
*
- * Response callback is IRadioCallback.explicitCallTransferResponse()
+ * Response callback is IRadioResponse.explicitCallTransferResponse()
*/
oneway explicitCallTransfer(int32_t serial);
@@ -868,7 +861,7 @@
* @param serial Serial number of request.
* @param nwType PreferredNetworkType defined in types.hal
*
- * Response callback is IRadioCallback.setPreferredNetworkTypeResponse()
+ * Response callback is IRadioResponse.setPreferredNetworkTypeResponse()
*/
oneway setPreferredNetworkType(int32_t serial,
PreferredNetworkType nwType);
@@ -879,7 +872,7 @@
*
* @param serial Serial number of request.
*
- * Response callback is IRadioCallback.getPreferredNetworkTypeResponse()
+ * Response callback is IRadioResponse.getPreferredNetworkTypeResponse()
*/
oneway getPreferredNetworkType(int32_t serial);
@@ -888,7 +881,7 @@
*
* @param serial Serial number of request.
*
- * Response callback is IRadioCallback.getNeighboringCidsResponse()
+ * Response callback is IRadioResponse.getNeighboringCidsResponse()
*/
oneway getNeighboringCids(int32_t serial);
@@ -902,7 +895,7 @@
* @param serial Serial number of request.
* @param enable true = updates enabled (+CREG=2), false = updates disabled (+CREG=1)
*
- * Response callback is IRadioCallback.setLocationUpdatesResponse()
+ * Response callback is IRadioResponse.setLocationUpdatesResponse()
*/
oneway setLocationUpdates(int32_t serial, bool enable);
@@ -913,7 +906,7 @@
* @param serial Serial number of request.
* @param cdmaSub CdmaSubscriptionSource
*
- * Response callback is IRadioCallback.setCdmaSubscriptionSourceResponse()
+ * Response callback is IRadioResponse.setCdmaSubscriptionSourceResponse()
*/
oneway setCdmaSubscriptionSource(int32_t serial,
CdmaSubscriptionSource cdmaSub);
@@ -924,7 +917,7 @@
* @param serial Serial number of request.
* @param type CdmaRoamingType defined in types.hal
*
- * Response callback is IRadioCallback.setCdmaRoamingPreferenceResponse()
+ * Response callback is IRadioResponse.setCdmaRoamingPreferenceResponse()
*/
oneway setCdmaRoamingPreference(int32_t serial,
CdmaRoamingType type);
@@ -934,7 +927,7 @@
*
* @param serial Serial number of request.
*
- * Response callback is IRadioCallback.getCdmaRoamingPreferenceResponse()
+ * Response callback is IRadioResponse.getCdmaRoamingPreferenceResponse()
*/
oneway getCdmaRoamingPreference(int32_t serial);
@@ -944,7 +937,7 @@
* @param serial Serial number of request.
* @param mode TtyMode
*
- * Response callback is IRadioCallback.setTTYModeResponse()
+ * Response callback is IRadioResponse.setTTYModeResponse()
*/
oneway setTTYMode(int32_t serial, TtyMode mode);
@@ -953,7 +946,7 @@
*
* @param serial Serial number of request.
*
- * Response callback is IRadioCallback.getTTYModeResponse()
+ * Response callback is IRadioResponse.getTTYModeResponse()
*/
oneway getTTYMode(int32_t serial);
@@ -964,7 +957,7 @@
* @param enable false for Standard Privacy Mode (Public Long Code Mask)
* true for Enhanced Privacy Mode (Private Long Code Mask)
*
- * Response callback is IRadioCallback.setPreferredVoicePrivacyResponse()
+ * Response callback is IRadioResponse.setPreferredVoicePrivacyResponse()
*/
oneway setPreferredVoicePrivacy(int32_t serial, bool enable);
@@ -973,7 +966,7 @@
*
* @param serial Serial number of request.
*
- * Response callback is IRadioCallback.getPreferredVoicePrivacyResponse()
+ * Response callback is IRadioResponse.getPreferredVoicePrivacyResponse()
*/
oneway getPreferredVoicePrivacy(int32_t serial);
@@ -983,7 +976,7 @@
* @param serial Serial number of request.
* @param featureCode String associated with Flash command
*
- * Response callback is IRadioCallback.sendCDMAFeatureCodeResponse()
+ * Response callback is IRadioResponse.sendCDMAFeatureCodeResponse()
*/
oneway sendCDMAFeatureCode(int32_t serial, string featureCode);
@@ -995,7 +988,7 @@
* @param on DTMF ON length in milliseconds, or 0 to use default
* @param off is the DTMF OFF length in milliseconds, or 0 to use default
*
- * Response callback is IRadioCallback.sendBurstDtmfResponse()
+ * Response callback is IRadioResponse.sendBurstDtmfResponse()
*/
oneway sendBurstDtmf(int32_t serial, string dtmf, int32_t on, int32_t off);
@@ -1005,7 +998,7 @@
* @param serial Serial number of request.
* @param sms Cdma Sms to be sent described by CdmaSmsMessage in types.hal
*
- * Response callback is IRadioCallback.sendCdmaSmsResponse()
+ * Response callback is IRadioResponse.sendCdmaSmsResponse()
*/
oneway sendCdmaSms(int32_t serial, CdmaSmsMessage sms);
@@ -1016,7 +1009,7 @@
* @param serial Serial number of request.
* @param smsAck Cdma Sms ack to be sent described by CdmaSmsAck in types.hal
*
- * Response callback is IRadioCallback.acknowledgeLastIncomingCdmaSmsResponse()
+ * Response callback is IRadioResponse.acknowledgeLastIncomingCdmaSmsResponse()
*/
oneway acknowledgeLastIncomingCdmaSms(int32_t serial, CdmaSmsAck smsAck);
@@ -1025,7 +1018,7 @@
*
* @param serial Serial number of request.
*
- * Response callback is IRadioCallback.getGsmBroadcastConfigResponse()
+ * Response callback is IRadioResponse.getGsmBroadcastConfigResponse()
*/
oneway getGsmBroadcastConfig(int32_t serial);
@@ -1035,7 +1028,7 @@
* @param serial Serial number of request.
* @param configInfo Setting of GSM/WCDMA Cell broadcast config
*
- * Response callback is IRadioCallback.setGsmBroadcastConfigResponse()
+ * Response callback is IRadioResponse.setGsmBroadcastConfigResponse()
*/
oneway setGsmBroadcastConfig(int32_t serial, vec<GsmBroadcastSmsConfigInfo> configInfo);
@@ -1046,7 +1039,7 @@
* @param activate indicates to activate or turn off the reception of GSM/WCDMA
* Cell Broadcast SMS. true = activate, false = turn off
*
- * Response callback is IRadioCallback.setGsmBroadcastActivationResponse()
+ * Response callback is IRadioResponse.setGsmBroadcastActivationResponse()
*/
oneway setGsmBroadcastActivation(int32_t serial, bool activate);
@@ -1055,7 +1048,7 @@
*
* @param serial Serial number of request.
*
- * Response callback is IRadioCallback.getCdmaBroadcastConfigResponse()
+ * Response callback is IRadioResponse.getCdmaBroadcastConfigResponse()
*/
oneway getCdmaBroadcastConfig(int32_t serial);
@@ -1065,7 +1058,7 @@
* @param serial Serial number of request.
* @param configInfo CDMA Broadcast SMS config to be set.
*
- * Response callback is IRadioCallback.setCdmaBroadcastConfigResponse()
+ * Response callback is IRadioResponse.setCdmaBroadcastConfigResponse()
*/
oneway setCdmaBroadcastConfig(int32_t serial, vec<CdmaBroadcastSmsConfigInfo> configInfo);
@@ -1076,7 +1069,7 @@
* @param activate indicates to activate or turn off the reception of CDMA
* Cell Broadcast SMS. true = activate, false = turn off
*
- * Response callback is IRadioCallback.setCdmaBroadcastActivationResponse()
+ * Response callback is IRadioResponse.setCdmaBroadcastActivationResponse()
*/
oneway setCdmaBroadcastActivation(int32_t serial, bool activate);
@@ -1088,7 +1081,7 @@
*
* @param serial Serial number of request.
*
- * Response callback is IRadioCallback.getCDMASubscriptionResponse()
+ * Response callback is IRadioResponse.getCDMASubscriptionResponse()
*/
oneway getCDMASubscription(int32_t serial);
@@ -1098,7 +1091,7 @@
* @param serial Serial number of request.
* @param cdmaSms CDMA message as defined by CdmaSmsWriteArgs in types.hal
*
- * Response callback is IRadioCallback.writeSmsToRuimResponse()
+ * Response callback is IRadioResponse.writeSmsToRuimResponse()
*/
oneway writeSmsToRuim(int32_t serial, CdmaSmsWriteArgs cdmaSms);
@@ -1108,7 +1101,7 @@
* @param serial Serial number of request.
* @param index record index of the message to delete
*
- * Response callback is IRadioCallback.deleteSmsOnRuimResponse()
+ * Response callback is IRadioResponse.deleteSmsOnRuimResponse()
*/
oneway deleteSmsOnRuim(int32_t serial, int32_t index);
@@ -1120,7 +1113,7 @@
*
* @param serial Serial number of request.
*
- * Response callback is IRadioCallback.getDeviceIdentityResponse()
+ * Response callback is IRadioResponse.getDeviceIdentityResponse()
*/
oneway getDeviceIdentity(int32_t serial);
@@ -1131,7 +1124,7 @@
*
* @param serial Serial number of request.
*
- * Response callback is IRadioCallback.exitEmergencyCallbackModeResponse()
+ * Response callback is IRadioResponse.exitEmergencyCallbackModeResponse()
*/
oneway exitEmergencyCallbackMode(int32_t serial);
@@ -1140,7 +1133,7 @@
*
* @param serial Serial number of request.
*
- * Response callback is IRadioCallback.getSmscAddressResponse()
+ * Response callback is IRadioResponse.getSmscAddressResponse()
*/
oneway getSmscAddress(int32_t serial);
@@ -1150,7 +1143,7 @@
* @param serial Serial number of request.
* @param smsc Short Message Service Center address to set
*
- * Response callback is IRadioCallback.setSmscAddressResponse()
+ * Response callback is IRadioResponse.setSmscAddressResponse()
*/
oneway setSmscAddress(int32_t serial, string smsc);
@@ -1161,7 +1154,7 @@
* @param available true if memory is available for storing new messages,
* false if memory capacity is exceeded
*
- * Response callback is IRadioCallback.reportSmsMemoryStatusResponse()
+ * Response callback is IRadioResponse.reportSmsMemoryStatusResponse()
*/
oneway reportSmsMemoryStatus(int32_t serial, bool available);
@@ -1171,7 +1164,7 @@
*
* @param serial Serial number of request.
*
- * Response callback is IRadioCallback.reportStkServiceIsRunningResponse()
+ * Response callback is IRadioResponse.reportStkServiceIsRunningResponse()
*/
oneway reportStkServiceIsRunning(int32_t serial);
@@ -1180,7 +1173,7 @@
*
* @param serial Serial number of request.
*
- * Response callback is IRadioCallback.getCdmaSubscriptionSourceResponse()
+ * Response callback is IRadioResponse.getCdmaSubscriptionSourceResponse()
*/
oneway getCdmaSubscriptionSource(int32_t serial);
@@ -1191,7 +1184,7 @@
* @param serial Serial number of request.
* @param challenge challenge string in Base64 format
*
- * Response callback is IRadioCallback.requestIsimAuthenticationResponse()
+ * Response callback is IRadioResponse.requestIsimAuthenticationResponse()
*/
oneway requestIsimAuthentication(int32_t serial, string challenge);
@@ -1205,7 +1198,7 @@
* false on failed receipt (send RP-ERROR)
* @param ackPdu acknowledgement TPDU in hexadecimal format
*
- * Response callback is IRadioCallback.acknowledgeIncomingGsmSmsWithPduResponse()
+ * Response callback is IRadioResponse.acknowledgeIncomingGsmSmsWithPduResponse()
*/
oneway acknowledgeIncomingGsmSmsWithPdu(int32_t serial, bool success, string ackPdu);
@@ -1224,7 +1217,7 @@
* @param serial Serial number of request.
* @param contents SAT/USAT command in hexadecimal format starting with command tag
*
- * Response callback is IRadioCallback.sendEnvelopeWithStatusResponse()
+ * Response callback is IRadioResponse.sendEnvelopeWithStatusResponse()
*/
oneway sendEnvelopeWithStatus(int32_t serial, string contents);
@@ -1234,7 +1227,7 @@
*
* @param serial Serial number of request.
*
- * Response callback is IRadioCallback.getVoiceRadioTechnologyResponse()
+ * Response callback is IRadioResponse.getVoiceRadioTechnologyResponse()
*/
oneway getVoiceRadioTechnology(int32_t serial);
@@ -1246,7 +1239,7 @@
*
* @param serial Serial number of request.
*
- * Response callback is IRadioCallback.getCellInfoListResponse()
+ * Response callback is IRadioResponse.getCellInfoListResponse()
*/
oneway getCellInfoList(int32_t serial);
@@ -1259,7 +1252,7 @@
* @param serial Serial number of request.
* @param rate minimum time in milliseconds to indicate time between unsolicited cellInfoList()
*
- * Response callback is IRadioCallback.setCellInfoListRateResponse()
+ * Response callback is IRadioResponse.setCellInfoListRateResponse()
*/
oneway setCellInfoListRate(int32_t serial, int32_t rate);
@@ -1267,26 +1260,21 @@
* Set an apn to initial attach network
*
* @param serial Serial number of request.
- * @param apn is the APN to connect to if radio technology is GSM/UMTS. This APN must
- * override the one in the profile. empty string indicates no APN overrride.
- * @param protocol is the connection type to request must be one of the
- * PDP_type values in TS 27.007 section 10.1.1.
- * For example, "IP", "IPV6", "IPV4V6", or "PPP".
- * @param authType is the PAP / CHAP auth type.
- * @param user is the username for APN, or empty string
- * @param password is the password for APN, or empty string
+ * @param dataProfileInfo data profile containing APN settings
+ * @param modemCognitive is indicating the data profile was sent to the modem through
+ * setDataProfile earlier.
*
- * Response callback is IRadioCallback.setInitialAttachApnResponse()
+ * Response callback is IRadioResponse.setInitialAttachApnResponse()
*/
- oneway setInitialAttachApn(int32_t serial, string apn, string protocol, ApnAuthType authType,
- string username, string password);
+ oneway setInitialAttachApn(int32_t serial, DataProfileInfo dataProfileInfo,
+ bool modemCognitive);
/*
* Request current IMS registration state
*
* @param serial Serial number of request.
*
- * Response callback is IRadioCallback.getImsRegistrationStateResponse()
+ * Response callback is IRadioResponse.getImsRegistrationStateResponse()
*/
oneway getImsRegistrationState(int32_t serial);
@@ -1299,7 +1287,7 @@
* @param serial Serial number of request.
* @param message ImsSmsMessage as defined in types.hal to be sent
*
- * Response callback is IRadioCallback.sendImsSmsResponse()
+ * Response callback is IRadioResponse.sendImsSmsResponse()
*/
oneway sendImsSms(int32_t serial, ImsSmsMessage message);
@@ -1313,7 +1301,7 @@
* @param serial Serial number of request.
* @param message SimApdu as defined in types.hal to be sent
*
- * Response callback is IRadioCallback.iccTransmitApduBasicChannelResponse()
+ * Response callback is IRadioResponse.iccTransmitApduBasicChannelResponse()
*/
oneway iccTransmitApduBasicChannel(int32_t serial, SimApdu message);
@@ -1324,7 +1312,7 @@
* @param serial Serial number of request.
* @param aid AID value, See ETSI 102.221 and 101.220.
*
- * Response callback is IRadioCallback.iccOpenLogicalChannelResponse()
+ * Response callback is IRadioResponse.iccOpenLogicalChannelResponse()
*/
oneway iccOpenLogicalChannel(int32_t serial, string aid);
@@ -1335,7 +1323,7 @@
* @param serial Serial number of request.
* @param channelId session id of the logical channel (+CCHC).
*
- * Response callback is IRadioCallback.iccCloseLogicalChannelResponse()
+ * Response callback is IRadioResponse.iccCloseLogicalChannelResponse()
*/
oneway iccCloseLogicalChannel(int32_t serial, int32_t channelId);
@@ -1348,7 +1336,7 @@
* @param serial Serial number of request.
* @param message SimApdu as defined in types.hal to be sent
*
- * Response callback is IRadioCallback.iccTransmitApduLogicalChannelResponse()
+ * Response callback is IRadioResponse.iccTransmitApduLogicalChannelResponse()
*/
oneway iccTransmitApduLogicalChannel(int32_t serial, SimApdu message);
@@ -1359,7 +1347,7 @@
* @param serial Serial number of request.
* @param itemId NvItem is radio NV item as defined in types.hal
*
- * Response callback is IRadioCallback.nvReadItemResponse()
+ * Response callback is IRadioResponse.nvReadItemResponse()
*/
oneway nvReadItem(int32_t serial, NvItem itemId);
@@ -1370,7 +1358,7 @@
* @param serial Serial number of request.
* @param item NvWriteItem as defined in types.hal
*
- * Response callback is IRadioCallback.nvWriteItemResponse()
+ * Response callback is IRadioResponse.nvWriteItemResponse()
*/
oneway nvWriteItem(int32_t serial, NvWriteItem item);
@@ -1381,7 +1369,7 @@
* @param serial Serial number of request.
* @param prl PRL as a byte array
*
- * Response callback is IRadioCallback.nvWriteCdmaPrlResponse()
+ * Response callback is IRadioResponse.nvWriteCdmaPrlResponse()
*/
oneway nvWriteCdmaPrl(int32_t serial, vec<uint8_t> prl);
@@ -1392,7 +1380,7 @@
* @param serial Serial number of request.
* @param resetType ResetNvType as defined in types.hal
*
- * Response callback is IRadioCallback.nvResetConfigResponse()
+ * Response callback is IRadioResponse.nvResetConfigResponse()
*/
oneway nvResetConfig(int32_t serial, ResetNvType resetType);
@@ -1402,7 +1390,7 @@
* @param serial Serial number of request.
* @param uiccSub SelectUiccSub as defined in types.hal
*
- * Response callback is IRadioCallback.setUiccSubscriptionResponse()
+ * Response callback is IRadioResponse.setUiccSubscriptionResponse()
*/
oneway setUiccSubscription(int32_t serial, SelectUiccSub uiccSub);
@@ -1412,7 +1400,7 @@
* @param serial Serial number of request.
* @param allow true to allow data calls, false to disallow data calls
*
- * Response callback is IRadioCallback.setDataAllowedResponse()
+ * Response callback is IRadioResponse.setDataAllowedResponse()
*/
oneway setDataAllowed(int32_t serial, bool allow);
@@ -1421,7 +1409,7 @@
*
* @param serial Serial number of request.
*
- * Response callback is IRadioCallback.getHardwareConfigResponse()
+ * Response callback is IRadioResponse.getHardwareConfigResponse()
*/
oneway getHardwareConfig(int32_t serial);
@@ -1434,7 +1422,7 @@
* @param authData the challenge string in Base64 format, see 3GPP TS 31.102 7.1.2
* @param aid AID value, See ETSI 102.221 8.1 and 101.220 4, empty string if no value
*
- * Response callback is IRadioCallback.requestIccSimAuthenticationResponse()
+ * Response callback is IRadioResponse.requestIccSimAuthenticationResponse()
*/
oneway requestIccSimAuthentication(int32_t serial, int32_t authContext, string authData,
string aid);
@@ -1446,7 +1434,7 @@
* @param serial Serial number of request.
* @param profiles Array of DataProfiles to set.
*
- * Response callback is IRadioCallback.setDataProfileResponse()
+ * Response callback is IRadioResponse.setDataProfileResponse()
*/
oneway setDataProfile(int32_t serial, vec<DataProfileInfo> profiles);
@@ -1456,7 +1444,7 @@
*
* @param serial Serial number of request.
*
- * Response callback is IRadioCallback.requestShutdownResponse()
+ * Response callback is IRadioResponse.requestShutdownResponse()
*/
oneway requestShutdown(int32_t serial);
@@ -1465,7 +1453,7 @@
*
* @param serial Serial number of request.
*
- * Response callback is IRadioCallback.getRadioCapabilityResponse()
+ * Response callback is IRadioResponse.getRadioCapabilityResponse()
*/
oneway getRadioCapability(int32_t serial);
@@ -1478,7 +1466,7 @@
* @param serial Serial number of request.
* @param rc RadioCapability structure to be set
*
- * Response callback is IRadioCallback.setRadioCapabilityResponse()
+ * Response callback is IRadioResponse.setRadioCapabilityResponse()
*/
oneway setRadioCapability(int32_t serial, RadioCapability rc);
@@ -1489,7 +1477,7 @@
* @param reportInterval desired reporting interval (ms).
* @param pullMode LCE service mode. true: PULL; false: PUSH.
*
- * Response callback is IRadioCallback.startLceServiceResponse()
+ * Response callback is IRadioResponse.startLceServiceResponse()
*/
oneway startLceService(int32_t serial, int32_t reportInterval, bool pullMode);
@@ -1499,7 +1487,7 @@
*
* @param serial Serial number of request.
*
- * Response callback is IRadioCallback.stopLceServiceResponse()
+ * Response callback is IRadioResponse.stopLceServiceResponse()
*/
oneway stopLceService(int32_t serial);
@@ -1508,7 +1496,7 @@
*
* @param serial Serial number of request.
*
- * Response callback is IRadioCallback.pullLceDataResponse()
+ * Response callback is IRadioResponse.pullLceDataResponse()
*/
oneway pullLceData(int32_t serial);
@@ -1520,7 +1508,7 @@
*
* @param serial Serial number of request.
*
- * Response callback is IRadioCallback.getModemActivityInfoResponse()
+ * Response callback is IRadioResponse.getModemActivityInfoResponse()
*/
oneway getModemActivityInfo(int32_t serial);
@@ -1544,7 +1532,7 @@
* @param carriers CarrierRestrictions consisting allowed and excluded carriers as defined
* in types.hal
*
- * Response callback is IRadioCallback.setAllowedCarriersResponse()
+ * Response callback is IRadioResponse.setAllowedCarriersResponse()
*/
oneway setAllowedCarriers(int32_t serial, bool allAllowed, CarrierRestrictions carriers);
@@ -1553,14 +1541,54 @@
*
* @param serial Serial number of request.
*
- * Response callback is IRadioCallback.getAllowedCarriersResponse()
+ * Response callback is IRadioResponse.getAllowedCarriersResponse()
*/
oneway getAllowedCarriers(int32_t serial);
/*
+ * Send the updated device state.
+ * This is providing the device state information for the modem to perform power saving
+ * strategies.
+ *
+ * @param serial Serial number of request.
+ * @param deviceStateType The updated device state type.
+ * @param state The updated state. See the definition of state at DeviceStateType.
+ *
+ * Response callback is IRadioResponse.sendDeviceStateResponse()
+ */
+ oneway sendDeviceState(int32_t serial, DeviceStateType deviceStateType, bool state);
+
+ /*
+ * Set the indication filter.
+ * This is used to prevent unnecessary application processor wake up for power saving purposes
+ * by suppressing the indications in certain scenarios.
+ *
+ * @param serial Serial number of request.
+ * @param indicationFilter 32-bit bitmap of IndicationFilter. Bits set to 1 indicate the
+ * indications are enabled. See IndicationFilter for the definition of each bit.
+ *
+ * Response callback is IRadioResponse.setIndicationFilterResponse()
+ */
+ oneway setIndicationFilter(int32_t serial, bitfield<IndicationFilter> indicationFilter);
+
+ /*
+ * Set SIM card power state.
+ * Request is equivalent to inserting or removing the card.
+ *
+ * The radio modem must generate IRadioIndication.simStatusChanged() as if the SIM had been
+ * inserted or removed.
+ *
+ * @param serial Serial number of request
+ * @param powerUp True if powering up the sim card
+ *
+ * Response callback is IRadioResponse.setSimCardPowerResponse()
+ */
+ oneway setSimCardPower(int32_t serial, bool powerUp);
+
+ /*
* When response type received from a radio indication or radio response is
* RadioIndicationType:UNSOLICITED_ACK_EXP or RadioResponseType:SOLICITED_ACK_EXP respectively,
- * acknowledge the receipt of those messages by sending reseponeAcknowledgement().
+ * acknowledge the receipt of those messages by sending responseAcknowledgement().
*
*/
oneway responseAcknowledgement();
diff --git a/radio/1.0/IRadioIndication.hal b/radio/1.0/IRadioIndication.hal
index fb8666f..81ac13a 100644
--- a/radio/1.0/IRadioIndication.hal
+++ b/radio/1.0/IRadioIndication.hal
@@ -42,12 +42,13 @@
oneway callStateChanged(RadioIndicationType type);
/*
- * Indicates when voice network state changed
- * Callee must invoke IRadio.getVoiceRegistrationState() and IRadio.getOperator()
+ * Indicates when voice or data network state changed
+ * Callee must invoke IRadio.getVoiceRegistrationState(), IRadio.getDataRegistrationState(),
+ * and IRadio.getOperator()
*
* @param type Type of radio indication
*/
- oneway voiceNetworkStateChanged(RadioIndicationType type);
+ oneway networkStateChanged(RadioIndicationType type);
/*
* Indicates when new SMS is received.
diff --git a/radio/1.0/IRadioResponse.hal b/radio/1.0/IRadioResponse.hal
index 8ff2e24..637f697 100644
--- a/radio/1.0/IRadioResponse.hal
+++ b/radio/1.0/IRadioResponse.hal
@@ -1562,6 +1562,16 @@
/*
* @param info Response info struct containing response type, serial no. and error
+ *
+ * Valid errors returned:
+ * RadioError:NONE
+ * RadioError:RADIO_NOT_AVAILABLE
+ * RadioError:GENERIC_FAILURE
+ */
+ oneway reportStkServiceIsRunningResponse(RadioResponseInfo info);
+
+ /*
+ * @param info Response info struct containing response type, serial no. and error
* @param source CDMA subscription source
*
* Valid errors returned:
@@ -1939,7 +1949,38 @@
CarrierRestrictions carriers);
/*
- * Acknowldege the receipt of radio request sent to the vendor. This must be sent only for
+ * @param info Response info struct containing response type, serial no. and error
+ *
+ * Valid errors returned:
+ * RadioError:NONE
+ * RadioError:RADIO_NOT_AVAILABLE
+ */
+ oneway sendDeviceStateResponse(RadioResponseInfo info);
+
+ /*
+ * @param info Response info struct containing response type, serial no. and error
+ *
+ * Valid errors returned:
+ * RadioError:NONE
+ * RadioError:INVALID_ARGUMENTS
+ * RadioError:RADIO_NOT_AVAILABLE
+ */
+ oneway setIndicationFilterResponse(RadioResponseInfo info);
+
+ /*
+ * @param info Response info struct containing response type, serial no. and error
+ *
+ * Valid errors returned:
+ * RadioError:NONE
+ * RadioError:RADIO_NOT_AVAILABLE
+ * RadioError:REQUEST_NOT_SUPPORTED
+ * RadioError:SIM_ABSENT
+ * RadioError:INVALID_ARGUMENTS
+ */
+ oneway setSimCardPowerResponse(RadioResponseInfo info);
+
+ /*
+ * Acknowledge the receipt of radio request sent to the vendor. This must be sent only for
* radio request which take long time to respond.
* For more details, refer https://source.android.com/devices/tech/connect/ril.html
*
diff --git a/radio/1.0/types.hal b/radio/1.0/types.hal
index c0a6475..91030ef 100644
--- a/radio/1.0/types.hal
+++ b/radio/1.0/types.hal
@@ -540,7 +540,7 @@
LTE_CA = 19,
};
-enum DataProfile : int32_t {
+enum DataProfileId : int32_t {
DEFAULT = 0,
TETHERED = 1,
IMS = 2,
@@ -1059,6 +1059,70 @@
MAX = 1 << 7
};
+enum ApnTypes : int32_t {
+ NONE = 0, // None
+ DEFAULT = 1 << 0, // APN type for default data traffic
+ MMS = 1 << 1, // APN type for MMS traffic
+ SUPL = 1 << 2, // APN type for SUPL assisted GPS
+ DUN = 1 << 3, // APN type for DUN traffic
+ HIPRI = 1 << 4, // APN type for HiPri traffic
+ FOTA = 1 << 5, // APN type for FOTA
+ IMS = 1 << 6, // APN type for IMS
+ CBS = 1 << 7, // APN type for CBS
+ IA = 1 << 8, // APN type for IA Initial Attach APN
+ EMERGENCY = 1 << 9, // APN type for Emergency PDN. This is not an IA apn,
+ // but is used for access to carrier services in an
+ // emergency call situation.
+ ALL = DEFAULT | MMS | SUPL | DUN | HIPRI | FOTA | IMS | CBS | IA | EMERGENCY,
+};
+
+enum IndicationFilter : int32_t {
+ NONE = 0,
+ SIGNAL_STRENGTH = 1 << 0, // When this bit is set, modem should always send the
+ // signal strength update through
+ // IRadioIndication.currentSignalStrength(),
+ // otherwise suppress it.
+ FULL_NETWORK_STATE = 1 << 1, // When this bit is set, modem should always invoke
+ // IRadioIndication.networkStateChanged() when any field
+ // in VoiceRegStateResult or DataRegStateResult changes.
+ // When this bit is not set, modem should suppress
+ // IRadioIndication.networkStateChanged() when there are
+ // only changes from those insignificant fields
+ // (e.g. cell info). Modem should continue invoking
+ // IRadioIndication.networkStateChanged()
+ // when significant fields are updated even when this bit
+ // is not set. The following fields are considered
+ // significant, registration state and radio technology.
+ DATA_CALL_DORMANCY_CHANGED = 1 << 2, // When this bit is set, modem should send the data call
+ // list changed indication
+ // IRadioIndication.dataCallListChanged() whenever any
+ // field in ITypes.SetupDataCallResult changes. Otherwise
+ // modem should suppress the indication when the only
+ // changed field is 'active' (for data dormancy).
+ // For all other fields change, modem should continue
+ // sending IRadioIndication.dataCallListChanged()
+ // regardless this bit is set or not.
+ ALL = SIGNAL_STRENGTH | FULL_NETWORK_STATE | DATA_CALL_DORMANCY_CHANGED,
+};
+
+enum MvnoType : int32_t {
+ NONE, // None
+ IMSI, // The matching data is based on IMSI.
+ GID, // The matching data is based on group id.
+ SPN, // The matching data is based service provider name.
+};
+
+enum DeviceStateType : int32_t {
+ POWER_SAVE_MODE, // Device power save mode (provided by PowerManager)
+ // True indicates the device is in power save mode.
+ CHARGING_STATE, // Device charging state (provided by BatteryManager)
+ // True indicates the device is charging.
+ LOW_DATA_EXPECTED // Low data expected mode. True indicates low data traffic
+ // is expected, for example, when the device is idle
+ // (e.g. not doing tethering in the background). Note
+ // this doesn't mean no data is expected.
+};
+
struct RadioResponseInfo {
RadioResponseType type; // Response type
int32_t serial; // Serial number of the request
@@ -1289,7 +1353,7 @@
// In UMTS, CID is UMTS Cell Identity (see TS 25.331)
// in 28 bits
int32_t rat; // indicates the available voice radio technology,
- // valid values as defined by RIL_RadioTechnology.
+ // valid values as defined by RadioTechnology.
int32_t baseStationId; // Base Station ID. if registered on a CDMA
// system or -1 if not. Base Station ID in decimal format
int32_t baseStationLatitude; // Base Station latitude. if registered on a
@@ -1375,7 +1439,7 @@
int32_t cid; // CID if registered or -1 if not
// valid CID are 0x00000000 - 0x0fffffff
int32_t rat; // indicates the available data radio technology,
- // valid values as defined by RIL_RadioTechnology.
+ // valid values as defined by RadioTechnology.
int32_t reasonDataDenied; // if registration state is 3 (Registration
// denied) this is an enumerated reason why
// registration was denied. See 3GPP TS 24.008,
@@ -1698,14 +1762,17 @@
};
struct DataProfileInfo {
- int32_t profileId; // id of the data profile
+ DataProfileId profileId; // id of the data profile
string apn; // The APN to connect to
string protocol; // One of the PDP_type values in TS 27.007 section 10.1.1.
// For example, "IP", "IPV6", "IPV4V6", or "PPP".
- ApnAuthType authType;
+ string roamingProtocol; // one of the PDP_type values in TS 27.007 section 10.1.1
+ // used on roaming network. For example, "IP", "IPV6",
+ // "IPV4V6", or "PPP".
+ ApnAuthType authType; // APN authentication type
string user; // The username for APN, or empty string
string password; // The password for APN, or empty string
- DataProfileInfoType type;
+ DataProfileInfoType type; // Data profile technology type
int32_t maxConnsTime; // The period in seconds to limit the maximum connections
int32_t maxConns; // The maximum connections during maxConnsTime
int32_t waitTime; // The required wait time in seconds after a successful UE
@@ -1713,6 +1780,17 @@
// the device can send a new PDN connection request for
// that given PDN
bool enabled; // True to enable the profile, false to disable
+ bitfield<ApnTypes> supportedApnTypesBitmap; // Supported APN types bitmap. See ApnTypes for the
+ // value of each bit.
+ bitfield<RadioAccessFamily> bearerBitmap; // The bearer bitmap. See RadioAccessFamily for the
+ // value of each bit.
+ int32_t mtu; // Maximum transmission unit (MTU) size in bytes
+ MvnoType mvnoType; // The MVNO matching data type
+ string mvnoMatchData; // MVNO matching data. This is defined by the carrier.
+ // For example,
+ // SPN like: "A MOBILE", "BEN NL", etc...
+ // IMSI like: "302720x94", "2060188", etc...
+ // GID like: "4E", "33", etc...
};
struct RadioCapability {
@@ -1927,4 +2005,4 @@
// to send all of them.
vec<uint8_t> contents; // Carrier-defined content. It is binary, opaque and
// loosely defined in LTE Layer 3 spec 24.008
-};
+};
\ No newline at end of file
diff --git a/radio/1.0/vts/Android.mk b/radio/1.0/vts/Android.mk
deleted file mode 100644
index 4e1fb84..0000000
--- a/radio/1.0/vts/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(LOCAL_PATH)/functional/vts/testcases/hal/radio/hidl/Android.mk
\ No newline at end of file
diff --git a/radio/1.0/vts/Radio.vts b/radio/1.0/vts/Radio.vts
index c3d998a..68cf620 100644
--- a/radio/1.0/vts/Radio.vts
+++ b/radio/1.0/vts/Radio.vts
@@ -7,19 +7,18 @@
import: "android.hardware.radio@1.0::IRadioIndication"
import: "android.hardware.radio@1.0::IRadioResponse"
import: "android.hardware.radio@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
api: {
name: "setResponseFunctions"
arg: {
type: TYPE_HIDL_INTERFACE
- predefined_type: "IRadioResponse"
- is_callback: false
+ predefined_type: "::android::hardware::radio::V1_0::IRadioResponse"
}
arg: {
type: TYPE_HIDL_INTERFACE
- predefined_type: "IRadioIndication"
- is_callback: false
+ predefined_type: "::android::hardware::radio::V1_0::IRadioIndication"
}
}
@@ -315,28 +314,20 @@
scalar_type: "int32_t"
}
arg: {
- type: TYPE_SCALAR
- scalar_type: "int32_t"
- }
- arg: {
- type: TYPE_SCALAR
- scalar_type: "int32_t"
- }
- arg: {
- type: TYPE_STRING
- }
- arg: {
- type: TYPE_STRING
- }
- arg: {
- type: TYPE_STRING
- }
- arg: {
type: TYPE_ENUM
- predefined_type: "::android::hardware::radio::V1_0::ApnAuthType"
+ predefined_type: "::android::hardware::radio::V1_0::RadioTechnology"
}
arg: {
- type: TYPE_STRING
+ type: TYPE_STRUCT
+ predefined_type: "::android::hardware::radio::V1_0::DataProfileInfo"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "bool_t"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "bool_t"
}
}
@@ -1198,20 +1189,12 @@
scalar_type: "int32_t"
}
arg: {
- type: TYPE_STRING
+ type: TYPE_STRUCT
+ predefined_type: "::android::hardware::radio::V1_0::DataProfileInfo"
}
arg: {
- type: TYPE_STRING
- }
- arg: {
- type: TYPE_ENUM
- predefined_type: "::android::hardware::radio::V1_0::ApnAuthType"
- }
- arg: {
- type: TYPE_STRING
- }
- arg: {
- type: TYPE_STRING
+ type: TYPE_SCALAR
+ scalar_type: "bool_t"
}
}
@@ -1491,6 +1474,47 @@
}
api: {
+ name: "sendDeviceState"
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "int32_t"
+ }
+ arg: {
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::radio::V1_0::DeviceStateType"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "bool_t"
+ }
+ }
+
+ api: {
+ name: "setIndicationFilter"
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "int32_t"
+ }
+ arg: {
+ type: TYPE_MASK
+ scalar_type: "int32_t"
+ predefined_type: "::android::hardware::radio::V1_0::IndicationFilter"
+ }
+ }
+
+ api: {
+ name: "setSimCardPower"
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "int32_t"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "bool_t"
+ }
+ }
+
+ api: {
name: "responseAcknowledgement"
}
diff --git a/radio/1.0/vts/RadioIndication.vts b/radio/1.0/vts/RadioIndication.vts
index fac73a9..cce8ada 100644
--- a/radio/1.0/vts/RadioIndication.vts
+++ b/radio/1.0/vts/RadioIndication.vts
@@ -5,6 +5,7 @@
package: "android.hardware.radio"
import: "android.hardware.radio@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
api: {
@@ -28,7 +29,7 @@
}
api: {
- name: "voiceNetworkStateChanged"
+ name: "networkStateChanged"
arg: {
type: TYPE_ENUM
predefined_type: "::android::hardware::radio::V1_0::RadioIndicationType"
diff --git a/radio/1.0/vts/RadioResponse.vts b/radio/1.0/vts/RadioResponse.vts
index 2884d30..a6c5223 100644
--- a/radio/1.0/vts/RadioResponse.vts
+++ b/radio/1.0/vts/RadioResponse.vts
@@ -5,6 +5,7 @@
package: "android.hardware.radio"
import: "android.hardware.radio@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
api: {
@@ -1013,6 +1014,14 @@
}
api: {
+ name: "reportStkServiceIsRunningResponse"
+ arg: {
+ type: TYPE_STRUCT
+ predefined_type: "::android::hardware::radio::V1_0::RadioResponseInfo"
+ }
+ }
+
+ api: {
name: "getCdmaSubscriptionSourceResponse"
arg: {
type: TYPE_STRUCT
@@ -1372,6 +1381,30 @@
}
api: {
+ name: "sendDeviceStateResponse"
+ arg: {
+ type: TYPE_STRUCT
+ predefined_type: "::android::hardware::radio::V1_0::RadioResponseInfo"
+ }
+ }
+
+ api: {
+ name: "setIndicationFilterResponse"
+ arg: {
+ type: TYPE_STRUCT
+ predefined_type: "::android::hardware::radio::V1_0::RadioResponseInfo"
+ }
+ }
+
+ api: {
+ name: "setSimCardPowerResponse"
+ arg: {
+ type: TYPE_STRUCT
+ predefined_type: "::android::hardware::radio::V1_0::RadioResponseInfo"
+ }
+ }
+
+ api: {
name: "acknowledgeRequest"
arg: {
type: TYPE_SCALAR
diff --git a/radio/1.0/vts/Sap.vts b/radio/1.0/vts/Sap.vts
index 23205d0..b4983da 100644
--- a/radio/1.0/vts/Sap.vts
+++ b/radio/1.0/vts/Sap.vts
@@ -6,14 +6,14 @@
import: "android.hardware.radio@1.0::ISapCallback"
import: "android.hardware.radio@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
api: {
name: "setCallback"
arg: {
type: TYPE_HIDL_CALLBACK
- predefined_type: "ISapCallback"
- is_callback: true
+ predefined_type: "::android::hardware::radio::V1_0::ISapCallback"
}
}
diff --git a/radio/1.0/vts/SapCallback.vts b/radio/1.0/vts/SapCallback.vts
index 2e61ce6..3a33dba 100644
--- a/radio/1.0/vts/SapCallback.vts
+++ b/radio/1.0/vts/SapCallback.vts
@@ -5,6 +5,7 @@
package: "android.hardware.radio"
import: "android.hardware.radio@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
api: {
diff --git a/radio/1.0/vts/functional/Android.bp b/radio/1.0/vts/functional/Android.bp
new file mode 100644
index 0000000..a01e270
--- /dev/null
+++ b/radio/1.0/vts/functional/Android.bp
@@ -0,0 +1,40 @@
+//
+// Copyright (C) 2017 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.
+//
+
+cc_test {
+ name: "radio_hidl_hal_test",
+ gtest: true,
+ srcs: ["radio_hidl_hal_test.cpp",
+ "radio_response.cpp",
+ "radio_hidl_hal_icc.cpp",
+ "radio_hidl_hal_main.cpp"],
+ shared_libs: [
+ "libbase",
+ "liblog",
+ "libcutils",
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "libnativehelper",
+ "libutils",
+ "android.hardware.radio@1.0",
+ ],
+ static_libs: ["libgtest"],
+ cflags: [
+ "-O0",
+ "-g",
+ ],
+}
\ No newline at end of file
diff --git a/radio/1.0/vts/functional/radio_hidl_hal_icc.cpp b/radio/1.0/vts/functional/radio_hidl_hal_icc.cpp
new file mode 100644
index 0000000..9b540e8
--- /dev/null
+++ b/radio/1.0/vts/functional/radio_hidl_hal_icc.cpp
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2017 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.
+ */
+
+ #include<radio_hidl_hal_utils.h>
+
+/*
+ * Test IRadio.getIccCardStatus() for the response returned.
+ */
+TEST_F(RadioHidlTest, getIccCardStatus) {
+ radio->getIccCardStatus(1);
+ EXPECT_EQ(std::cv_status::no_timeout, wait());
+ EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);
+ EXPECT_EQ(1, radioRsp->rspInfo.serial);
+ EXPECT_EQ(radioRsp->rspInfo.error, RadioError::NONE);
+
+ EXPECT_LE(radioRsp->cardStatus.applications.size(), (unsigned int) RadioConst::CARD_MAX_APPS);
+ EXPECT_LT(radioRsp->cardStatus.gsmUmtsSubscriptionAppIndex, (int) RadioConst::CARD_MAX_APPS);
+ EXPECT_LT(radioRsp->cardStatus.cdmaSubscriptionAppIndex, (int) RadioConst::CARD_MAX_APPS);
+ EXPECT_LT(radioRsp->cardStatus.imsSubscriptionAppIndex, (int) RadioConst::CARD_MAX_APPS);
+}
+
+/*
+ * Test IRadio.supplyIccPinForApp() for the response returned.
+ */
+TEST_F(RadioHidlTest, supplyIccPinForApp) {
+ radio->supplyIccPinForApp(2, hidl_string("test1"), hidl_string());
+ EXPECT_EQ(std::cv_status::no_timeout, wait());
+ EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);
+ EXPECT_EQ(2, radioRsp->rspInfo.serial);
+
+ EXPECT_EQ(radioRsp->rspInfo.error, RadioError::PASSWORD_INCORRECT);
+}
+
+/*
+ * Test IRadio.supplyIccPukForApp() for the response returned.
+ */
+TEST_F(RadioHidlTest, supplyIccPukForApp) {
+ radio->supplyIccPukForApp(3, hidl_string("test1"), hidl_string("test2"), hidl_string());
+ EXPECT_EQ(std::cv_status::no_timeout, wait());
+ EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);
+ EXPECT_EQ(3, radioRsp->rspInfo.serial);
+
+ EXPECT_EQ(radioRsp->rspInfo.error, RadioError::PASSWORD_INCORRECT);
+}
+
+/*
+ * Test IRadio.supplyIccPin2ForApp() for the response returned.
+ */
+TEST_F(RadioHidlTest, supplyIccPin2ForApp) {
+ radio->supplyIccPin2ForApp(4, hidl_string("test1"), hidl_string());
+ EXPECT_EQ(std::cv_status::no_timeout, wait());
+ EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);
+ EXPECT_EQ(4, radioRsp->rspInfo.serial);
+
+ EXPECT_EQ(radioRsp->rspInfo.error, RadioError::PASSWORD_INCORRECT);
+}
+
+/*
+ * Test IRadio.supplyIccPuk2ForApp() for the response returned.
+ */
+TEST_F(RadioHidlTest, supplyIccPuk2ForApp) {
+ radio->supplyIccPuk2ForApp(5, hidl_string("test1"), hidl_string("test2"), hidl_string());
+ EXPECT_EQ(std::cv_status::no_timeout, wait());
+ EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);
+ EXPECT_EQ(5, radioRsp->rspInfo.serial);
+
+ EXPECT_EQ(radioRsp->rspInfo.error, RadioError::PASSWORD_INCORRECT);
+}
+
+/*
+ * Test IRadio.changeIccPinForApp() for the response returned.
+ */
+TEST_F(RadioHidlTest, changeIccPinForApp) {
+ radio->changeIccPinForApp(6, hidl_string("test1"), hidl_string("test2"), hidl_string());
+ EXPECT_EQ(std::cv_status::no_timeout, wait());
+ EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);
+ EXPECT_EQ(6, radioRsp->rspInfo.serial);
+
+ EXPECT_EQ(radioRsp->rspInfo.error, RadioError::PASSWORD_INCORRECT);
+}
+
+/*
+ * Test IRadio.changeIccPin2ForApp() for the response returned.
+ */
+TEST_F(RadioHidlTest, changeIccPin2ForApp) {
+ radio->changeIccPin2ForApp(7, hidl_string("test1"), hidl_string("test2"), hidl_string());
+ EXPECT_EQ(std::cv_status::no_timeout, wait());
+ EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);
+ EXPECT_EQ(7, radioRsp->rspInfo.serial);
+
+ EXPECT_EQ(radioRsp->rspInfo.error, RadioError::PASSWORD_INCORRECT);
+}
diff --git a/radio/1.0/vts/functional/radio_hidl_hal_main.cpp b/radio/1.0/vts/functional/radio_hidl_hal_main.cpp
new file mode 100644
index 0000000..d01adf2
--- /dev/null
+++ b/radio/1.0/vts/functional/radio_hidl_hal_main.cpp
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2017 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.
+ */
+
+#include<radio_hidl_hal_utils.h>
+
+int main(int argc, char** argv) {
+ ::testing::AddGlobalTestEnvironment(new RadioHidlEnvironment);
+ ::testing::InitGoogleTest(&argc, argv);
+
+ int status = RUN_ALL_TESTS();
+ LOG(INFO) << "Test result = " << status;
+
+ return status;
+}
\ No newline at end of file
diff --git a/radio/1.0/vts/functional/radio_hidl_hal_test.cpp b/radio/1.0/vts/functional/radio_hidl_hal_test.cpp
new file mode 100644
index 0000000..2a67954
--- /dev/null
+++ b/radio/1.0/vts/functional/radio_hidl_hal_test.cpp
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2017 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.
+ */
+
+#include<radio_hidl_hal_utils.h>
+
+void RadioHidlTest::SetUp() {
+ radio = IRadio::getService(hidl_string("rild"));
+ ASSERT_NE(radio, nullptr);
+
+ radioRsp = new RadioResponse(*this);
+ ASSERT_NE(radioRsp, nullptr);
+
+ count = 0;
+
+ radioInd = NULL;
+ radio->setResponseFunctions(radioRsp, radioInd);
+}
+
+void RadioHidlTest::TearDown() {
+}
+
+void RadioHidlTest::notify() {
+ std::unique_lock<std::mutex> lock(mtx);
+ count++;
+ cv.notify_one();
+}
+
+std::cv_status RadioHidlTest::wait() {
+ std::unique_lock<std::mutex> lock(mtx);
+
+ std::cv_status status = std::cv_status::no_timeout;
+ auto now = std::chrono::system_clock::now();
+ while (count == 0) {
+ status = cv.wait_until(lock, now + std::chrono::seconds(TIMEOUT_PERIOD));
+ if (status == std::cv_status::timeout) {
+ return status;
+ }
+ }
+ count--;
+ return status;
+}
+
diff --git a/radio/1.0/vts/functional/radio_hidl_hal_utils.h b/radio/1.0/vts/functional/radio_hidl_hal_utils.h
new file mode 100644
index 0000000..f0c4504
--- /dev/null
+++ b/radio/1.0/vts/functional/radio_hidl_hal_utils.h
@@ -0,0 +1,451 @@
+/*
+ * Copyright (C) 2017 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.
+ */
+
+#include <android-base/logging.h>
+
+#include <gtest/gtest.h>
+#include <chrono>
+#include <condition_variable>
+#include <mutex>
+
+#include <android/hardware/radio/1.0/IRadio.h>
+#include <android/hardware/radio/1.0/IRadioResponse.h>
+#include <android/hardware/radio/1.0/IRadioIndication.h>
+#include <android/hardware/radio/1.0/types.h>
+
+using ::android::hardware::radio::V1_0::ActivityStatsInfo;
+using ::android::hardware::radio::V1_0::CardStatus;
+using ::android::hardware::radio::V1_0::Call;
+using ::android::hardware::radio::V1_0::CallForwardInfo;
+using ::android::hardware::radio::V1_0::CarrierRestrictions;
+using ::android::hardware::radio::V1_0::CdmaRoamingType;
+using ::android::hardware::radio::V1_0::CdmaBroadcastSmsConfigInfo;
+using ::android::hardware::radio::V1_0::CdmaSubscriptionSource;
+using ::android::hardware::radio::V1_0::CellInfo;
+using ::android::hardware::radio::V1_0::ClipStatus;
+using ::android::hardware::radio::V1_0::DataRegStateResult;
+using ::android::hardware::radio::V1_0::GsmBroadcastSmsConfigInfo;
+using ::android::hardware::radio::V1_0::HardwareConfig;
+using ::android::hardware::radio::V1_0::IccIoResult;
+using ::android::hardware::radio::V1_0::IRadio;
+using ::android::hardware::radio::V1_0::IRadioResponse;
+using ::android::hardware::radio::V1_0::IRadioIndication;
+using ::android::hardware::radio::V1_0::RadioConst;
+using ::android::hardware::radio::V1_0::RadioError;
+using ::android::hardware::radio::V1_0::RadioResponseInfo;
+using ::android::hardware::radio::V1_0::LastCallFailCauseInfo;
+using ::android::hardware::radio::V1_0::LceDataInfo;
+using ::android::hardware::radio::V1_0::LceStatusInfo;
+using ::android::hardware::radio::V1_0::NeighboringCell;
+using ::android::hardware::radio::V1_0::OperatorInfo;
+using ::android::hardware::radio::V1_0::PreferredNetworkType;
+using ::android::hardware::radio::V1_0::RadioBandMode;
+using ::android::hardware::radio::V1_0::RadioCapability;
+using ::android::hardware::radio::V1_0::RadioResponseType;
+using ::android::hardware::radio::V1_0::RadioTechnology;
+using ::android::hardware::radio::V1_0::RadioTechnologyFamily;
+using ::android::hardware::radio::V1_0::SendSmsResult;
+using ::android::hardware::radio::V1_0::SetupDataCallResult;
+using ::android::hardware::radio::V1_0::SignalStrength;
+using ::android::hardware::radio::V1_0::TtyMode;
+using ::android::hardware::radio::V1_0::VoiceRegStateResult;
+
+using ::android::hardware::hidl_string;
+using ::android::hardware::Return;
+using ::android::hardware::Void;
+using ::android::sp;
+
+#define TIMEOUT_PERIOD 20
+
+class RadioHidlTest;
+
+/* Callback class for radio response */
+class RadioResponse : public IRadioResponse {
+private:
+ RadioHidlTest& parent;
+
+public:
+ RadioResponseInfo rspInfo;
+ CardStatus cardStatus;
+
+ RadioResponse(RadioHidlTest& parent);
+
+ virtual ~RadioResponse() = default;
+
+ Return<void> getIccCardStatusResponse(const RadioResponseInfo& info,
+ const CardStatus& cardStatus);
+
+ Return<void> supplyIccPinForAppResponse(const RadioResponseInfo& info,
+ int32_t remainingRetries);
+
+ Return<void> supplyIccPukForAppResponse(const RadioResponseInfo& info,
+ int32_t remainingRetries);
+
+ Return<void> supplyIccPin2ForAppResponse(const RadioResponseInfo& info,
+ int32_t remainingRetries);
+
+ Return<void> supplyIccPuk2ForAppResponse(const RadioResponseInfo& info,
+ int32_t remainingRetries);
+
+ Return<void> changeIccPinForAppResponse(const RadioResponseInfo& info,
+ int32_t remainingRetries);
+
+ Return<void> changeIccPin2ForAppResponse(const RadioResponseInfo& info,
+ int32_t remainingRetries);
+
+ Return<void> supplyNetworkDepersonalizationResponse(
+ const RadioResponseInfo& info, int32_t remainingRetries);
+
+ Return<void> getCurrentCallsResponse(const RadioResponseInfo& info,
+ const ::android::hardware::hidl_vec<Call>& calls);
+
+ Return<void> dialResponse(const RadioResponseInfo& info);
+
+ Return<void> getIMSIForAppResponse(const RadioResponseInfo& info,
+ const ::android::hardware::hidl_string& imsi);
+
+ Return<void> hangupConnectionResponse(const RadioResponseInfo& info);
+
+ Return<void> hangupWaitingOrBackgroundResponse(
+ const RadioResponseInfo& info);
+
+ Return<void> hangupForegroundResumeBackgroundResponse(
+ const RadioResponseInfo& info);
+
+ Return<void> switchWaitingOrHoldingAndActiveResponse(
+ const RadioResponseInfo& info);
+
+ Return<void> conferenceResponse(const RadioResponseInfo& info);
+
+ Return<void> rejectCallResponse(const RadioResponseInfo& info);
+
+ Return<void> getLastCallFailCauseResponse(const RadioResponseInfo& info,
+ const LastCallFailCauseInfo& failCauseInfo);
+
+ Return<void> getSignalStrengthResponse(const RadioResponseInfo& info,
+ const SignalStrength& sigStrength);
+
+ Return<void> getVoiceRegistrationStateResponse(const RadioResponseInfo& info,
+ const VoiceRegStateResult& voiceRegResponse);
+
+ Return<void> getDataRegistrationStateResponse(const RadioResponseInfo& info,
+ const DataRegStateResult& dataRegResponse);
+
+ Return<void> getOperatorResponse(const RadioResponseInfo& info,
+ const ::android::hardware::hidl_string& longName,
+ const ::android::hardware::hidl_string& shortName,
+ const ::android::hardware::hidl_string& numeric);
+
+ Return<void> setRadioPowerResponse(const RadioResponseInfo& info);
+
+ Return<void> sendDtmfResponse(const RadioResponseInfo& info);
+
+ Return<void> sendSmsResponse(const RadioResponseInfo& info,
+ const SendSmsResult& sms);
+
+ Return<void> sendSMSExpectMoreResponse(const RadioResponseInfo& info,
+ const SendSmsResult& sms);
+
+ Return<void> setupDataCallResponse(const RadioResponseInfo& info,
+ const SetupDataCallResult& dcResponse);
+
+ Return<void> iccIOForAppResponse(const RadioResponseInfo& info,
+ const IccIoResult& iccIo);
+
+ Return<void> sendUssdResponse(const RadioResponseInfo& info);
+
+ Return<void> cancelPendingUssdResponse(const RadioResponseInfo& info);
+
+ Return<void> getClirResponse(const RadioResponseInfo& info, int32_t n, int32_t m);
+
+ Return<void> setClirResponse(const RadioResponseInfo& info);
+
+ Return<void> getCallForwardStatusResponse(const RadioResponseInfo& info,
+ const ::android::hardware::hidl_vec<CallForwardInfo>& call_forwardInfos);
+
+ Return<void> setCallForwardResponse(const RadioResponseInfo& info);
+
+ Return<void> getCallWaitingResponse(const RadioResponseInfo& info,
+ bool enable, int32_t serviceClass);
+
+ Return<void> setCallWaitingResponse(const RadioResponseInfo& info);
+
+ Return<void> acknowledgeLastIncomingGsmSmsResponse(const RadioResponseInfo& info);
+
+ Return<void> acceptCallResponse(const RadioResponseInfo& info);
+
+ Return<void> deactivateDataCallResponse(const RadioResponseInfo& info);
+
+ Return<void> getFacilityLockForAppResponse(const RadioResponseInfo& info,int32_t response);
+
+ Return<void> setFacilityLockForAppResponse(const RadioResponseInfo& info,int32_t retry);
+
+ Return<void> setBarringPasswordResponse(const RadioResponseInfo& info);
+
+ Return<void> getNetworkSelectionModeResponse(const RadioResponseInfo& info,bool manual);
+
+ Return<void> setNetworkSelectionModeAutomaticResponse(const RadioResponseInfo& info);
+
+ Return<void> setNetworkSelectionModeManualResponse(const RadioResponseInfo& info);
+
+ Return<void> getAvailableNetworksResponse(const RadioResponseInfo& info,
+ const ::android::hardware::hidl_vec<OperatorInfo>& networkInfos);
+
+ Return<void> startDtmfResponse(const RadioResponseInfo& info);
+
+ Return<void> stopDtmfResponse(const RadioResponseInfo& info);
+
+ Return<void> getBasebandVersionResponse(const RadioResponseInfo& info,
+ const ::android::hardware::hidl_string& version);
+
+ Return<void> separateConnectionResponse(const RadioResponseInfo& info);
+
+ Return<void> setMuteResponse(const RadioResponseInfo& info);
+
+ Return<void> getMuteResponse(const RadioResponseInfo& info, bool enable);
+
+ Return<void> getClipResponse(const RadioResponseInfo& info,ClipStatus status);
+
+ Return<void> getDataCallListResponse(const RadioResponseInfo& info,
+ const ::android::hardware::hidl_vec<SetupDataCallResult>& dcResponse);
+
+ Return<void> sendOemRilRequestRawResponse(const RadioResponseInfo& info,
+ const ::android::hardware::hidl_vec<uint8_t>& data);
+
+ Return<void> sendOemRilRequestStringsResponse(const RadioResponseInfo& info,
+ const ::android::hardware::hidl_vec<::android::hardware::hidl_string>& data);
+
+ Return<void> sendScreenStateResponse(const RadioResponseInfo& info);
+
+ Return<void> setSuppServiceNotificationsResponse(
+ const RadioResponseInfo& info);
+
+ Return<void> writeSmsToSimResponse(const RadioResponseInfo& info,int32_t index);
+
+ Return<void> deleteSmsOnSimResponse(const RadioResponseInfo& info);
+
+ Return<void> setBandModeResponse(const RadioResponseInfo& info);
+
+ Return<void> getAvailableBandModesResponse(const RadioResponseInfo& info,
+ const ::android::hardware::hidl_vec<RadioBandMode>& bandModes);
+
+ Return<void> sendEnvelopeResponse(const RadioResponseInfo& info,
+ const ::android::hardware::hidl_string& commandResponse);
+
+ Return<void> sendTerminalResponseToSimResponse(const RadioResponseInfo& info);
+
+ Return<void> handleStkCallSetupRequestFromSimResponse(
+ const RadioResponseInfo& info);
+
+ Return<void> explicitCallTransferResponse(const RadioResponseInfo& info);
+
+ Return<void> setPreferredNetworkTypeResponse(const RadioResponseInfo& info);
+
+ Return<void> getPreferredNetworkTypeResponse(const RadioResponseInfo& info,
+ PreferredNetworkType nwType);
+
+ Return<void> getNeighboringCidsResponse(const RadioResponseInfo& info,
+ const ::android::hardware::hidl_vec<NeighboringCell>& cells);
+
+ Return<void> setLocationUpdatesResponse(const RadioResponseInfo& info);
+
+ Return<void> setCdmaSubscriptionSourceResponse(const RadioResponseInfo& info);
+
+ Return<void> setCdmaRoamingPreferenceResponse(const RadioResponseInfo& info);
+
+ Return<void> getCdmaRoamingPreferenceResponse(const RadioResponseInfo& info,
+ CdmaRoamingType type);
+
+ Return<void> setTTYModeResponse(const RadioResponseInfo& info);
+
+ Return<void> getTTYModeResponse(const RadioResponseInfo& info, TtyMode mode);
+
+ Return<void> setPreferredVoicePrivacyResponse(const RadioResponseInfo& info);
+
+ Return<void> getPreferredVoicePrivacyResponse(const RadioResponseInfo& info, bool enable);
+
+ Return<void> sendCDMAFeatureCodeResponse(const RadioResponseInfo& info);
+
+ Return<void> sendBurstDtmfResponse(const RadioResponseInfo& info);
+
+ Return<void> sendCdmaSmsResponse(const RadioResponseInfo& info, const SendSmsResult& sms);
+
+ Return<void> acknowledgeLastIncomingCdmaSmsResponse(const RadioResponseInfo& info);
+
+ Return<void> getGsmBroadcastConfigResponse(const RadioResponseInfo& info,
+ const ::android::hardware::hidl_vec<GsmBroadcastSmsConfigInfo>& configs);
+
+ Return<void> setGsmBroadcastConfigResponse(const RadioResponseInfo& info);
+
+ Return<void> setGsmBroadcastActivationResponse(const RadioResponseInfo& info);
+
+ Return<void> getCdmaBroadcastConfigResponse(const RadioResponseInfo& info,
+ const ::android::hardware::hidl_vec<CdmaBroadcastSmsConfigInfo>& configs);
+
+ Return<void> setCdmaBroadcastConfigResponse(const RadioResponseInfo& info);
+
+ Return<void> setCdmaBroadcastActivationResponse(const RadioResponseInfo& info);
+
+ Return<void> getCDMASubscriptionResponse(const RadioResponseInfo& info,
+ const ::android::hardware::hidl_string& mdn,
+ const ::android::hardware::hidl_string& hSid,
+ const ::android::hardware::hidl_string& hNid,
+ const ::android::hardware::hidl_string& min,
+ const ::android::hardware::hidl_string& prl);
+
+ Return<void> writeSmsToRuimResponse(const RadioResponseInfo& info, uint32_t index);
+
+ Return<void> deleteSmsOnRuimResponse(const RadioResponseInfo& info);
+
+ Return<void> getDeviceIdentityResponse(const RadioResponseInfo& info,
+ const ::android::hardware::hidl_string& imei,
+ const ::android::hardware::hidl_string& imeisv,
+ const ::android::hardware::hidl_string& esn,
+ const ::android::hardware::hidl_string& meid);
+
+ Return<void> exitEmergencyCallbackModeResponse(const RadioResponseInfo& info);
+
+ Return<void> getSmscAddressResponse(const RadioResponseInfo& info,
+ const ::android::hardware::hidl_string& smsc);
+
+ Return<void> setSmscAddressResponse(const RadioResponseInfo& info);
+
+ Return<void> reportSmsMemoryStatusResponse(const RadioResponseInfo& info);
+
+ Return<void> reportStkServiceIsRunningResponse(const RadioResponseInfo& info);
+
+ Return<void> getCdmaSubscriptionSourceResponse(const RadioResponseInfo& info,
+ CdmaSubscriptionSource source);
+
+ Return<void> requestIsimAuthenticationResponse(const RadioResponseInfo& info,
+ const ::android::hardware::hidl_string& response);
+
+ Return<void> acknowledgeIncomingGsmSmsWithPduResponse(
+ const RadioResponseInfo& info);
+
+ Return<void> sendEnvelopeWithStatusResponse(const RadioResponseInfo& info,
+ const IccIoResult& iccIo);
+
+ Return<void> getVoiceRadioTechnologyResponse(const RadioResponseInfo& info,
+ RadioTechnology rat);
+
+ Return<void> getCellInfoListResponse(const RadioResponseInfo& info,
+ const ::android::hardware::hidl_vec<CellInfo>& cellInfo);
+
+ Return<void> setCellInfoListRateResponse(const RadioResponseInfo& info);
+
+ Return<void> setInitialAttachApnResponse(const RadioResponseInfo& info);
+
+ Return<void> getImsRegistrationStateResponse(const RadioResponseInfo& info,
+ bool isRegistered, RadioTechnologyFamily ratFamily);
+
+ Return<void> sendImsSmsResponse(const RadioResponseInfo& info,
+ const SendSmsResult& sms);
+
+ Return<void> iccTransmitApduBasicChannelResponse(
+ const RadioResponseInfo& info, const IccIoResult& result);
+
+ Return<void> iccOpenLogicalChannelResponse(const RadioResponseInfo& info,
+ int32_t channelId, const ::android::hardware::hidl_vec<int8_t>& selectResponse);
+
+ Return<void> iccCloseLogicalChannelResponse(const RadioResponseInfo& info);
+
+ Return<void> iccTransmitApduLogicalChannelResponse(
+ const RadioResponseInfo& info, const IccIoResult& result);
+
+ Return<void> nvReadItemResponse(const RadioResponseInfo& info,
+ const ::android::hardware::hidl_string& result);
+
+ Return<void> nvWriteItemResponse(const RadioResponseInfo& info);
+
+ Return<void> nvWriteCdmaPrlResponse(const RadioResponseInfo& info);
+
+ Return<void> nvResetConfigResponse(const RadioResponseInfo& info);
+
+ Return<void> setUiccSubscriptionResponse(const RadioResponseInfo& info);
+
+ Return<void> setDataAllowedResponse(const RadioResponseInfo& info);
+
+ Return<void> getHardwareConfigResponse(const RadioResponseInfo& info,
+ const ::android::hardware::hidl_vec<HardwareConfig>& config);
+
+ Return<void> requestIccSimAuthenticationResponse(
+ const RadioResponseInfo& info, const IccIoResult& result);
+
+ Return<void> setDataProfileResponse(const RadioResponseInfo& info);
+
+ Return<void> requestShutdownResponse(const RadioResponseInfo& info);
+
+ Return<void> getRadioCapabilityResponse(const RadioResponseInfo& info,
+ const RadioCapability& rc);
+
+ Return<void> setRadioCapabilityResponse(const RadioResponseInfo& info,
+ const RadioCapability& rc);
+
+ Return<void> startLceServiceResponse(const RadioResponseInfo& info,
+ const LceStatusInfo& statusInfo);
+
+ Return<void> stopLceServiceResponse(const RadioResponseInfo& info,
+ const LceStatusInfo& statusInfo);
+
+ Return<void> pullLceDataResponse(const RadioResponseInfo& info,
+ const LceDataInfo& lceInfo);
+
+ Return<void> getModemActivityInfoResponse(const RadioResponseInfo& info,
+ const ActivityStatsInfo& activityInfo);
+
+ Return<void> setAllowedCarriersResponse(const RadioResponseInfo& info,
+ int32_t numAllowed);
+
+ Return<void> getAllowedCarriersResponse(const RadioResponseInfo& info,
+ bool allAllowed, const CarrierRestrictions& carriers);
+
+ Return<void> sendDeviceStateResponse(const RadioResponseInfo& info);
+
+ Return<void> setIndicationFilterResponse(const RadioResponseInfo& info);
+
+ Return<void> acknowledgeRequest(int32_t serial);
+};
+
+// The main test class for Radio HIDL.
+class RadioHidlTest : public ::testing::Test {
+private:
+ std::mutex mtx;
+ std::condition_variable cv;
+ int count;
+
+public:
+ virtual void SetUp() override;
+
+ virtual void TearDown() override;
+
+ /* Used as a mechanism to inform the test about data/event callback */
+ void notify();
+
+ /* Test code calls this function to wait for response */
+ std::cv_status wait();
+
+ sp<IRadio> radio;
+ sp<RadioResponse> radioRsp;
+ sp<IRadioIndication> radioInd;
+};
+
+// A class for test environment setup
+class RadioHidlEnvironment : public ::testing::Environment {
+public:
+ virtual void SetUp() {}
+ virtual void TearDown() {}
+};
diff --git a/radio/1.0/vts/functional/radio_response.cpp b/radio/1.0/vts/functional/radio_response.cpp
new file mode 100644
index 0000000..18a02ed
--- /dev/null
+++ b/radio/1.0/vts/functional/radio_response.cpp
@@ -0,0 +1,660 @@
+/*
+ * Copyright (C) 2017 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.
+ */
+
+#include<radio_hidl_hal_utils.h>
+
+RadioResponse::RadioResponse(RadioHidlTest& parent) : parent(parent) {
+}
+
+Return<void> RadioResponse::getIccCardStatusResponse(
+ const RadioResponseInfo& info, const CardStatus& card_status) {
+ rspInfo = info;
+ cardStatus = card_status;
+ parent.notify();
+ return Void();
+}
+
+Return<void> RadioResponse::supplyIccPinForAppResponse(
+ const RadioResponseInfo& info, int32_t remainingRetries) {
+ rspInfo = info;
+ parent.notify();
+ return Void();
+}
+
+Return<void> RadioResponse::supplyIccPukForAppResponse(
+ const RadioResponseInfo& info, int32_t remainingRetries) {
+ rspInfo = info;
+ parent.notify();
+ return Void();
+}
+
+Return<void> RadioResponse::supplyIccPin2ForAppResponse(
+ const RadioResponseInfo& info, int32_t remainingRetries) {
+ rspInfo = info;
+ parent.notify();
+ return Void();
+}
+
+Return<void> RadioResponse::supplyIccPuk2ForAppResponse(
+ const RadioResponseInfo& info, int32_t remainingRetries) {
+ rspInfo = info;
+ parent.notify();
+ return Void();
+}
+
+Return<void> RadioResponse::changeIccPinForAppResponse(
+ const RadioResponseInfo& info, int32_t remainingRetries) {
+ rspInfo = info;
+ parent.notify();
+ return Void();
+}
+
+Return<void> RadioResponse::changeIccPin2ForAppResponse(
+ const RadioResponseInfo& info, int32_t remaining_retries) {
+ rspInfo = info;
+ parent.notify();
+ return Void();
+}
+
+Return<void> RadioResponse::supplyNetworkDepersonalizationResponse(
+ const RadioResponseInfo& info, int32_t remainingRetries) {
+ return Void();
+}
+
+Return<void> RadioResponse::getCurrentCallsResponse(
+ const RadioResponseInfo& info, const ::android::hardware::hidl_vec<Call>& calls) {
+ return Void();
+}
+
+Return<void> RadioResponse::dialResponse(const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::getIMSIForAppResponse(
+ const RadioResponseInfo& info, const ::android::hardware::hidl_string& imsi) {
+ return Void();
+}
+
+Return<void> RadioResponse::hangupConnectionResponse(
+ const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::hangupWaitingOrBackgroundResponse(
+ const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::hangupForegroundResumeBackgroundResponse(
+ const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::switchWaitingOrHoldingAndActiveResponse(
+ const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::conferenceResponse(
+ const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::rejectCallResponse(
+ const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::getLastCallFailCauseResponse(
+ const RadioResponseInfo& info, const LastCallFailCauseInfo& failCauseInfo) {
+ return Void();
+}
+
+Return<void> RadioResponse::getSignalStrengthResponse(
+ const RadioResponseInfo& info, const SignalStrength& sig_strength) {
+ return Void();
+}
+
+Return<void> RadioResponse::getVoiceRegistrationStateResponse(
+ const RadioResponseInfo& info, const VoiceRegStateResult& voiceRegResponse) {
+ return Void();
+}
+
+Return<void> RadioResponse::getDataRegistrationStateResponse(
+ const RadioResponseInfo& info, const DataRegStateResult& dataRegResponse) {
+ return Void();
+}
+
+Return<void> RadioResponse::getOperatorResponse(
+ const RadioResponseInfo& info, const ::android::hardware::hidl_string& longName,
+ const ::android::hardware::hidl_string& shortName,
+ const ::android::hardware::hidl_string& numeric) {
+ return Void();
+}
+
+Return<void> RadioResponse::setRadioPowerResponse(const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::sendDtmfResponse(const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::sendSmsResponse(const RadioResponseInfo& info,
+ const SendSmsResult& sms) {
+ return Void();
+}
+
+Return<void> RadioResponse::sendSMSExpectMoreResponse(
+ const RadioResponseInfo& info, const SendSmsResult& sms) {
+ return Void();
+}
+
+Return<void> RadioResponse::setupDataCallResponse(
+ const RadioResponseInfo& info, const SetupDataCallResult& dcResponse) {
+ return Void();
+}
+
+Return<void> RadioResponse::iccIOForAppResponse(
+ const RadioResponseInfo& info, const IccIoResult& iccIo) {
+ return Void();
+}
+
+Return<void> RadioResponse::sendUssdResponse(const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::cancelPendingUssdResponse(const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::getClirResponse(const RadioResponseInfo& info, int32_t n, int32_t m) {
+ return Void();
+}
+
+Return<void> RadioResponse::setClirResponse(const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::getCallForwardStatusResponse(
+ const RadioResponseInfo& info, const ::android::hardware::hidl_vec<CallForwardInfo>&
+ callForwardInfos) {
+ return Void();
+}
+
+Return<void> RadioResponse::setCallForwardResponse(const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::getCallWaitingResponse(
+ const RadioResponseInfo& info, bool enable, int32_t serviceClass) {
+ return Void();
+}
+
+Return<void> RadioResponse::setCallWaitingResponse(const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::acknowledgeLastIncomingGsmSmsResponse(const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::acceptCallResponse(const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::deactivateDataCallResponse(const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::getFacilityLockForAppResponse(const RadioResponseInfo& info,
+ int32_t response) {
+ return Void();
+}
+
+Return<void> RadioResponse::setFacilityLockForAppResponse(const RadioResponseInfo& info,
+ int32_t retry) {
+ return Void();
+}
+
+Return<void> RadioResponse::setBarringPasswordResponse(const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::getNetworkSelectionModeResponse(
+ const RadioResponseInfo& info, bool manual) {
+ return Void();
+}
+
+Return<void> RadioResponse::setNetworkSelectionModeAutomaticResponse(
+ const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::setNetworkSelectionModeManualResponse(const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::getAvailableNetworksResponse(
+ const RadioResponseInfo& info,
+ const ::android::hardware::hidl_vec<OperatorInfo>& networkInfos) {
+ return Void();
+}
+
+Return<void> RadioResponse::startDtmfResponse(
+ const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::stopDtmfResponse(
+ const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::getBasebandVersionResponse(
+ const RadioResponseInfo& info, const ::android::hardware::hidl_string& version) {
+ return Void();
+}
+
+Return<void> RadioResponse::separateConnectionResponse(const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::setMuteResponse(const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::getMuteResponse(const RadioResponseInfo& info, bool enable) {
+ return Void();
+}
+
+Return<void> RadioResponse::getClipResponse(const RadioResponseInfo& info, ClipStatus status) {
+ return Void();
+}
+
+Return<void> RadioResponse::getDataCallListResponse(
+ const RadioResponseInfo& info,
+ const ::android::hardware::hidl_vec<SetupDataCallResult>& dcResponse) {
+ return Void();
+}
+
+Return<void> RadioResponse::sendOemRilRequestRawResponse(
+ const RadioResponseInfo& info,
+ const ::android::hardware::hidl_vec<uint8_t>& data) {
+ return Void();
+}
+
+Return<void> RadioResponse::sendOemRilRequestStringsResponse(
+ const RadioResponseInfo& info,
+ const ::android::hardware::hidl_vec<::android::hardware::hidl_string>& data) {
+ return Void();
+}
+
+Return<void> RadioResponse::sendScreenStateResponse(
+ const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::setSuppServiceNotificationsResponse(
+ const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::writeSmsToSimResponse(
+ const RadioResponseInfo& info, int32_t index) {
+ return Void();
+}
+
+Return<void> RadioResponse::deleteSmsOnSimResponse(
+ const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::setBandModeResponse(const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::getAvailableBandModesResponse(
+ const RadioResponseInfo& info,
+ const ::android::hardware::hidl_vec<RadioBandMode>& bandModes) {
+ return Void();
+}
+
+Return<void> RadioResponse::sendEnvelopeResponse(const RadioResponseInfo& info,
+ const ::android::hardware::hidl_string& commandResponse) {
+ return Void();
+}
+
+Return<void> RadioResponse::sendTerminalResponseToSimResponse(const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::handleStkCallSetupRequestFromSimResponse(
+ const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::explicitCallTransferResponse(const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::setPreferredNetworkTypeResponse(const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::getPreferredNetworkTypeResponse(
+ const RadioResponseInfo& info, PreferredNetworkType nw_type) {
+ return Void();
+}
+
+Return<void> RadioResponse::getNeighboringCidsResponse(
+ const RadioResponseInfo& info,
+ const ::android::hardware::hidl_vec<NeighboringCell>& cells) {
+ return Void();
+}
+
+Return<void> RadioResponse::setLocationUpdatesResponse(
+ const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::setCdmaSubscriptionSourceResponse(const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::setCdmaRoamingPreferenceResponse(const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::getCdmaRoamingPreferenceResponse(
+ const RadioResponseInfo& info, CdmaRoamingType type) {
+ return Void();
+}
+
+Return<void> RadioResponse::setTTYModeResponse(const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::getTTYModeResponse(const RadioResponseInfo& info, TtyMode mode) {
+ return Void();
+}
+
+Return<void> RadioResponse::setPreferredVoicePrivacyResponse(const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::getPreferredVoicePrivacyResponse(
+ const RadioResponseInfo& info, bool enable) {
+ return Void();
+}
+
+Return<void> RadioResponse::sendCDMAFeatureCodeResponse(const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::sendBurstDtmfResponse(const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::sendCdmaSmsResponse(
+ const RadioResponseInfo& info, const SendSmsResult& sms) {
+ return Void();
+}
+
+Return<void> RadioResponse::acknowledgeLastIncomingCdmaSmsResponse(
+ const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::getGsmBroadcastConfigResponse(
+ const RadioResponseInfo& info,
+ const ::android::hardware::hidl_vec<GsmBroadcastSmsConfigInfo>& configs) {
+ return Void();
+}
+
+Return<void> RadioResponse::setGsmBroadcastConfigResponse(const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::setGsmBroadcastActivationResponse(const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::getCdmaBroadcastConfigResponse(
+ const RadioResponseInfo& info,
+ const ::android::hardware::hidl_vec<CdmaBroadcastSmsConfigInfo>& configs) {
+ return Void();
+}
+
+Return<void> RadioResponse::setCdmaBroadcastConfigResponse(const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::setCdmaBroadcastActivationResponse(const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::getCDMASubscriptionResponse(
+ const RadioResponseInfo& info, const ::android::hardware::hidl_string& mdn,
+ const ::android::hardware::hidl_string& hSid, const ::android::hardware::hidl_string& hNid,
+ const ::android::hardware::hidl_string& min,
+ const ::android::hardware::hidl_string& prl) {
+ return Void();
+}
+
+Return<void> RadioResponse::writeSmsToRuimResponse(
+ const RadioResponseInfo& info, uint32_t index) {
+ return Void();
+}
+
+Return<void> RadioResponse::deleteSmsOnRuimResponse(
+ const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::getDeviceIdentityResponse(
+ const RadioResponseInfo& info, const ::android::hardware::hidl_string& imei,
+ const ::android::hardware::hidl_string& imeisv, const ::android::hardware::hidl_string& esn,
+ const ::android::hardware::hidl_string& meid) {
+ return Void();
+}
+
+Return<void> RadioResponse::exitEmergencyCallbackModeResponse(const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::getSmscAddressResponse(
+ const RadioResponseInfo& info, const ::android::hardware::hidl_string& smsc) {
+ return Void();
+}
+
+Return<void> RadioResponse::setSmscAddressResponse(const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::reportSmsMemoryStatusResponse(const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::reportStkServiceIsRunningResponse(const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::getCdmaSubscriptionSourceResponse(
+ const RadioResponseInfo& info, CdmaSubscriptionSource source) {
+ return Void();
+}
+
+Return<void> RadioResponse::requestIsimAuthenticationResponse(
+ const RadioResponseInfo& info, const ::android::hardware::hidl_string& response) {
+ return Void();
+}
+
+Return<void> RadioResponse::acknowledgeIncomingGsmSmsWithPduResponse(
+ const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::sendEnvelopeWithStatusResponse(
+ const RadioResponseInfo& info, const IccIoResult& iccIo) {
+ return Void();
+}
+
+Return<void> RadioResponse::getVoiceRadioTechnologyResponse(
+ const RadioResponseInfo& info, RadioTechnology rat) {
+ return Void();
+}
+
+Return<void> RadioResponse::getCellInfoListResponse(
+ const RadioResponseInfo& info, const ::android::hardware::hidl_vec<CellInfo>& cellInfo) {
+ return Void();
+}
+
+Return<void> RadioResponse::setCellInfoListRateResponse(const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::setInitialAttachApnResponse(const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::getImsRegistrationStateResponse(
+ const RadioResponseInfo& info, bool isRegistered, RadioTechnologyFamily ratFamily) {
+ return Void();
+}
+
+Return<void> RadioResponse::sendImsSmsResponse(
+ const RadioResponseInfo& info, const SendSmsResult& sms) {
+ return Void();
+}
+
+Return<void> RadioResponse::iccTransmitApduBasicChannelResponse(
+ const RadioResponseInfo& info, const IccIoResult& result) {
+ return Void();
+}
+
+Return<void> RadioResponse::iccOpenLogicalChannelResponse(
+ const RadioResponseInfo& info, int32_t channelId,
+ const ::android::hardware::hidl_vec<int8_t>& selectResponse) {
+ return Void();
+}
+
+Return<void> RadioResponse::iccCloseLogicalChannelResponse(const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::iccTransmitApduLogicalChannelResponse(
+ const RadioResponseInfo& info, const IccIoResult& result) {
+ return Void();
+}
+
+Return<void> RadioResponse::nvReadItemResponse(
+ const RadioResponseInfo& info, const ::android::hardware::hidl_string& result) {
+ return Void();
+}
+
+Return<void> RadioResponse::nvWriteItemResponse(const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::nvWriteCdmaPrlResponse(const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::nvResetConfigResponse(const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::setUiccSubscriptionResponse(const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::setDataAllowedResponse(const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::getHardwareConfigResponse(
+ const RadioResponseInfo& info,
+ const ::android::hardware::hidl_vec<HardwareConfig>& config) {
+ return Void();
+}
+
+Return<void> RadioResponse::requestIccSimAuthenticationResponse(
+ const RadioResponseInfo& info, const IccIoResult& result) {
+ return Void();
+}
+
+Return<void> RadioResponse::setDataProfileResponse(const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::requestShutdownResponse(const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::getRadioCapabilityResponse(
+ const RadioResponseInfo& info, const RadioCapability& rc) {
+ return Void();
+}
+
+Return<void> RadioResponse::setRadioCapabilityResponse(
+ const RadioResponseInfo& info, const RadioCapability& rc) {
+ return Void();
+}
+
+Return<void> RadioResponse::startLceServiceResponse(
+ const RadioResponseInfo& info, const LceStatusInfo& statusInfo) {
+ return Void();
+}
+
+Return<void> RadioResponse::stopLceServiceResponse(
+ const RadioResponseInfo& info, const LceStatusInfo& statusInfo) {
+ return Void();
+}
+
+Return<void> RadioResponse::pullLceDataResponse(
+ const RadioResponseInfo& info, const LceDataInfo& lceInfo) {
+ return Void();
+}
+
+Return<void> RadioResponse::getModemActivityInfoResponse(
+ const RadioResponseInfo& info, const ActivityStatsInfo& activityInfo) {
+ return Void();
+}
+
+Return<void> RadioResponse::setAllowedCarriersResponse(
+ const RadioResponseInfo& info, int32_t numAllowed) {
+ return Void();
+}
+
+Return<void> RadioResponse::getAllowedCarriersResponse(
+ const RadioResponseInfo& info, bool allAllowed, const CarrierRestrictions& carriers) {
+ return Void();
+}
+
+Return<void> RadioResponse::sendDeviceStateResponse(
+ const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::setIndicationFilterResponse(
+ const RadioResponseInfo& info) {
+ return Void();
+}
+
+Return<void> RadioResponse::acknowledgeRequest(int32_t serial) {
+ return Void();
+}
diff --git a/radio/1.0/vts/functional/vts/testcases/hal/radio/__init__.py b/radio/1.0/vts/functional/vts/testcases/hal/radio/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/radio/1.0/vts/functional/vts/testcases/hal/radio/__init__.py
+++ /dev/null
diff --git a/radio/1.0/vts/functional/vts/testcases/hal/radio/hidl/Android.mk b/radio/1.0/vts/functional/vts/testcases/hal/radio/hidl/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/radio/1.0/vts/functional/vts/testcases/hal/radio/hidl/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/radio/1.0/vts/functional/vts/testcases/hal/radio/hidl/__init__.py b/radio/1.0/vts/functional/vts/testcases/hal/radio/hidl/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/radio/1.0/vts/functional/vts/testcases/hal/radio/hidl/__init__.py
+++ /dev/null
diff --git a/radio/1.0/vts/functional/vts/testcases/hal/radio/hidl/host/Android.mk b/radio/1.0/vts/functional/vts/testcases/hal/radio/hidl/host/Android.mk
deleted file mode 100644
index 59f7c85..0000000
--- a/radio/1.0/vts/functional/vts/testcases/hal/radio/hidl/host/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := RadioHidlTest
-VTS_CONFIG_SRC_DIR := testcases/hal/radio/hidl/host
-include test/vts/tools/build/Android.host_config.mk
\ No newline at end of file
diff --git a/radio/1.0/vts/functional/vts/testcases/hal/radio/hidl/host/AndroidTest.xml b/radio/1.0/vts/functional/vts/testcases/hal/radio/hidl/host/AndroidTest.xml
deleted file mode 100644
index a826d20..0000000
--- a/radio/1.0/vts/functional/vts/testcases/hal/radio/hidl/host/AndroidTest.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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.
--->
-<configuration description="Config for VTS HAL Radio test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- <option name="cleanup" value="true" />
- <option name="push" value="spec/hardware/interfaces/radio/1.0/vts/Radio.vts->/data/local/tmp/spec/Radio.vts" />
- <option name="push" value="spec/hardware/interfaces/radio/1.0/vts/RadioIndication.vts->/data/local/tmp/spec/RadioIndication.vts" />
- <option name="push" value="spec/hardware/interfaces/radio/1.0/vts/RadioResponse.vts->/data/local/tmp/spec/RadioResponse.vts" />
- <option name="push" value="spec/hardware/interfaces/radio/1.0/vts/Sap.vts->/data/local/tmp/spec/Sap.vts" />
- <option name="push" value="spec/hardware/interfaces/radio/1.0/vts/SapCallback.vts->/data/local/tmp/spec/SapCallback.vts" />
- <option name="push" value="spec/hardware/interfaces/radio/1.0/vts/types.vts->/data/local/tmp/spec/types.vts" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="RadioHidlTest" />
- <option name="test-case-path" value="vts/testcases/hal/radio/hidl/host/RadioHidlTest" />
- </test>
-</configuration>
diff --git a/radio/1.0/vts/functional/vts/testcases/hal/radio/hidl/host/RadioHidlTest.py b/radio/1.0/vts/functional/vts/testcases/hal/radio/hidl/host/RadioHidlTest.py
deleted file mode 100644
index 33dac35..0000000
--- a/radio/1.0/vts/functional/vts/testcases/hal/radio/hidl/host/RadioHidlTest.py
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/usr/bin/env python3.4
-#
-# Copyright (C) 2016 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.
-#
-
-import logging
-import time
-
-from vts.runners.host import asserts
-from vts.runners.host import base_test_with_webdb
-from vts.runners.host import test_runner
-from vts.utils.python.controllers import android_device
-from vts.utils.python.profiling import profiling_utils
-
-
-class VehicleHidlTest(base_test_with_webdb.BaseTestWithWebDbClass):
- """A simple testcase for the VEHICLE HIDL HAL."""
-
- def setUpClass(self):
- """Creates a mirror and init vehicle hal."""
- self.dut = self.registerController(android_device)[0]
-
- self.dut.shell.InvokeTerminal("one")
- self.dut.shell.one.Execute("setenforce 0") # SELinux permissive mode
-
- if self.enable_profiling:
- profiling_utils.EnableVTSProfiling(self.dut.shell.one)
-
- self.dut.hal.InitHidlHal(
- target_type="radio",
- target_basepaths=self.dut.libPaths,
- target_version=1.0,
- target_package="android.hardware.radio",
- target_component_name="IRadio",
- hw_binder_service_name="Radio",
- bits=64 if self.dut.is64Bit else 32)
-
- self.radio = self.dut.hal.radio # shortcut
- self.radio_types = self.dut.hal.radio.GetHidlTypeInterface("types")
- logging.info("Radio types: %s", self.radio_types)
-
- def tearDownClass(self):
- """Disables the profiling.
-
- If profiling is enabled for the test, collect the profiling data
- and disable profiling after the test is done.
- """
- if self.enable_profiling:
- profiling_trace_path = getattr(
- self, self.VTS_PROFILING_TRACING_PATH, "")
- self.ProcessAndUploadTraceData(self.dut, profiling_trace_path)
- profiling_utils.DisableVTSProfiling(self.dut.shell.one)
-
- def testHelloWorld(self):
- logging.info('hello world')
-
-
-if __name__ == "__main__":
- test_runner.main()
diff --git a/radio/1.0/vts/functional/vts/testcases/hal/radio/hidl/host/__init__.py b/radio/1.0/vts/functional/vts/testcases/hal/radio/hidl/host/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/radio/1.0/vts/functional/vts/testcases/hal/radio/hidl/host/__init__.py
+++ /dev/null
diff --git a/radio/1.0/vts/types.vts b/radio/1.0/vts/types.vts
index c11db63..6d42016 100644
--- a/radio/1.0/vts/types.vts
+++ b/radio/1.0/vts/types.vts
@@ -1817,7 +1817,7 @@
}
attribute: {
- name: "::android::hardware::radio::V1_0::DataProfile"
+ name: "::android::hardware::radio::V1_0::DataProfileId"
type: TYPE_ENUM
enum_value: {
scalar_type: "int32_t"
@@ -1859,7 +1859,7 @@
enum_value: {
scalar_type: "int32_t"
- enumerator: "MEMORY_CAPAPCITY_EXCEEDED"
+ enumerator: "MEMORY_CAPACITY_EXCEEDED"
scalar_value: {
int32_t: 211
}
@@ -1913,7 +1913,7 @@
scalar_value: {
int32_t: 1
}
- enumerator: "UNKOWN"
+ enumerator: "UNKNOWN"
scalar_value: {
int32_t: 2
}
@@ -2406,7 +2406,7 @@
scalar_value: {
int32_t: 1
}
- enumerator: "FACORY_RESET"
+ enumerator: "FACTORY_RESET"
scalar_value: {
int32_t: 2
}
@@ -3551,6 +3551,138 @@
}
attribute: {
+ name: "::android::hardware::radio::V1_0::ApnTypes"
+ type: TYPE_ENUM
+ enum_value: {
+ scalar_type: "int32_t"
+
+ enumerator: "NONE"
+ scalar_value: {
+ int32_t: 0
+ }
+ enumerator: "DEFAULT"
+ scalar_value: {
+ int32_t: 1
+ }
+ enumerator: "MMS"
+ scalar_value: {
+ int32_t: 2
+ }
+ enumerator: "SUPL"
+ scalar_value: {
+ int32_t: 4
+ }
+ enumerator: "DUN"
+ scalar_value: {
+ int32_t: 8
+ }
+ enumerator: "HIPRI"
+ scalar_value: {
+ int32_t: 16
+ }
+ enumerator: "FOTA"
+ scalar_value: {
+ int32_t: 32
+ }
+ enumerator: "IMS"
+ scalar_value: {
+ int32_t: 64
+ }
+ enumerator: "CBS"
+ scalar_value: {
+ int32_t: 128
+ }
+ enumerator: "IA"
+ scalar_value: {
+ int32_t: 256
+ }
+ enumerator: "EMERGENCY"
+ scalar_value: {
+ int32_t: 512
+ }
+ enumerator: "ALL"
+ scalar_value: {
+ int32_t: 1023
+ }
+ }
+}
+
+attribute: {
+ name: "::android::hardware::radio::V1_0::IndicationFilter"
+ type: TYPE_ENUM
+ enum_value: {
+ scalar_type: "int32_t"
+
+ enumerator: "NONE"
+ scalar_value: {
+ int32_t: 0
+ }
+ enumerator: "SIGNAL_STRENGTH"
+ scalar_value: {
+ int32_t: 1
+ }
+ enumerator: "FULL_NETWORK_STATE"
+ scalar_value: {
+ int32_t: 2
+ }
+ enumerator: "DATA_CALL_DORMANCY_CHANGED"
+ scalar_value: {
+ int32_t: 4
+ }
+ enumerator: "ALL"
+ scalar_value: {
+ int32_t: 7
+ }
+ }
+}
+
+attribute: {
+ name: "::android::hardware::radio::V1_0::MvnoType"
+ type: TYPE_ENUM
+ enum_value: {
+ scalar_type: "int32_t"
+
+ enumerator: "NONE"
+ scalar_value: {
+ int32_t: 0
+ }
+ enumerator: "IMSI"
+ scalar_value: {
+ int32_t: 1
+ }
+ enumerator: "GID"
+ scalar_value: {
+ int32_t: 2
+ }
+ enumerator: "SPN"
+ scalar_value: {
+ int32_t: 3
+ }
+ }
+}
+
+attribute: {
+ name: "::android::hardware::radio::V1_0::DeviceStateType"
+ type: TYPE_ENUM
+ enum_value: {
+ scalar_type: "int32_t"
+
+ enumerator: "POWER_SAVE_MODE"
+ scalar_value: {
+ int32_t: 0
+ }
+ enumerator: "CHARGING_STATE"
+ scalar_value: {
+ int32_t: 1
+ }
+ enumerator: "LOW_DATA_EXPECTED"
+ scalar_value: {
+ int32_t: 2
+ }
+ }
+}
+
+attribute: {
name: "::android::hardware::radio::V1_0::RadioResponseInfo"
type: TYPE_STRUCT
struct_value: {
@@ -4528,7 +4660,7 @@
scalar_type: "int32_t"
}
struct_value: {
- name: "basestationId"
+ name: "baseStationId"
type: TYPE_SCALAR
scalar_type: "int32_t"
}
@@ -4956,8 +5088,8 @@
type: TYPE_STRUCT
struct_value: {
name: "profileId"
- type: TYPE_SCALAR
- scalar_type: "int32_t"
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::radio::V1_0::DataProfileId"
}
struct_value: {
name: "apn"
@@ -4968,6 +5100,10 @@
type: TYPE_STRING
}
struct_value: {
+ name: "roamingProtocol"
+ type: TYPE_STRING
+ }
+ struct_value: {
name: "authType"
type: TYPE_ENUM
predefined_type: "::android::hardware::radio::V1_0::ApnAuthType"
@@ -5005,6 +5141,32 @@
type: TYPE_SCALAR
scalar_type: "bool_t"
}
+ struct_value: {
+ name: "supportedApnTypesBitmap"
+ type: TYPE_MASK
+ scalar_type: "int32_t"
+ predefined_type: "::android::hardware::radio::V1_0::ApnTypes"
+ }
+ struct_value: {
+ name: "bearerBitmap"
+ type: TYPE_MASK
+ scalar_type: "int32_t"
+ predefined_type: "::android::hardware::radio::V1_0::RadioAccessFamily"
+ }
+ struct_value: {
+ name: "mtu"
+ type: TYPE_SCALAR
+ scalar_type: "int32_t"
+ }
+ struct_value: {
+ name: "mvnoType"
+ type: TYPE_ENUM
+ predefined_type: "::android::hardware::radio::V1_0::MvnoType"
+ }
+ struct_value: {
+ name: "mvnoMatchData"
+ type: TYPE_STRING
+ }
}
attribute: {
@@ -5022,7 +5184,8 @@
}
struct_value: {
name: "raf"
- type: TYPE_ENUM
+ type: TYPE_MASK
+ scalar_type: "int32_t"
predefined_type: "::android::hardware::radio::V1_0::RadioAccessFamily"
}
struct_value: {
@@ -5087,8 +5250,8 @@
struct_value: {
name: "txmModetimeMs"
type: TYPE_ARRAY
+ vector_size: 5
vector_value: {
- vector_size: 5
type: TYPE_SCALAR
scalar_type: "uint32_t"
}
@@ -5238,7 +5401,7 @@
predefined_type: "::android::hardware::radio::V1_0::CdmaSignalInfoRecord"
}
struct_value: {
- name: "numbertype"
+ name: "numberType"
type: TYPE_ENUM
predefined_type: "::android::hardware::radio::V1_0::CdmaCallWaitingNumberType"
}
@@ -5477,7 +5640,8 @@
}
struct_value: {
name: "serviceClass"
- type: TYPE_ENUM
+ type: TYPE_MASK
+ scalar_type: "int32_t"
predefined_type: "::android::hardware::radio::V1_0::SuppServiceClass"
}
struct_value: {
diff --git a/radio/Android.bp b/radio/Android.bp
index bbb3e4b..33f70eb 100644
--- a/radio/Android.bp
+++ b/radio/Android.bp
@@ -1,4 +1,5 @@
// This is an autogenerated file, do not edit.
subdirs = [
"1.0",
+ "1.0/vts/functional",
]
diff --git a/renderscript/1.0/Android.bp b/renderscript/1.0/Android.bp
new file mode 100644
index 0000000..5ae7027
--- /dev/null
+++ b/renderscript/1.0/Android.bp
@@ -0,0 +1,175 @@
+// This file is autogenerated by hidl-gen. Do not edit manually.
+
+genrule {
+ name: "android.hardware.renderscript@1.0_genc++",
+ tools: ["hidl-gen"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.renderscript@1.0",
+ srcs: [
+ "types.hal",
+ "IContext.hal",
+ "IDevice.hal",
+ ],
+ out: [
+ "android/hardware/renderscript/1.0/types.cpp",
+ "android/hardware/renderscript/1.0/ContextAll.cpp",
+ "android/hardware/renderscript/1.0/DeviceAll.cpp",
+ ],
+}
+
+genrule {
+ name: "android.hardware.renderscript@1.0_genc++_headers",
+ tools: ["hidl-gen"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.renderscript@1.0",
+ srcs: [
+ "types.hal",
+ "IContext.hal",
+ "IDevice.hal",
+ ],
+ out: [
+ "android/hardware/renderscript/1.0/types.h",
+ "android/hardware/renderscript/1.0/IContext.h",
+ "android/hardware/renderscript/1.0/IHwContext.h",
+ "android/hardware/renderscript/1.0/BnHwContext.h",
+ "android/hardware/renderscript/1.0/BpHwContext.h",
+ "android/hardware/renderscript/1.0/BsContext.h",
+ "android/hardware/renderscript/1.0/IDevice.h",
+ "android/hardware/renderscript/1.0/IHwDevice.h",
+ "android/hardware/renderscript/1.0/BnHwDevice.h",
+ "android/hardware/renderscript/1.0/BpHwDevice.h",
+ "android/hardware/renderscript/1.0/BsDevice.h",
+ ],
+}
+
+cc_library_shared {
+ name: "android.hardware.renderscript@1.0",
+ generated_sources: ["android.hardware.renderscript@1.0_genc++"],
+ generated_headers: ["android.hardware.renderscript@1.0_genc++_headers"],
+ export_generated_headers: ["android.hardware.renderscript@1.0_genc++_headers"],
+ shared_libs: [
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "liblog",
+ "libutils",
+ "libcutils",
+ "android.hidl.base@1.0",
+ ],
+ export_shared_lib_headers: [
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "libutils",
+ "android.hidl.base@1.0",
+ ],
+}
+
+genrule {
+ name: "android.hardware.renderscript.vts.driver@1.0_genc++",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.renderscript@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/renderscript/1.0/ $(genDir)/android/hardware/renderscript/1.0/",
+ srcs: [
+ "types.hal",
+ "IContext.hal",
+ "IDevice.hal",
+ ],
+ out: [
+ "android/hardware/renderscript/1.0/types.vts.cpp",
+ "android/hardware/renderscript/1.0/Context.vts.cpp",
+ "android/hardware/renderscript/1.0/Device.vts.cpp",
+ ],
+}
+
+genrule {
+ name: "android.hardware.renderscript.vts.driver@1.0_genc++_headers",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.renderscript@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/renderscript/1.0/ $(genDir)/android/hardware/renderscript/1.0/",
+ srcs: [
+ "types.hal",
+ "IContext.hal",
+ "IDevice.hal",
+ ],
+ out: [
+ "android/hardware/renderscript/1.0/types.vts.h",
+ "android/hardware/renderscript/1.0/Context.vts.h",
+ "android/hardware/renderscript/1.0/Device.vts.h",
+ ],
+}
+
+cc_library_shared {
+ name: "android.hardware.renderscript.vts.driver@1.0",
+ generated_sources: ["android.hardware.renderscript.vts.driver@1.0_genc++"],
+ generated_headers: ["android.hardware.renderscript.vts.driver@1.0_genc++_headers"],
+ export_generated_headers: ["android.hardware.renderscript.vts.driver@1.0_genc++_headers"],
+ shared_libs: [
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "liblog",
+ "libutils",
+ "libcutils",
+ "libvts_common",
+ "libvts_datatype",
+ "libvts_measurement",
+ "libvts_multidevice_proto",
+ "libcamera_metadata",
+ "libprotobuf-cpp-full",
+ "android.hidl.base@1.0",
+ "android.hardware.renderscript@1.0",
+ ],
+ export_shared_lib_headers: [
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "libutils",
+ "android.hidl.base@1.0",
+ ],
+}
+
+genrule {
+ name: "android.hardware.renderscript@1.0-vts.profiler_genc++",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.renderscript@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/renderscript/1.0/ $(genDir)/android/hardware/renderscript/1.0/",
+ srcs: [
+ "types.hal",
+ "IContext.hal",
+ "IDevice.hal",
+ ],
+ out: [
+ "android/hardware/renderscript/1.0/types.vts.cpp",
+ "android/hardware/renderscript/1.0/Context.vts.cpp",
+ "android/hardware/renderscript/1.0/Device.vts.cpp",
+ ],
+}
+
+genrule {
+ name: "android.hardware.renderscript@1.0-vts.profiler_genc++_headers",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.renderscript@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/renderscript/1.0/ $(genDir)/android/hardware/renderscript/1.0/",
+ srcs: [
+ "types.hal",
+ "IContext.hal",
+ "IDevice.hal",
+ ],
+ out: [
+ "android/hardware/renderscript/1.0/types.vts.h",
+ "android/hardware/renderscript/1.0/Context.vts.h",
+ "android/hardware/renderscript/1.0/Device.vts.h",
+ ],
+}
+
+cc_library_shared {
+ name: "android.hardware.renderscript@1.0-vts.profiler",
+ generated_sources: ["android.hardware.renderscript@1.0-vts.profiler_genc++"],
+ generated_headers: ["android.hardware.renderscript@1.0-vts.profiler_genc++_headers"],
+ export_generated_headers: ["android.hardware.renderscript@1.0-vts.profiler_genc++_headers"],
+ shared_libs: [
+ "libbase",
+ "libhidlbase",
+ "libhidltransport",
+ "libvts_profiling",
+ "libvts_multidevice_proto",
+ "libprotobuf-cpp-full",
+ "android.hidl.base@1.0",
+ "android.hardware.renderscript@1.0",
+ ],
+}
diff --git a/renderscript/1.0/Android.mk b/renderscript/1.0/Android.mk
new file mode 100644
index 0000000..3a7babd
--- /dev/null
+++ b/renderscript/1.0/Android.mk
@@ -0,0 +1,41 @@
+# This file is autogenerated by hidl-gen. Do not edit manually.
+
+LOCAL_PATH := $(call my-dir)
+
+################################################################################
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := android.hardware.renderscript@1.0-java-constants
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+
+intermediates := $(local-generated-sources-dir)
+
+HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
+#
+GEN := $(intermediates)/android/hardware/renderscript/V1_0/Constants.java
+$(GEN): $(HIDL)
+$(GEN): $(LOCAL_PATH)/types.hal
+$(GEN): $(LOCAL_PATH)/IContext.hal
+$(GEN): $(LOCAL_PATH)/IDevice.hal
+
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava-constants \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
+ android.hardware.renderscript@1.0
+
+$(GEN):
+ $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+# Avoid dependency cycle of framework.jar -> this-library -> framework.jar
+LOCAL_NO_STANDARD_LIBRARIES := true
+LOCAL_JAVA_LIBRARIES := core-oj
+
+include $(BUILD_STATIC_JAVA_LIBRARY)
+
+
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/renderscript/1.0/IContext.hal b/renderscript/1.0/IContext.hal
new file mode 100644
index 0000000..2e386d2
--- /dev/null
+++ b/renderscript/1.0/IContext.hal
@@ -0,0 +1,1177 @@
+/*
+ * Copyright (C) 2017 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.renderscript@1.0;
+
+import android.hardware.renderscript@1.0::types;
+
+// TODO: is there any way to keep this documentation in sync with the
+// corresponding Java doc?
+//
+// TODO: Some of the documentation was taken from Java docs, whereas others were
+// undocumented. Because of this, there's somewhat two different styles of
+// comments. Look into having a consistent convention.
+//
+// TODO: There was some confusion as to why some paramters use vec<> and others
+// use Ptr/Size. The convention is that vec<> is used whenever the paramter is
+// only an input parameter. HIDL is not supposed to include any output
+// parameters, so a more explicit Ptr/Size is used.
+
+interface IContext {
+
+ /*
+ * TODO: Do we need to define "selectors"? It may be a property of the
+ * "adapted allocation" that's returned.
+ *
+ * Creates an arbitrary window into the base allocation. The type describes
+ * the shape of the window. Any dimensions present in the type must be
+ * equal to or smaller than the dimensions in the source allocation. A
+ * dimension present in the allocation that is not present in the type must
+ * be constrained away with the selectors. If a dimension is present in
+ * both the type and allocation, one of two things must happen. If the type
+ * is smaller than the allocation, a window must be created, the selected
+ * value in the adapter for that dimension must act as the base address,
+ * and the type must describe the size of the view starting at that point.
+ * If the type and allocation dimension are of the same size, then setting
+ * the selector for the dimension must be an error.
+ *
+ * @param type Type describing data layout
+ * @param baseAlloc Allocation
+ * @return subAlloc AllocationAdapter
+ */
+ @callflow(next={"*"})
+ allocationAdapterCreate(Type type, Allocation baseAlloc)
+ generates (AllocationAdapter subAlloc);
+
+ /*
+ * TODO: Need to relate "offset" back to the terminology in
+ * allocationAdapterCreate() -- the latter uses the terms "selector" and
+ * "selected value". Can we use consistent terminology? Are "offset" and
+ * "selector" actually two different things?
+ *
+ * TODO: Explain the flattened layout in the offsets vec
+ *
+ * Sets the offsets for an Allocation Adapter.
+ *
+ * @param alloc AllocationAdapter
+ * @param offsets Collection of offsets
+ */
+ @callflow(next={"*"})
+ allocationAdapterOffset(AllocationAdapter alloc, vec<uint32_t> offsets);
+
+ /*
+ * TODO: add more explanation here.
+ *
+ * Returns the Type of the Allocation.
+ *
+ * @param allocation Allocation
+ * @return type Allocation's Type
+ */
+ @callflow(next={"*"})
+ allocationGetType(Allocation allocation) generates (Type type);
+
+ /*
+ * TODO: more clarification needed describing if the pointer can be aliased
+ * or if the data can outlive the allocation.
+ *
+ * Creates an Allocation for use by scripts with a given Type and a backing
+ * pointer. For use with ALLOCATION_USAGE_SHARED.
+ *
+ * @param type Type describing data layout
+ * @param mips AllocationMipmapControl specifies desired mipmap behavior for
+ * the allocation
+ * @param usage Bit field specifying how the Allocation is utilized
+ * @param ptr Pointer to client-side data
+ * @return allocation Created Allocation
+ */
+ @callflow(next={"*"})
+ allocationCreateTyped(Type type, AllocationMipmapControl mips,
+ bitfield<AllocationUsageType> usage, Ptr ptr)
+ generates (Allocation allocation);
+
+ /*
+ * Creates an Allocation from a Bitmap.
+ *
+ * @param type Type describing data layout
+ * @param mips AllocationMipmapControl specifies desired mipmap behavior for
+ * the allocation
+ * @param bitmap Bitmap source for the allocation data
+ * @param usage Bit field specifying how the Allocation is utilized
+ * @return allocation Created Allocation containing bitmap data
+ */
+ @callflow(next={"*"})
+ allocationCreateFromBitmap(Type type, AllocationMipmapControl mips,
+ vec<uint8_t> bitmap,
+ bitfield<AllocationUsageType> usage)
+ generates (Allocation allocation);
+
+ /*
+ * Creates a Cubemapped Allocation from a Bitmap.
+ *
+ * @param type Type describing data layout
+ * @param mips AllocationMipmapControl specifies desired mipmap behavior
+ * for the allocation
+ * @param bitmap Bitmap with cubemap faces layed out in the following
+ * format: right, left, top, bottom, front, back
+ * @param usage Bit field specifying how the Allocation is used
+ * @return allocation Created Allocation containing cubemap data
+ */
+ @callflow(next={"*"})
+ allocationCubeCreateFromBitmap(Type type, AllocationMipmapControl mips,
+ vec<uint8_t> bitmap,
+ bitfield<AllocationUsageType> usage)
+ generates (Allocation allocation);
+
+ /*
+ * Returns the handle to a raw buffer that is being managed by the screen
+ * compositor. This operation is only valid for Allocations with
+ * USAGE_IO_INPUT.
+ *
+ * @param allocation Allocation
+ * @return nativeWindow NativeWindow object associated with allocation
+ */
+ @callflow(next={"*"})
+ allocationGetNativeWindow(Allocation allocation)
+ generates (NativeWindow nativeWindow);
+
+ /*
+ * TODO: more clarification needed
+ *
+ * Sets the NativeWindow of an Allocation. This operation is only valid
+ * for Allocations with USAGE_IO_INPUT.
+ *
+ * @param allocation Allocation to be modified
+ * @pram nativeWindow NativeWindow to associate with allocation
+ */
+ @callflow(next={"*"})
+ allocationSetNativeWindow(Allocation allocation, NativeWindow nativewindow);
+
+ /*
+ * Initialize BufferQueue with specified max number of buffers.
+ *
+ * @param alloc Allocation
+ * @param numBuffer Maximum number of buffers
+ */
+ @callflow(next={"*"})
+ allocationSetupBufferQueue(Allocation alloc, uint32_t numBuffer);
+
+ /*
+ * TODO: clearly define baseAlloc vs subAlloc
+ *
+ * Shares the BufferQueue with another Allocation. Both must be
+ * USAGE_IO_INPUT Allocations.
+ *
+ * @param baseAlloc Base Allocation
+ * @param subAlloc Allocation to use the same buffer queue as the Base
+ * Allocation
+ */
+ @callflow(next={"*"})
+ allocationShareBufferQueue(Allocation baseAlloc, Allocation subAlloc);
+
+ /*
+ * Copies from the Allocation into a Bitmap. The bitmap must match the
+ * dimensions of the Allocation.
+ *
+ * HIDL is always running in Passthrough mode for RenderScript, so the
+ * buffer is modified directly by the driver.
+ *
+ * @param allocation Allocation
+ * @param data Buffer to be copied into
+ * @param sizeBytes Size of the buffer pointed to by "data"
+ */
+ @callflow(next={"*"})
+ allocationCopyToBitmap(Allocation allocation, Ptr data, Size sizeBytes);
+
+ /*
+ * TODO: should we consolidate all [123]DWrite functions or [123]DRead
+ * functions into the same API call? Our current plan is to be very similar
+ * to the dispatch table API. How much should we deviate from the original
+ * API?
+ * TODO: better description on Vec3/Vec4 and padding.
+ *
+ * Copies data into a 1D region of this Allocation.
+ *
+ * When this HAL entry is executed, all Vec3 elements have been explicitly
+ * padded as Vec4 elements.
+ *
+ * The size of the region is: count * Element's size.
+ *
+ * @param allocation Allocation to be modified
+ * @param offset The offset of the first element to be copied
+ * @param lod Selected mipmap level of detail
+ * @param count Number of elements to be copied
+ * @param data Source data to be copied to Allocation
+ */
+ @callflow(next={"*"})
+ allocation1DWrite(Allocation allocation, uint32_t offset, uint32_t lod,
+ uint32_t count, vec<uint8_t> data);
+
+ /*
+ * Copies a value into a single sub-Element of this Allocation.
+ *
+ * @param allocation Allocation to be updated
+ * @param x X position of the first element in the Allocation to be updated
+ * @param y Y position of the first element in the Allocation to be
+ * updated; for a 1D Allocation, this value must be 0
+ * @param z Z position of the first element in the Allocation to be
+ * updated; for a 1D or 2D Allocation, this value must be 0
+ * @param lod Selected mipmap level of detail
+ * @param data Data to be copied from
+ * @param compIdx Component number to identify which sub-Element is updated
+ */
+ @callflow(next={"*"})
+ allocationElementWrite(Allocation allocation, uint32_t x, uint32_t y,
+ uint32_t z, uint32_t lod, vec<uint8_t> data,
+ Size compIdx);
+
+ /*
+ * Copies from an array into a rectangular region in this Allocation.
+ *
+ * When this HAL entry is executed, all Vec3 elements have been explicitly
+ * padded as Vec4 elements.
+ *
+ * The size of the region is: w * h * Element's size.
+ *
+ * @param allocation Allocation to be modified
+ * @param xoff X offset of the region to update in this Allocation
+ * @param yoff Y offset of the region to update in this Allocation
+ * @param lod Selected mipmap level of detail
+ * @param face AllocationCubemapFace
+ * @param w Width of the region to update
+ * @param h Height of the region to update
+ * @param data Data to be placed into the Allocation
+ * @param stride For 1D Allocation, the stride must be the number of bytes
+ * of this Allocation. For 2D and 3D Allocations, the stride
+ * must be the stride in X dimension measuring in bytes.
+ */
+ @callflow(next={"*"})
+ allocation2DWrite(Allocation allocation, uint32_t xoff, uint32_t yoff,
+ uint32_t lod, AllocationCubemapFace face, uint32_t w,
+ uint32_t h, vec<uint8_t> data, Size stride);
+
+ /*
+ * Copies from an array into a 3D region in this Allocation.
+ *
+ * When this HAL entry is executed, all Vec3 elements have been explicitly
+ * padded as Vec4 elements.
+ *
+ * The size of the region is: w * h * d * Element's size.
+ *
+ * @param allocation Allocation to be modified
+ * @param xoff X offset of the region to update in this Allocation
+ * @param yoff Y offset of the region to update in this Allocation
+ * @param zoff Z offset of the region to update in this Allocation
+ * @param lod Selected mipmap level of detail
+ * @param w Width of the region to update
+ * @param h Height of the region to update
+ * @param d Depth of the region to update
+ * @param data Data to be placed in the Allocation
+ * @param stride For 1D Allocation, the stride must be the number of bytes
+ * of this Allocation. For 2D and 3D Allocations, the stride
+ * must be the stride in X dimension measuring in bytes.
+ */
+ @callflow(next={"*"})
+ allocation3DWrite(Allocation allocation, uint32_t xoff, uint32_t yoff,
+ uint32_t zoff, uint32_t lod, uint32_t w, uint32_t h,
+ uint32_t d, vec<uint8_t> data, Size stride);
+
+ /*
+ * Generates a mipmap chain. This is only valid if the Type of the
+ * Allocation includes mipmaps.
+ *
+ * This function generates a complete set of mipmaps from the top level
+ * LOD.
+ *
+ * If the Allocation is also using other memory spaces, a call to
+ * allocationSyncAll(context, allocation, usage) is required.
+ *
+ * @param allocation Allocation which has its top LOD read and lower LOD
+ * written to
+ */
+ @callflow(next={"*"})
+ allocationGenerateMipmaps(Allocation allocation);
+
+ /*
+ * Copies all of an Allocation's data into an array.
+ *
+ * All Vec3 elements of an Allocation are padded to be Vec4, so the data
+ * returned by this function automatically includes padding.
+ *
+ * HIDL is always running in Passthrough mode for RenderScript, so the
+ * buffer is modified directly by the driver.
+ *
+ * @param allocation Allocation to be read
+ * @param data Buffer to be copied into
+ * @param sizeBytes Size of the buffer pointed to by "data"
+ */
+ @callflow(next={"*"})
+ allocationRead(Allocation allocation, Ptr data, Size sizeBytes);
+
+ /*
+ * Copies a 1D region of this Allocation into an array.
+ *
+ * All Vec3 elements of an Allocation are padded to be Vec4, so the data
+ * returned by this function automatically includes padding.
+ *
+ * The size of the region is: count * Element's size.
+ *
+ * HIDL is always running in Passthrough mode for RenderScript, so the
+ * buffer is modified directly by the driver.
+ *
+ * @param allocation Allocation to be read
+ * @param xoff X offset of the first element to be copied
+ * @param lod Mipmap level of detail
+ * @param count The number of elements to be copied
+ * @param data Buffer to be copied into
+ * @param sizeBytes Size of the buffer pointed to by "data"
+ */
+ @callflow(next={"*"})
+ allocation1DRead(Allocation allocation, uint32_t xoff, uint32_t lod,
+ uint32_t count, Ptr data, Size sizeBytes);
+
+ /*
+ * Returns the value of a single sub-Element of this Allocation.
+ *
+ * HIDL is always running in Passthrough mode for RenderScript, so the
+ * buffer is modified directly by the driver.
+ *
+ * @param allocation Allocation to be read
+ * @param x X position of the first element in the Allocation to be read
+ * @param y Y position of the first element in the Allocation to be read
+ * @param z Z position of the first element in the Allocation to be read
+ * @param lod Mipmap level of detail
+ * @param data Buffer to be copied into
+ * @param sizeBytes Size of the buffer pointed to by "data"
+ * @param compIdx Component number to identify which sub-Element is updated
+ */
+ @callflow(next={"*"})
+ allocationElementRead(Allocation allocation, uint32_t x, uint32_t y,
+ uint32_t z, uint32_t lod, Ptr data, Size sizeBytes,
+ Size compIdx);
+
+ /*
+ * Copies from a rectangular region in this Allocation to an array.
+ *
+ * All Vec3 elements of an Allocation are padded to be Vec4, so the data
+ * returned by this function automatically includes padding.
+ *
+ * The size of the region is: w * h * Element's size.
+ *
+ * HIDL is always running in Passthrough mode for RenderScript, so the
+ * buffer is modified directly by the driver.
+ *
+ * @param allocation Allocation to be read
+ * @param xoff X offset of the region to copy in this array
+ * @param yoff Y offset of the region to copy in this array
+ * @param lod Mipmap level of detail
+ * @param face AllocationCubemapFace
+ * @param w Width of the region to copy
+ * @param h Height of the region to copy
+ * @param data Buffer to be copied into
+ * @param sizeBytes Size of the buffer pointed to by "data"
+ * @param stride For 1D Allocation, the stride must be the number of bytes
+ * of this Allocation. For 2D and 3D Allocations, the stride
+ * must be the stride in X dimension measuring in bytes.
+ */
+ @callflow(next={"*"})
+ allocation2DRead(Allocation allocation, uint32_t xoff, uint32_t yoff,
+ uint32_t lod, AllocationCubemapFace face, uint32_t w,
+ uint32_t h, Ptr data, Size sizeBytes, Size stride);
+
+ /*
+ * Copies from a rectangular cuboid region in this Allocation to an array.
+ *
+ * All Vec3 elements of an Allocation are padded to be Vec4, so the data
+ * returned by this function automatically includes padding.
+ *
+ * The size of the region is: w * h * d * Element's size.
+ *
+ * HIDL is always running in Passthrough mode for RenderScript, so the
+ * buffer is modified directly by the driver.
+ *
+ * @param allocation Allocation to be read
+ * @param xoff X offset of the region to copy in this array
+ * @param yoff Y offset of the region to copy in this array
+ * @param zoff Z offset of the region to copy in this array
+ * @param lod Mipmap level of detail
+ * @param w Width of the region to copy
+ * @param h Height of the region to copy
+ * @param d Depth of the region to copy
+ * @param data Buffer to be copied into
+ * @param sizeBytes Size of the buffer pointed to by "data"
+ * @param stride For 1D Allocation, the stride must be the number of bytes
+ * of this Allocation. For 2D and 3D Allocations, the stride
+ * must be the stride in X dimension measuring in bytes.
+ */
+ @callflow(next={"*"})
+ allocation3DRead(Allocation allocation, uint32_t xoff, uint32_t yoff,
+ uint32_t zoff, uint32_t lod, uint32_t w, uint32_t h,
+ uint32_t d, Ptr data, Size sizeBytes, Size stride);
+
+ /*
+ * Propagates changes from one usage of the Allocation to the other usages
+ * of the Allocation.
+ *
+ * @param allocation First usage of the Allocation
+ * @param usageType Allocation usage type
+ */
+ @callflow(next={"*"})
+ allocationSyncAll(Allocation allocation, AllocationUsageType usageType);
+
+ /*
+ * TODO: describe the functionality of resize1D better
+ * TODO: original Java Doc description seems to contradict itself ("with
+ * null contents and the region is otherwise undefined")
+ * TODO: should "new elements" be "new cells"?
+ * TODO: what does "objects are created" mean?
+ * TODO: what does "new dimension" mean? IS the type of the resized
+ * allocation different than the type before resizing?
+ *
+ * Resizes a 1D allocation. The contents of the allocation are preserved.
+ * If new elements are allocated, objects are created with null contents
+ * and the new region is otherwise undefined.
+ *
+ * If the new region is smaller, the references of any object outside the
+ * new region must be released.
+ *
+ * A new type must be created with the new dimension.
+ *
+ * @param allocation Allocation to be resized
+ * @param dimX New size along the x dimension of the Allocation
+ */
+ @callflow(next={"*"})
+ allocationResize1D(Allocation allocation, uint32_t dimX);
+
+ /*
+ * TODO: There are allocationCopy2DRange and 3DRange, but no 1DRange. Should
+ * the interface be cleaned up more?
+ *
+ * Copies a rectangular region from an Allocation into a rectangular region
+ * in this Allocation.
+ *
+ * @param dstAlloc Allocation to be updated
+ * @param dstXoff X offset of the region to update
+ * @param dstYoff Y offset of the region to update
+ * @param dstMip Selected mipmap level of the Allocation to update
+ * @param dstFace Destination AllocationCubemapFace
+ * @param width Width of the region to update
+ * @param height Height of the region to update
+ * @param srcAlloc Source Allocation, to be read
+ * @param srcXoff X offset of the region in the source Allocation
+ * @param srcYoff Y offset of the region in the source Allocation
+ * @param srcMip Selected mipmap level of the source Allocation
+ * @param srcFace Source AllocationCubemapFace
+ */
+ @callflow(next={"*"})
+ allocationCopy2DRange(Allocation dstAlloc, uint32_t dstXoff,
+ uint32_t dstYoff, uint32_t dstMip,
+ AllocationCubemapFace dstFace, uint32_t width,
+ uint32_t height, Allocation srcAlloc,
+ uint32_t srcXoff, uint32_t srcYoff, uint32_t srcMip,
+ AllocationCubemapFace srcFace);
+
+ /*
+ * Copies a rectangular cuboid region into the allocation from another
+ * Allocation.
+ *
+ * @param dstAlloc Allocation to be updated
+ * @param dstXoff X offset of the region to update
+ * @param dstYoff Y offset of the region to update
+ * @param dstZoff Z offset of the region to update
+ * @param dstMip Selected mipmap level of the Allocation to update
+ * @param width Width of the region to update
+ * @param height Height of the region to update
+ * @param depth Depth of the region to update
+ * @param srcAlloc Source Allocation, to be read
+ * @param srcXoff Source X offset of the region in the source Allocation
+ * @param srcYoff Source Y offset of the region in the source Allocation
+ * @param srcZoff Source Z offset of the region in the souce Allocation
+ * @param srcMip Selected mipmap level of the Allocation to read
+ */
+ @callflow(next={"*"})
+ allocationCopy3DRange(Allocation dstAlloc, uint32_t dstXoff,
+ uint32_t dstYoff, uint32_t dstZoff, uint32_t dstMip,
+ uint32_t width, uint32_t height, uint32_t depth,
+ Allocation srcAlloc, uint32_t srcXoff,
+ uint32_t srcYoff, uint32_t srcZoff, uint32_t srcMip);
+
+ /*
+ * TODO: define buffer and output stream
+ *
+ * Sends a buffer to the output stream. The contents of the Allocation may
+ * be undefined after this operation. This operation is only valid if
+ * USAGE_IO_OUTPUT is set on the Allocation.
+ *
+ * @param allocation Allocation to be sent
+ */
+ @callflow(next={"*"})
+ allocationIoSend(Allocation allocation);
+
+ /*
+ * Receives the latest input into the Allocation. This operation is only
+ * valid if USAGE_IO_INPUT is set on the Allocation, otherwise an error
+ * must be reported and no operations may be executed.
+ *
+ * @param allocation Allocation to be updated
+ */
+ @callflow(next={"*"})
+ allocationIoReceive(Allocation allocation);
+
+ /*
+ * TODO: describe default values for lod, face, and z better.
+ * TODO: what cases can invalidate the pointer? Resize? It should be
+ * clarified that this method should always return a valid pointer, but the
+ * returned pointer might become invalid later.
+ *
+ * Retrieves the pointer to the actual data an Allocation contains as well
+ * as the data's stride.
+ *
+ * If Allocation lacks the corresponding dimension for lod, face, or z, an
+ * error message must be sent to the message queue and nullptr must be
+ * returned for dataPtr and 0 for stride. All missing values must be 0 or
+ * NONE in the corresponding enum.
+ *
+ * @param allocation Allocation
+ * @param lod Mipmap level of detail
+ * @param face AllocationCubemapFace
+ * @param z Z position
+ * @return pointer Pointer to the server-side data; if this points to an
+ * invalid location in memory (because the buffer was
+ * freed), this may result in undefined behavior
+ * @return stride For 1D Allocation, the stride must be the number of bytes
+ * of this Allocation. For 2D and 3D Allocations, the stride
+ * must be the stride in X dimension measuring in bytes.
+ */
+ @callflow(next={"*"})
+ allocationGetPointer(Allocation allocation, uint32_t lod,
+ AllocationCubemapFace face, uint32_t z)
+ generates (Ptr dataPtr, Size stride);
+
+ /*
+ * Retrieves an Element's metadata from native code.
+ *
+ * @param element Element to be read
+ * @return elemData Element data
+ */
+ @callflow(next={"*"})
+ elementGetNativeMetadata(Element element)
+ generates (vec<uint32_t> elemData);
+
+ /*
+ * TODO: define Sub-Element handles better.
+ *
+ * Retrieves an Element's sub Elements, specifically their identifiers,
+ * names, and sizes.
+ *
+ * @param element Element to be read
+ * @param numSubElem Number of sub-Elements
+ * @return ids Sub-Element handles
+ * @return names Sub-Element Names
+ * @return arraySizes Sizes of sub-Element arrays
+ */
+ @callflow(next={"*"})
+ elementGetSubElements(Element element, Size numSubElem)
+ generates (vec<Element> ids, vec<string> names,
+ vec<Size> arraySizes);
+
+ /*
+ * TODO: can normalization flag be removed?
+ *
+ * Creates an Element.
+ *
+ * @param dt Data type
+ * @param dk Data kind
+ * @param norm Flag for normalization
+ * @param size Vector length, with scalar = 1
+ * @return element Created Element
+ */
+ @callflow(next={"*"})
+ elementCreate(DataType dt, DataKind dk, bool norm, uint32_t size)
+ generates (Element element);
+
+ /*
+ * Creates a complex Element.
+ *
+ * @param einsPtr Container of input Elements
+ * @param namesPtr Container of input names
+ * @param arraySizesPtr Container of array sizes
+ * @return element Created Element
+ */
+ @callflow(next={"*"})
+ elementComplexCreate(vec<Element> einsPtr, vec<string> names,
+ vec<Size> arraySizesPtr)
+ generates (Element element);
+
+ /*
+ * Retrives a Type's metadata from native code.
+ *
+ * @param type Type describing data layout
+ * @return metadata Type's native metadata
+ */
+ @callflow(next={"*"})
+ typeGetNativeMetadata(Type type) generates (vec<OpaqueHandle> metadata);
+
+ /*
+ * Creates a new Type.
+ *
+ * If Type is 1D, Y and Z must be 0. If Type is 2D, Z must be 0.
+ *
+ * @param element Element of the Type
+ * @param dimX X dimension
+ * @param dimY Y dimension
+ * @param dimZ Z dimension
+ * @param mipmaps Flag indicating whether Type has mipmaps
+ * @param faces Flag indicating whether Type has faces
+ * @param yuv Enumeration specifying which type of YUV format, if any, Type
+ * uses
+ * @return type Created Type
+ */
+ @callflow(next={"*"})
+ typeCreate(Element element, uint32_t dimX, uint32_t dimY, uint32_t dimZ,
+ bool mipmaps, bool faces, YuvFormat yuv)
+ generates (Type type);
+
+ /*
+ * Destroys provided RenderScript context, including all objects created in
+ * this context.
+ */
+ @exit
+ contextDestroy();
+
+ /*
+ * TODO: provide overview of messaging model and figure out if this should
+ * be part of HAL or not.
+ * TODO: what is the "client" for purposes of this interface?
+ * TODO: consider using send/receive to be more similar to other calls
+ * TODO: define the purpose of size more
+ *
+ * Fills the provided buffer with message data. "size" should be at least
+ * as large as the message size. Returns the MessageType and size of the
+ * message are returned.
+ *
+ * @param data A pointer to a buffer to be filled with a message
+ * @param size Size in bytes of the buffer pointed to by "data"
+ * @return messageType Type of message sent to the client
+ * @return receiveLen Length of the message in bytes
+ */
+ @callflow(next={"*"})
+ contextGetMessage(Ptr data, Size size)
+ generates (MessageToClientType messageType, Size receiveLen);
+
+ /*
+ * TODO: define subID better.
+ *
+ * Gets the metadata of a message to ensure entire message can be properly
+ * received. Can be used to determine size of data to allocate when calling
+ * contextGetMessage.
+ *
+ * @return messageType Type of message sent to the client
+ * @return receiveLen Length of message
+ * @return subID Message sub identifier
+ */
+ @callflow(next={"*"})
+ contextPeekMessage()
+ generates (MessageToClientType messageType, Size receiveLen,
+ uint32_t subID);
+
+ /*
+ * TODO: Define "previous commands" better
+ * TODO: Is the message identifier the same as subID?
+ *
+ * Places a message into the message queue to be sent back to the message
+ * handler once all previous commands have been executed. The message data
+ * is copied into the queue and can be discarded by the client after this
+ * call.
+ *
+ * @param id Message identifier
+ * @param data Message data
+ */
+ @callflow(next={"*"})
+ contextSendMessage(uint32_t id, vec<uint8_t> data);
+
+ /*
+ * TODO: Can this be done automatically as part of context creation? What
+ * happens if we perform message operations before doing this?
+ *
+ * Initializes the messaging thread, so that the front-end API can receive
+ * messages from the driver. This call also waits for the messaging FIFO to
+ * start up.
+ */
+ @callflow(next={"*"})
+ contextInitToClient();
+
+ /*
+ * TODO: Why doesn't this happen automatically as part of context
+ * destruction? What happens if the FIFO is not empty?
+ *
+ * Deinitializes a the messaging thread. Shuts down the FIFO.
+ */
+ @callflow(next={"*"})
+ contextDeinitToClient();
+
+ /*
+ * TODO: do we need to mark asynchronous operations in this interface
+ * definition?
+ *
+ * Waits for any pending asynchronous operations (such as copies to a RS
+ * allocation or RS script executions) to complete.
+ */
+ @callflow(next={"*"})
+ contextFinish();
+
+ /*
+ * Prints the currently available debugging information about the state of
+ * the RS context to the logcat.
+ */
+ @callflow(next={"*"})
+ contextLog();
+
+ /*
+ * TODO: full path? relative path? Investigate further.
+ *
+ * Sets the cache directory of the context.
+ *
+ * @param cacheDir Name of the application's cache directory
+ */
+ @callflow(next={"*"})
+ contextSetCacheDir(string cacheDir);
+
+ /*
+ * TODO: does this apply to the GPU as well?
+ *
+ * Changes the priority of the cpu worker threads for this context.
+ *
+ * @param priority Priority of the thread
+ */
+ @callflow(next={"*"})
+ contextSetPriority(ThreadPriorities priority);
+
+ /*
+ * TODO: does this need to be part of the HAL? What if the object already
+ * has a name?
+ *
+ * Assigns a name to a base object.
+ *
+ * @param obj Object to be named
+ * @param name Assigned name
+ */
+ @callflow(next={"*"})
+ assignName(ObjectBase obj, string name);
+
+ /*
+ * TODO: what if the object has no name?
+ *
+ * Returns the name of an object.
+ *
+ * @param obj Object to be read
+ * @return name Name of the object
+ */
+ @callflow(next={"*"})
+ getName(ObjectBase obj) generates (string name);
+
+ /*
+ * TODO: starting here we have a set of interfaces for use with
+ * ScriptGroups. At the very least we should indicate for each one that's
+ * what it's for. Should we include ScriptGroup in the interface names?
+ * TODO: sweep whole file and remove prefix "v" from all parameter names
+ * TODO: there are some places where we use Size for size, and others where
+ * we use int32_t. Is there a reason it's int32_t? In some cases, it
+ * requires a negative value.
+ *
+ * Creates a Closure which represents a function call to a ForEach Kernel
+ * combined with arguments and values for global variables.
+ *
+ * @param kernelID Kernel identifier
+ * @param returnValue Allocation used in output of Closure
+ * @param fieldIDS Collection of Script's Field identifiers
+ * @param values Collection of Script's data values
+ * @param sizes Collection of Script's data sizes
+ * @param depClosures Collection of Closures
+ * @param depFieldIDS Collection of Script's dependent Field identifiers
+ * @return closure Created Closure
+ */
+ @callflow(next={"*"})
+ closureCreate(ScriptKernelID kernelID, Allocation returnValue,
+ vec<ScriptFieldID> fieldIDS, vec<int64_t> values,
+ vec<int32_t> sizes, vec<Closure> depClosures,
+ vec<ScriptFieldID> depFieldIDS)
+ generates (Closure closure);
+
+ /*
+ * Creates a Closure which represents a function call to a invocable
+ * function, combined with arguments and values for global variables.
+ *
+ * @param invokeID Invokable function identifier
+ * @param params Collection of Invoke script parameters
+ * @param fieldIDS Collection of Script Field identifiers
+ * @param values Collection of values
+ * @param sizes Collection of sizes
+ * @return closure Created Closure
+ */
+ @callflow(next={"*"})
+ invokeClosureCreate(ScriptInvokeID invokeID, vec<uint8_t> params,
+ vec<ScriptFieldID> fieldIDS, vec<int64_t> values,
+ vec<int32_t> sizes)
+ generates (Closure closure);
+
+ /*
+ * Sets the argument of a Closure at specified index and size to provided
+ * value.
+ *
+ * @param closure Closure to be modified
+ * @param index Index
+ * @param value Value
+ * @param size Size
+ */
+ @callflow(next={"*"})
+ closureSetArg(Closure closure, uint32_t index, Ptr value, int32_t size);
+
+ /*
+ * Sets a global variable in a Closure.
+ *
+ * @param closure Closure
+ * @param fieldID Global's Field identifier
+ * @param value Value
+ * @param size Size
+ */
+ @callflow(next={"*"})
+ closureSetGlobal(Closure closure, ScriptFieldID fieldID, int64_t value,
+ int32_t size);
+
+ /*
+ * TODO: should slot be unsigned? (applies to other two ID interfaces, too)
+ *
+ * Creates a Script Kernel ID.
+ *
+ * @param script Script
+ * @param slot Slot
+ * @param sig Bitfield describing Kernel signature and operation
+ * @return scriptKernelID Script's Kernel identifier
+ */
+ @callflow(next={"*"})
+ scriptKernelIDCreate(Script script, int32_t slot,
+ bitfield<MetadataSignatureBitval> sig)
+ generates (ScriptKernelID scriptKernelID);
+
+ /*
+ * Creates a Script Invoke ID.
+ *
+ * @param script Script
+ * @param slot Slot
+ * @return scriptInvokeID Invoke Script's identifier
+ */
+ @callflow(next={"*"})
+ scriptInvokeIDCreate(Script script, int32_t slot)
+ generates (ScriptInvokeID scriptInvokeID);
+
+ /*
+ * TODO: describe the return value better. What is it?
+ *
+ * Creates a Script Field ID.
+ *
+ * @param script Script
+ * @param slot Slot
+ * @return scriptFieldID Script's Field identifier
+ */
+ @callflow(next={"*"})
+ scriptFieldIDCreate(Script script, int32_t slot)
+ generates (ScriptFieldID scriptFieldID);
+
+ /*
+ * TODO: add more description
+ *
+ * Creates a Script Group.
+ *
+ * @param kernels Collection of Scripts' Kernel identifiers
+ * @param srcK Source Kernel identifiers
+ * @param dstK Destination Kernel identifiers
+ * @param dstF Destination Script Field identifiers
+ * @param types Collection of Types describing data layout
+ * @return scriptGroup Created Script Group
+ */
+ @callflow(next={"*"})
+ scriptGroupCreate(vec<ScriptKernelID> kernels, vec<ScriptKernelID> srcK,
+ vec<ScriptKernelID> dstK, vec<ScriptFieldID> dstF,
+ vec<Type> types)
+ generates (ScriptGroup scriptGroup);
+
+ /*
+ * Creates a Script Group.
+ *
+ * @param name Name
+ * @param cacheDir Cache directory
+ * @param closures Collection of Closures
+ * @return scriptGroup2 Created Script Group
+ */
+ @callflow(next={"*"})
+ scriptGroup2Create(string name, string cacheDir, vec<Closure> closures)
+ generates (ScriptGroup2 scriptGroup2);
+
+ /*
+ * TODO: if SetInput/Output corresponds to the Java API setInput() and
+ * setOutput(), which are documented as deprecated in API 23, do we need to
+ * support them? Or can we fallback to the CPU when they're used? Or can't
+ * we tell whether they're used early enough to do fallback?
+ *
+ * Sets an output of the ScriptGroup. This specifies an Allocation to be
+ * used for the kernels that require an output Allocation visible after the
+ * ScriptGroup is executed.
+ *
+ * @param sg Script Group
+ * @param kid Script's Kernel identifier to be changed
+ * @param alloc Allocation to be filled by output
+ */
+ @callflow(next={"*"})
+ scriptGroupSetOutput(ScriptGroup sg, ScriptKernelID kid, Allocation alloc);
+
+ /*
+ * Sets an input of the Script Group. This specifies an Allocation to be
+ * used for kernels that require an input Allocation provided from outside
+ * of the Script Group.
+ *
+ * @param sg Script Group
+ * @param kid Script's Kernel identifier to be changed
+ * @param alloc Allocation to be read as input
+ */
+ @callflow(next={"*"})
+ scriptGroupSetInput(ScriptGroup sg, ScriptKernelID kid, Allocation alloc);
+
+ /*
+ * Executes a Script Group.
+ *
+ * @param sg Script Group to be executed.
+ */
+ @callflow(next={"*"})
+ scriptGroupExecute( ScriptGroup sg);
+
+ /*
+ * Frees any native resources associated with this object. The primary use
+ * is to force immediate cleanup of resources when it is believed the GC
+ * may not respond quickly enough.
+ *
+ * @param handle Opaque handle to the server-side object to be destroyed
+ */
+ @callflow(next={"*"})
+ objDestroy(ObjectBase obj);
+
+ /*
+ * Creates a Sampler.
+ *
+ * @param magFilter Magnification value for the filter
+ * @param minFilter Minification value for the filter
+ * @param wrapS S wrapping mode for the sampler
+ * @param wrapT T wrapping mode for the sampler
+ * @param wrapR R wrapping mode for the sampler
+ * @param aniso Anisotropy setting for the sampler
+ * @return sampler Created Sampler
+ */
+ @callflow(next={"*"})
+ samplerCreate(SamplerValue magFilter, SamplerValue minFilter,
+ SamplerValue wrapS, SamplerValue wrapT, SamplerValue wrapR,
+ float aniso)
+ generates (Sampler sampler);
+
+ /*
+ * Binds an Allocation to a global pointer in the Script.
+ *
+ * @param script Script to be bound to
+ * @param allocation Allocation to be bound
+ * @param slot Slot of a global variable
+ */
+ @callflow(next={"*"})
+ scriptBindAllocation(Script script, Allocation allocation, uint32_t slot);
+
+ /*
+ * TODO: is this necessary?
+ *
+ * Sets the timezone of a Script.
+ *
+ * @param script Script to be altered
+ * @param timeZone Time Zone value as text
+ */
+ @callflow(next={"*"})
+ scriptSetTimeZone(Script script, string timeZone);
+
+ /*
+ * TODO: can scriptInvoke be combined with scriptInvokeV?
+ *
+ * Launches an invokable function.
+ *
+ * @param vs Script to be invoked
+ * @param slot Slot of invokable function
+ */
+ @callflow(next={"*"})
+ scriptInvoke(Script vs, uint32_t slot);
+
+ /*
+ * Invokes a Script with values.
+ *
+ * @param vs Script to be invoked
+ * @param slot Slot
+ * @param data Data buffer of packed arguments
+ */
+ @callflow(next={"*"})
+ scriptInvokeV(Script vs, uint32_t slot, vec<uint8_t> data);
+
+ /*
+ * TODO: add documentation for params
+ * TODO: Should we rename "ScriptCall" to "LaunchOptions"?
+ *
+ * Launches a ForEach kernel.
+ *
+ * @param vs Script
+ * @param slot Slot of ForEach Kernel
+ * @param vains Collection of input Allocations or null
+ * @param vaout Output Allocation or null
+ * @param params Collection of parameters
+ * @param sc Pointer to a ScriptCall, nullptr if unused
+ */
+ @callflow(next={"*"})
+ scriptForEach(Script vs, uint32_t slot, vec<Allocation> vains,
+ Allocation vaout, vec<uint8_t> params, Ptr sc);
+
+ /*
+ * Launches a Reduction kernel.
+ *
+ * @param vs Script
+ * @param slot Slot of Reduction Kernel
+ * @param vains Collection of input Allocations
+ * @param vaout Output Allocation
+ * @param sc Pointer to a ScriptCall, nullptr if unused
+ */
+ @callflow(next={"*"})
+ scriptReduce(Script vs, uint32_t slot, vec<Allocation> vains,
+ Allocation vaout, Ptr sc);
+
+ /*
+ * Sets a Script's integer variable to a value.
+ *
+ * @param vs RenderScript Script
+ * @param slot Slot number of variable to be updated
+ * @param value Value to be pushed to variable
+ */
+ @callflow(next={"*"})
+ scriptSetVarI(Script vs, uint32_t slot, int32_t value);
+
+ /*
+ * Sets a Script's Object variable to a value
+ *
+ * @param vs RenderScript Script
+ * @param slot Slot number of variable to be updated
+ * @param obj ObjectBase
+ */
+ @callflow(next={"*"})
+ scriptSetVarObj( Script vs, uint32_t slot, ObjectBase obj);
+
+ /*
+ * Sets a Script's long variable to a value.
+ *
+ * @param vs RenderScript Script
+ * @param slot Slot number of variable to be updated
+ * @param value Value to be pushed to variable
+ */
+ @callflow(next={"*"})
+ scriptSetVarJ(Script vs, uint32_t slot, int64_t value);
+
+ /*
+ * Sets a Script's float variable to a value.
+ *
+ * @param vs RenderScript Script
+ * @param slot Slot number of variable to be updated
+ * @param value Value to be pushed to variable
+ */
+ @callflow(next={"*"})
+ scriptSetVarF(Script vs, uint32_t slot, float value);
+
+ /*
+ * Sets a Script's double variable to a value.
+ *
+ * @param vs RenderScript Script
+ * @param slot Slot number of variable to be updated
+ * @param value Value to be pushed to variable
+ */
+ @callflow(next={"*"})
+ scriptSetVarD(Script vs, uint32_t slot, double value);
+
+ /*
+ * Sets a Script's struct variable to a value.
+ *
+ * @param vs RenderScript Script
+ * @param slot Slot number of variable to be updated
+ * @param data Data to be pushed to variable
+ */
+ @callflow(next={"*"})
+ scriptSetVarV(Script vs, uint32_t slot, vec<uint8_t> data);
+
+ /*
+ * TODO: Why do we have typed setters but only untyped getter?
+ *
+ * Retrieves the value from a global variable in a script.
+ *
+ * @param vs RenderScript Script
+ * @param slot Slot number of variable to be read
+ * @param len Size of data to be filled
+ * @return data Data to be updated
+ */
+ @callflow(next={"*"})
+ scriptGetVarV(Script vs, uint32_t slot, Size len)
+ generates (vec<uint8_t> data);
+
+ /*
+ * TODO: Is this a value to be replicated for each member of the array? Or
+ * is there a representation for each separate member?
+ *
+ * Sets the value of a global array of structs, given the Element and
+ * dimension.
+ *
+ * @param vs RenderScript Script
+ * @param slot Slot number of variable to be updated
+ * @param data Data
+ * @param ve Element
+ * @param dims Collection of dimensions
+ */
+ @callflow(next={"*"})
+ scriptSetVarVE(Script vs, uint32_t slot, vec<uint8_t> data, Element ve,
+ vec<uint32_t> dims);
+
+ /*
+ * TODO: is cacheDir redundant with createCache() function? Can we remove
+ * it?
+ * TODO: define resName more clearly
+ *
+ * Creates a RenderScript C99 kernel script.
+ *
+ * @param resName Resource name of the bitcode
+ * @param cacheDir Cache directory name
+ * @param text The kernel's bitcode as a uint8_t vector
+ * @return script Created Script
+ */
+ @callflow(next={"*"})
+ scriptCCreate(string resName, string cacheDir, vec<uint8_t> text)
+ generates (Script script);
+
+ /*
+ * Creates a RenderScript Intrinsic script.
+ *
+ * @param id Intrinsic Script identifier
+ * @param elem Element
+ * @return script Created Script
+ */
+ @callflow(next={"*"})
+ scriptIntrinsicCreate(ScriptIntrinsicID id, Element elem)
+ generates (Script script);
+
+};
diff --git a/renderscript/1.0/IDevice.hal b/renderscript/1.0/IDevice.hal
new file mode 100644
index 0000000..7b1b866
--- /dev/null
+++ b/renderscript/1.0/IDevice.hal
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2017 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.renderscript@1.0;
+
+import android.hardware.renderscript@1.0::types;
+import IContext;
+
+interface IDevice {
+
+ /*
+ * Creates a RenderScript context.
+ *
+ * @param sdkVersion Target RS API level
+ * @param ct Context type
+ * @param flags Optional flags for this context
+ * @return context Created context
+ */
+ @entry
+ @callflow(next={"*"})
+ contextCreate(uint32_t sdkVersion, ContextType ct,
+ bitfield<ContextFlags> flags)
+ generates (IContext context);
+
+};
diff --git a/renderscript/1.0/default/Android.bp b/renderscript/1.0/default/Android.bp
new file mode 100644
index 0000000..348f6af
--- /dev/null
+++ b/renderscript/1.0/default/Android.bp
@@ -0,0 +1,22 @@
+cc_library_shared {
+ name: "android.hardware.renderscript@1.0-impl",
+ relative_install_path: "hw",
+ proprietary: true,
+ srcs: [
+ "Context.cpp",
+ "Device.cpp",
+ ],
+ include_dirs: [
+ "frameworks/rs",
+ ],
+ shared_libs: [
+ "libdl",
+ "liblog",
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "libutils",
+ "android.hardware.renderscript@1.0",
+ "android.hidl.base@1.0",
+ ],
+}
diff --git a/renderscript/1.0/default/Context.cpp b/renderscript/1.0/default/Context.cpp
new file mode 100644
index 0000000..5a09cf9
--- /dev/null
+++ b/renderscript/1.0/default/Context.cpp
@@ -0,0 +1,757 @@
+#define LOG_TAG "android.hardware.renderscript@1.0-impl"
+
+#include "Context.h"
+#include "Device.h"
+
+namespace android {
+namespace hardware {
+namespace renderscript {
+namespace V1_0 {
+namespace implementation {
+
+
+Context::Context(uint32_t sdkVersion, ContextType ct, int32_t flags) {
+ RsDevice _dev = nullptr;
+ uint32_t _version = 0;
+ uint32_t _sdkVersion = sdkVersion;
+ RsContextType _ct = static_cast<RsContextType>(ct);
+ int32_t _flags = flags;
+ mContext = Device::getHal().ContextCreate(_dev, _version, _sdkVersion, _ct, _flags);
+}
+
+
+// Helper functions
+template<typename ReturnType>
+static ReturnType hidl_to_rs(OpaqueHandle src) {
+ return reinterpret_cast<ReturnType>(static_cast<uintptr_t>(src));
+}
+
+template<typename ReturnType, typename SourceType>
+static ReturnType hidl_to_rs(SourceType* src) {
+ return reinterpret_cast<ReturnType>(src);
+}
+
+template<typename RsType, typename HidlType, typename Operation>
+static std::vector<RsType> hidl_to_rs(const hidl_vec<HidlType>& src, Operation operation) {
+ std::vector<RsType> dst(src.size());
+ std::transform(src.begin(), src.end(), dst.begin(), operation);
+ return dst;
+}
+
+template<typename ReturnType, typename SourceType>
+static ReturnType rs_to_hidl(SourceType* src) {
+ return static_cast<ReturnType>(reinterpret_cast<uintptr_t>(src));
+}
+
+template<typename HidlType, typename RsType, typename Operation>
+static hidl_vec<HidlType> rs_to_hidl(const std::vector<RsType>& src, Operation operation) {
+ std::vector<HidlType> dst(src.size());
+ std::transform(src.begin(), src.end(), dst.begin(), operation);
+ return dst;
+}
+
+
+// Methods from ::android::hardware::renderscript::V1_0::IContext follow.
+
+Return<Allocation> Context::allocationAdapterCreate(Type type, Allocation baseAlloc) {
+ RsType _type = hidl_to_rs<RsType>(type);
+ RsAllocation _baseAlloc = hidl_to_rs<RsAllocation>(baseAlloc);
+ RsAllocation _subAlloc = Device::getHal().AllocationAdapterCreate(mContext, _type, _baseAlloc);
+ return rs_to_hidl<Allocation>(_subAlloc);
+}
+
+Return<void> Context::allocationAdapterOffset(Allocation alloc, const hidl_vec<uint32_t>& offsets) {
+ RsAllocation _alloc = hidl_to_rs<RsAllocation>(alloc);
+ const hidl_vec<uint32_t>& _offsets = offsets;
+ Device::getHal().AllocationAdapterOffset(mContext, _alloc, _offsets.data(), _offsets.size());
+ return Void();
+}
+
+Return<Type> Context::allocationGetType(Allocation allocation) {
+ RsAllocation _allocation = hidl_to_rs<RsAllocation>(allocation);
+ const void* _type = Device::getHal().AllocationGetType(mContext, _allocation);
+ return rs_to_hidl<Type>(_type);
+}
+
+Return<Allocation> Context::allocationCreateTyped(Type type, AllocationMipmapControl mips, int32_t usage, Ptr ptr) {
+ RsType _type = hidl_to_rs<RsType>(type);
+ RsAllocationMipmapControl _mips = static_cast<RsAllocationMipmapControl>(mips);
+ uint32_t _usage = usage;
+ uintptr_t _ptr = hidl_to_rs<uintptr_t>(ptr);
+ RsAllocation _allocation = Device::getHal().AllocationCreateTyped(mContext, _type, _mips, _usage, _ptr);
+ return rs_to_hidl<Allocation>(_allocation);
+}
+
+Return<Allocation> Context::allocationCreateFromBitmap(Type type, AllocationMipmapControl mips, const hidl_vec<uint8_t>& bitmap, int32_t usage) {
+ RsType _type = hidl_to_rs<RsType>(type);
+ RsAllocationMipmapControl _mips = static_cast<RsAllocationMipmapControl>(mips);
+ const hidl_vec<uint8_t>& _bitmap = bitmap;
+ uint32_t _usage = usage;
+ RsAllocation _allocation = Device::getHal().AllocationCreateFromBitmap(mContext, _type, _mips, _bitmap.data(), _bitmap.size(), _usage);
+ return rs_to_hidl<Allocation>(_allocation);
+}
+
+Return<Allocation> Context::allocationCubeCreateFromBitmap(Type type, AllocationMipmapControl mips, const hidl_vec<uint8_t>& bitmap, int32_t usage) {
+ RsType _type = hidl_to_rs<RsType>(type);
+ RsAllocationMipmapControl _mips = static_cast<RsAllocationMipmapControl>(mips);
+ const hidl_vec<uint8_t>& _bitmap = bitmap;
+ uint32_t _usage = usage;
+ RsAllocation _allocation = Device::getHal().AllocationCubeCreateFromBitmap(mContext, _type, _mips, _bitmap.data(), _bitmap.size(), _usage);
+ return rs_to_hidl<Allocation>(_allocation);
+}
+
+Return<NativeWindow> Context::allocationGetNativeWindow(Allocation allocation) {
+ RsAllocation _allocation = hidl_to_rs<RsAllocation>(allocation);
+ RsNativeWindow _nativeWindow = Device::getHal().AllocationGetSurface(mContext, _allocation);
+ return rs_to_hidl<NativeWindow>(_nativeWindow);
+}
+
+Return<void> Context::allocationSetNativeWindow(Allocation allocation, NativeWindow nativewindow) {
+ RsAllocation _allocation = hidl_to_rs<RsAllocation>(allocation);
+ RsNativeWindow _nativewindow = hidl_to_rs<RsNativeWindow>(nativewindow);
+ Device::getHal().AllocationSetSurface(mContext, _allocation, _nativewindow);
+ return Void();
+}
+
+Return<void> Context::allocationSetupBufferQueue(Allocation alloc, uint32_t numBuffer) {
+ RsAllocation _alloc = hidl_to_rs<RsAllocation>(alloc);
+ uint32_t _numBuffer = numBuffer;
+ Device::getHal().AllocationSetupBufferQueue(mContext, _alloc, _numBuffer);
+ return Void();
+}
+
+Return<void> Context::allocationShareBufferQueue(Allocation baseAlloc, Allocation subAlloc) {
+ RsAllocation _baseAlloc = hidl_to_rs<RsAllocation>(baseAlloc);
+ RsAllocation _subAlloc = hidl_to_rs<RsAllocation>(subAlloc);
+ Device::getHal().AllocationShareBufferQueue(mContext, _baseAlloc, _subAlloc);
+ return Void();
+}
+
+Return<void> Context::allocationCopyToBitmap(Allocation allocation, Ptr data, Size sizeBytes) {
+ RsAllocation _allocation = hidl_to_rs<RsAllocation>(allocation);
+ void* _data = hidl_to_rs<void*>(data);
+ size_t _sizeBytes = static_cast<size_t>(sizeBytes);
+ Device::getHal().AllocationCopyToBitmap(mContext, _allocation, _data, _sizeBytes);
+ return Void();
+}
+
+Return<void> Context::allocation1DWrite(Allocation allocation, uint32_t offset, uint32_t lod, uint32_t count, const hidl_vec<uint8_t>& data) {
+ RsAllocation _allocation = hidl_to_rs<RsAllocation>(allocation);
+ uint32_t _offset = offset;
+ uint32_t _lod = lod;
+ uint32_t _count = count;
+ const void* _dataPtr = hidl_to_rs<const void*>(data.data());
+ size_t _sizeBytes = data.size();
+ Device::getHal().Allocation1DData(mContext, _allocation, _offset, _lod, _count, _dataPtr, _sizeBytes);
+ return Void();
+}
+
+Return<void> Context::allocationElementWrite(Allocation allocation, uint32_t x, uint32_t y, uint32_t z, uint32_t lod, const hidl_vec<uint8_t>& data, Size compIdx) {
+ RsAllocation _allocation = hidl_to_rs<RsAllocation>(allocation);
+ uint32_t _x = x;
+ uint32_t _y = y;
+ uint32_t _z = z;
+ uint32_t _lod = lod;
+ const void* _dataPtr = hidl_to_rs<const void*>(data.data());
+ size_t _sizeBytes = data.size();
+ size_t _compIdx = static_cast<size_t>(compIdx);
+ Device::getHal().AllocationElementData(mContext, _allocation, _x, _y, _z, _lod, _dataPtr, _sizeBytes, _compIdx);
+ return Void();
+}
+
+Return<void> Context::allocation2DWrite(Allocation allocation, uint32_t xoff, uint32_t yoff, uint32_t lod, AllocationCubemapFace face, uint32_t w, uint32_t h, const hidl_vec<uint8_t>& data, Size stride) {
+ RsAllocation _allocation = hidl_to_rs<RsAllocation>(allocation);
+ uint32_t _xoff = xoff;
+ uint32_t _yoff = yoff;
+ uint32_t _lod = lod;
+ RsAllocationCubemapFace _face = static_cast<RsAllocationCubemapFace>(face);
+ uint32_t _w = w;
+ uint32_t _h = h;
+ const void* _dataPtr = hidl_to_rs<const void*>(data.data());
+ size_t _sizeBytes = data.size();
+ size_t _stride = static_cast<size_t>(stride);
+ Device::getHal().Allocation2DData(mContext, _allocation, _xoff, _yoff, _lod, _face, _w, _h, _dataPtr, _sizeBytes, _stride);
+ return Void();
+}
+
+Return<void> Context::allocation3DWrite(Allocation allocation, uint32_t xoff, uint32_t yoff, uint32_t zoff, uint32_t lod, uint32_t w, uint32_t h, uint32_t d, const hidl_vec<uint8_t>& data, Size stride) {
+ RsAllocation _allocation = hidl_to_rs<RsAllocation>(allocation);
+ uint32_t _xoff = xoff;
+ uint32_t _yoff = yoff;
+ uint32_t _zoff = zoff;
+ uint32_t _lod = lod;
+ uint32_t _w = w;
+ uint32_t _h = h;
+ uint32_t _d = d;
+ const void* _dataPtr = hidl_to_rs<const void*>(data.data());
+ size_t _sizeBytes = data.size();
+ size_t _stride = static_cast<size_t>(stride);
+ Device::getHal().Allocation3DData(mContext, _allocation, _xoff, _yoff, _zoff, _lod, _w, _h, _d, _dataPtr, _sizeBytes, _stride);
+ return Void();
+}
+
+Return<void> Context::allocationGenerateMipmaps(Allocation allocation) {
+ RsAllocation _allocation = hidl_to_rs<RsAllocation>(allocation);
+ Device::getHal().AllocationGenerateMipmaps(mContext, _allocation);
+ return Void();
+}
+
+Return<void> Context::allocationRead(Allocation allocation, Ptr data, Size sizeBytes) {
+ RsAllocation _allocation = hidl_to_rs<RsAllocation>(allocation);
+ void* _data = hidl_to_rs<void*>(data);
+ size_t _sizeBytes = static_cast<size_t>(sizeBytes);
+ Device::getHal().AllocationRead(mContext, _allocation, _data, _sizeBytes);
+ return Void();
+}
+
+Return<void> Context::allocation1DRead(Allocation allocation, uint32_t xoff, uint32_t lod, uint32_t count, Ptr data, Size sizeBytes) {
+ RsAllocation _allocation = hidl_to_rs<RsAllocation>(allocation);
+ uint32_t _xoff = xoff;
+ uint32_t _lod = lod;
+ uint32_t _count = count;
+ void* _data = hidl_to_rs<void*>(data);
+ size_t _sizeBytes = static_cast<size_t>(sizeBytes);
+ Device::getHal().Allocation1DRead(mContext, _allocation, _xoff, _lod, _count, _data, _sizeBytes);
+ return Void();
+}
+
+Return<void> Context::allocationElementRead(Allocation allocation, uint32_t x, uint32_t y, uint32_t z, uint32_t lod, Ptr data, Size sizeBytes, Size compIdx) {
+ RsAllocation _allocation = hidl_to_rs<RsAllocation>(allocation);
+ uint32_t _x = x;
+ uint32_t _y = y;
+ uint32_t _z = z;
+ uint32_t _lod = lod;
+ void* _data = hidl_to_rs<void*>(data);
+ size_t _sizeBytes = static_cast<size_t>(sizeBytes);
+ size_t _compIdx = static_cast<size_t>(compIdx);
+ Device::getHal().AllocationElementRead(mContext, _allocation, _x, _y, _z, _lod, _data, _sizeBytes, _compIdx);
+ return Void();
+}
+
+Return<void> Context::allocation2DRead(Allocation allocation, uint32_t xoff, uint32_t yoff, uint32_t lod, AllocationCubemapFace face, uint32_t w, uint32_t h, Ptr data, Size sizeBytes, Size stride) {
+ RsAllocation _allocation = hidl_to_rs<RsAllocation>(allocation);
+ uint32_t _xoff = xoff;
+ uint32_t _yoff = yoff;
+ uint32_t _lod = lod;
+ RsAllocationCubemapFace _face = static_cast<RsAllocationCubemapFace>(face);
+ uint32_t _w = w;
+ uint32_t _h = h;
+ void* _data = hidl_to_rs<void*>(data);
+ size_t _sizeBytes = static_cast<size_t>(sizeBytes);
+ size_t _stride = static_cast<size_t>(stride);
+ Device::getHal().Allocation2DRead(mContext, _allocation, _xoff, _yoff, _lod, _face, _w, _h, _data, _sizeBytes, _stride);
+ return Void();
+}
+
+Return<void> Context::allocation3DRead(Allocation allocation, uint32_t xoff, uint32_t yoff, uint32_t zoff, uint32_t lod, uint32_t w, uint32_t h, uint32_t d, Ptr data, Size sizeBytes, Size stride) {
+ RsAllocation _allocation = hidl_to_rs<RsAllocation>(allocation);
+ uint32_t _xoff = xoff;
+ uint32_t _yoff = yoff;
+ uint32_t _zoff = zoff;
+ uint32_t _lod = lod;
+ uint32_t _w = w;
+ uint32_t _h = h;
+ uint32_t _d = d;
+ void* _dataPtr = hidl_to_rs<void*>(data);
+ size_t _sizeBytes = static_cast<size_t>(sizeBytes);
+ size_t _stride = static_cast<size_t>(stride);
+ Device::getHal().Allocation3DRead(mContext, _allocation, _xoff, _yoff, _zoff, _lod, _w, _h, _d, _dataPtr, _sizeBytes, _stride);
+ return Void();
+}
+
+Return<void> Context::allocationSyncAll(Allocation allocation, AllocationUsageType usageType) {
+ RsAllocation _allocation = hidl_to_rs<RsAllocation>(allocation);
+ RsAllocationUsageType _usageType = static_cast<RsAllocationUsageType>(usageType);
+ Device::getHal().AllocationSyncAll(mContext, _allocation, _usageType);
+ return Void();
+}
+
+Return<void> Context::allocationResize1D(Allocation allocation, uint32_t dimX) {
+ RsAllocation _allocation = hidl_to_rs<RsAllocation>(allocation);
+ uint32_t _dimX = dimX;
+ Device::getHal().AllocationResize1D(mContext, _allocation, _dimX);
+ return Void();
+}
+
+Return<void> Context::allocationCopy2DRange(Allocation dstAlloc, uint32_t dstXoff, uint32_t dstYoff, uint32_t dstMip, AllocationCubemapFace dstFace, uint32_t width, uint32_t height, Allocation srcAlloc, uint32_t srcXoff, uint32_t srcYoff, uint32_t srcMip, AllocationCubemapFace srcFace) {
+ RsAllocation _dstAlloc = hidl_to_rs<RsAllocation>(dstAlloc);
+ uint32_t _dstXoff = dstXoff;
+ uint32_t _dstYoff = dstYoff;
+ uint32_t _dstMip = dstMip;
+ RsAllocationCubemapFace _dstFace = static_cast<RsAllocationCubemapFace>(dstFace);
+ uint32_t _width = width;
+ uint32_t _height = height;
+ RsAllocation _srcAlloc = hidl_to_rs<RsAllocation>(srcAlloc);
+ uint32_t _srcXoff = srcXoff;
+ uint32_t _srcYoff = srcYoff;
+ uint32_t _srcMip = srcMip;
+ RsAllocationCubemapFace _srcFace = static_cast<RsAllocationCubemapFace>(srcFace);
+ Device::getHal().AllocationCopy2DRange(mContext, _dstAlloc, _dstXoff, _dstYoff, _dstMip, _dstFace, _width, _height, _srcAlloc, _srcXoff, _srcYoff, _srcMip, _srcFace);
+ return Void();
+}
+
+Return<void> Context::allocationCopy3DRange(Allocation dstAlloc, uint32_t dstXoff, uint32_t dstYoff, uint32_t dstZoff, uint32_t dstMip, uint32_t width, uint32_t height, uint32_t depth, Allocation srcAlloc, uint32_t srcXoff, uint32_t srcYoff, uint32_t srcZoff, uint32_t srcMip) {
+ RsAllocation _dstAlloc = hidl_to_rs<RsAllocation>(dstAlloc);
+ uint32_t _dstXoff = dstXoff;
+ uint32_t _dstYoff = dstYoff;
+ uint32_t _dstZoff = dstZoff;
+ uint32_t _dstMip = dstMip;
+ uint32_t _width = width;
+ uint32_t _height = height;
+ uint32_t _depth = depth;
+ RsAllocation _srcAlloc = hidl_to_rs<RsAllocation>(srcAlloc);
+ uint32_t _srcXoff = srcXoff;
+ uint32_t _srcYoff = srcYoff;
+ uint32_t _srcZoff = srcZoff;
+ uint32_t _srcMip = srcMip;
+ Device::getHal().AllocationCopy3DRange(mContext, _dstAlloc, _dstXoff, _dstYoff, _dstZoff, _dstMip, _width, _height, _depth, _srcAlloc, _srcXoff, _srcYoff, _srcZoff, _srcMip);
+ return Void();
+}
+
+Return<void> Context::allocationIoSend(Allocation allocation) {
+ RsAllocation _allocation = hidl_to_rs<RsAllocation>(allocation);
+ Device::getHal().AllocationIoSend(mContext, _allocation);
+ return Void();
+}
+
+Return<void> Context::allocationIoReceive(Allocation allocation) {
+ RsAllocation _allocation = hidl_to_rs<RsAllocation>(allocation);
+ Device::getHal().AllocationIoReceive(mContext, _allocation);
+ return Void();
+}
+
+Return<void> Context::allocationGetPointer(Allocation allocation, uint32_t lod, AllocationCubemapFace face, uint32_t z, allocationGetPointer_cb _hidl_cb) {
+ RsAllocation _allocation = hidl_to_rs<RsAllocation>(allocation);
+ uint32_t _lod = lod;
+ RsAllocationCubemapFace _face = static_cast<RsAllocationCubemapFace>(face);
+ uint32_t _z = z;
+ uint32_t _array = 0;
+ size_t _stride = 0;
+ void* _dataPtr = Device::getHal().AllocationGetPointer(mContext, _allocation, _lod, _face, _z, _array, &_stride, sizeof(size_t));
+ Ptr dataPtr = reinterpret_cast<Ptr>(_dataPtr);
+ Size stride = static_cast<Size>(_stride);
+ _hidl_cb(dataPtr, stride);
+ return Void();
+}
+
+Return<void> Context::elementGetNativeMetadata(Element element, elementGetNativeMetadata_cb _hidl_cb) {
+ RsElement _element = hidl_to_rs<RsElement>(element);
+ std::vector<uint32_t> _elemData(5);
+ Device::getHal().ElementGetNativeData(mContext, _element, _elemData.data(), _elemData.size());
+ hidl_vec<uint32_t> elemData = _elemData;
+ _hidl_cb(elemData);
+ return Void();
+}
+
+Return<void> Context::elementGetSubElements(Element element, Size numSubElem, elementGetSubElements_cb _hidl_cb) {
+ RsElement _element = hidl_to_rs<RsElement>(element);
+ uint32_t _numSubElem = static_cast<uint32_t>(numSubElem);
+ std::vector<uintptr_t> _ids(_numSubElem);
+ std::vector<const char*> _names(_numSubElem);
+ std::vector<size_t> _arraySizes(_numSubElem);
+ Device::getHal().ElementGetSubElements(mContext, _element, _ids.data(), _names.data(), _arraySizes.data(), _numSubElem);
+ hidl_vec<Element> ids = rs_to_hidl<Element>(_ids, [](uintptr_t val) { return static_cast<Element>(val); });
+ hidl_vec<hidl_string> names = rs_to_hidl<hidl_string>(_names, [](const char* val) { return val; });
+ hidl_vec<Size> arraySizes = rs_to_hidl<Size>(_arraySizes, [](size_t val) { return static_cast<Size>(val); });
+ _hidl_cb(ids, names, arraySizes);
+ return Void();
+}
+
+Return<Element> Context::elementCreate(DataType dt, DataKind dk, bool norm, uint32_t size) {
+ RsDataType _dt = static_cast<RsDataType>(dt);
+ RsDataKind _dk = static_cast<RsDataKind>(dk);
+ bool _norm = norm;
+ uint32_t _size = size;
+ RsElement _element = Device::getHal().ElementCreate(mContext, _dt, _dk, _norm, _size);
+ return rs_to_hidl<Element>(_element);
+}
+
+Return<Element> Context::elementComplexCreate(const hidl_vec<Element>& eins, const hidl_vec<hidl_string>& names, const hidl_vec<Size>& arraySizes) {
+ std::vector<RsElement> _eins = hidl_to_rs<RsElement>(eins, [](Element val) { return hidl_to_rs<RsElement>(val); });
+ std::vector<const char*> _namesPtr = hidl_to_rs<const char*>(names, [](const hidl_string& val) { return val.c_str(); });
+ std::vector<size_t> _nameLengthsPtr = hidl_to_rs<size_t>(names, [](const hidl_string& val) { return val.size(); });
+ std::vector<uint32_t> _arraySizes = hidl_to_rs<uint32_t>(arraySizes, [](Size val) { return static_cast<uint32_t>(val); });
+ RsElement _element = Device::getHal().ElementCreate2(mContext, _eins.data(), _eins.size(), _namesPtr.data(), _namesPtr.size(), _nameLengthsPtr.data(), _arraySizes.data(), _arraySizes.size());
+ return rs_to_hidl<Element>(_element);
+}
+
+Return<void> Context::typeGetNativeMetadata(Type type, typeGetNativeMetadata_cb _hidl_cb) {
+ RsType _type = hidl_to_rs<RsType>(type);
+ std::vector<uintptr_t> _metadata(6);
+ Device::getHal().TypeGetNativeData(mContext, _type, _metadata.data(), _metadata.size());
+ hidl_vec<OpaqueHandle> metadata = rs_to_hidl<OpaqueHandle>(_metadata, [](uintptr_t val) { return static_cast<OpaqueHandle>(val); });
+ _hidl_cb(metadata);
+ return Void();
+}
+
+Return<Type> Context::typeCreate(Element element, uint32_t dimX, uint32_t dimY, uint32_t dimZ, bool mipmaps, bool faces, YuvFormat yuv) {
+ RsElement _element = hidl_to_rs<RsElement>(element);
+ uint32_t _dimX = dimX;
+ uint32_t _dimY = dimY;
+ uint32_t _dimZ = dimZ;
+ bool _mipmaps = mipmaps;
+ bool _faces = faces;
+ RsYuvFormat _yuv = static_cast<RsYuvFormat>(yuv);
+ RsType _type = Device::getHal().TypeCreate(mContext, _element, _dimX, _dimY, _dimZ, _mipmaps, _faces, _yuv);
+ return rs_to_hidl<Type>(_type);
+}
+
+Return<void> Context::contextDestroy() {
+ Device::getHal().ContextDestroy(mContext);
+ mContext = nullptr;
+ return Void();
+}
+
+Return<void> Context::contextGetMessage(Ptr data, Size size, contextGetMessage_cb _hidl_cb) {
+ void* _data = hidl_to_rs<void*>(data);
+ size_t _size = static_cast<size_t>(size);
+ size_t _receiveLen = 0;
+ uint32_t _subID = 0;
+ RsMessageToClientType _messageType = Device::getHal().ContextGetMessage(mContext, _data, _size, &_receiveLen, sizeof(size_t), &_subID, sizeof(uint32_t));
+ MessageToClientType messageType = static_cast<MessageToClientType>(_messageType);
+ Size receiveLen = static_cast<Size>(_receiveLen);
+ _hidl_cb(messageType, receiveLen);
+ return Void();
+}
+
+Return<void> Context::contextPeekMessage(contextPeekMessage_cb _hidl_cb) {
+ size_t _receiveLen = 0;
+ uint32_t _subID = 0;
+ RsMessageToClientType _messageType = Device::getHal().ContextPeekMessage(mContext, &_receiveLen, sizeof(size_t), &_subID, sizeof(uint32_t));
+ MessageToClientType messageType = static_cast<MessageToClientType>(_messageType);
+ Size receiveLen = static_cast<Size>(_receiveLen);
+ uint32_t subID = _subID;
+ _hidl_cb(messageType, receiveLen, subID);
+ return Void();
+}
+
+Return<void> Context::contextSendMessage(uint32_t id, const hidl_vec<uint8_t>& data) {
+ uint32_t _id = id;
+ const uint8_t* _dataPtr = data.data();
+ size_t _dataSize = data.size();
+ Device::getHal().ContextSendMessage(mContext, _id, _dataPtr, _dataSize);
+ return Void();
+}
+
+Return<void> Context::contextInitToClient() {
+ Device::getHal().ContextInitToClient(mContext);
+ return Void();
+}
+
+Return<void> Context::contextDeinitToClient() {
+ Device::getHal().ContextDeinitToClient(mContext);
+ return Void();
+}
+
+Return<void> Context::contextFinish() {
+ Device::getHal().ContextFinish(mContext);
+ return Void();
+}
+
+Return<void> Context::contextLog() {
+ uint32_t _bits = 0;
+ Device::getHal().ContextDump(mContext, _bits);
+ return Void();
+}
+
+Return<void> Context::contextSetPriority(ThreadPriorities priority) {
+ RsThreadPriorities _priority = static_cast<RsThreadPriorities>(priority);
+ Device::getHal().ContextSetPriority(mContext, _priority);
+ return Void();
+}
+
+Return<void> Context::contextSetCacheDir(const hidl_string& cacheDir) {
+ Device::getHal().ContextSetCacheDir(mContext, cacheDir.c_str(), cacheDir.size());
+ return Void();
+}
+
+Return<void> Context::assignName(ObjectBase obj, const hidl_string& name) {
+ RsObjectBase _obj = hidl_to_rs<RsObjectBase>(obj);
+ const hidl_string& _name = name;
+ Device::getHal().AssignName(mContext, _obj, _name.c_str(), _name.size());
+ return Void();
+}
+
+Return<void> Context::getName(ObjectBase obj, getName_cb _hidl_cb) {
+ void* _obj = hidl_to_rs<void*>(obj);
+ const char* _name = nullptr;
+ Device::getHal().GetName(mContext, _obj, &_name);
+ hidl_string name = _name;
+ _hidl_cb(name);
+ return Void();
+}
+
+Return<Closure> Context::closureCreate(ScriptKernelID kernelID, Allocation returnValue, const hidl_vec<ScriptFieldID>& fieldIDS, const hidl_vec<int64_t>& values, const hidl_vec<int32_t>& sizes, const hidl_vec<Closure>& depClosures, const hidl_vec<ScriptFieldID>& depFieldIDS) {
+ RsScriptKernelID _kernelID = hidl_to_rs<RsScriptKernelID>(kernelID);
+ RsAllocation _returnValue = hidl_to_rs<RsAllocation>(returnValue);
+ std::vector<RsScriptFieldID> _fieldIDS = hidl_to_rs<RsScriptFieldID>(fieldIDS, [](ScriptFieldID val) { return hidl_to_rs<RsScriptFieldID>(val); });
+ int64_t* _valuesPtr = const_cast<int64_t*>(values.data());
+ size_t _valuesLength = values.size();
+ std::vector<int> _sizes = hidl_to_rs<int>(sizes, [](int32_t val) { return static_cast<int>(val); });
+ std::vector<RsClosure> _depClosures = hidl_to_rs<RsClosure>(depClosures, [](Closure val) { return hidl_to_rs<RsClosure>(val); });
+ std::vector<RsScriptFieldID> _depFieldIDS = hidl_to_rs<RsScriptFieldID>(depFieldIDS, [](ScriptFieldID val) { return hidl_to_rs<RsScriptFieldID>(val); });
+ RsClosure _closure = Device::getHal().ClosureCreate(mContext, _kernelID, _returnValue, _fieldIDS.data(), _fieldIDS.size(), _valuesPtr, _valuesLength, _sizes.data(), _sizes.size(), _depClosures.data(), _depClosures.size(), _depFieldIDS.data(), _depFieldIDS.size());
+ return rs_to_hidl<Closure>(_closure);
+}
+
+Return<Closure> Context::invokeClosureCreate(ScriptInvokeID invokeID, const hidl_vec<uint8_t>& params, const hidl_vec<ScriptFieldID>& fieldIDS, const hidl_vec<int64_t>& values, const hidl_vec<int32_t>& sizes) {
+ RsScriptInvokeID _invokeID = hidl_to_rs<RsScriptInvokeID>(invokeID);
+ const void* _paramsPtr = params.data();
+ size_t _paramsSize = params.size();
+ std::vector<RsScriptFieldID> _fieldIDS = hidl_to_rs<RsScriptFieldID>(fieldIDS, [](ScriptFieldID val) { return hidl_to_rs<RsScriptFieldID>(val); });
+ const int64_t* _valuesPtr = values.data();
+ size_t _valuesLength = values.size();
+ std::vector<int> _sizes = hidl_to_rs<int>(sizes, [](int32_t val) { return static_cast<int>(val); });
+ RsClosure _closure = Device::getHal().InvokeClosureCreate(mContext, _invokeID, _paramsPtr, _paramsSize, _fieldIDS.data(), _fieldIDS.size(), _valuesPtr, _valuesLength, _sizes.data(), _sizes.size());
+ return rs_to_hidl<Closure>(_closure);
+}
+
+Return<void> Context::closureSetArg(Closure closure, uint32_t index, Ptr value, int32_t size) {
+ RsClosure _closure = hidl_to_rs<RsClosure>(closure);
+ uint32_t _index = index;
+ uintptr_t _value = hidl_to_rs<uintptr_t>(value);
+ int _size = static_cast<int>(size);
+ Device::getHal().ClosureSetArg(mContext, _closure, _index, _value, _size);
+ return Void();
+}
+
+Return<void> Context::closureSetGlobal(Closure closure, ScriptFieldID fieldID, int64_t value, int32_t size) {
+ RsClosure _closure = hidl_to_rs<RsClosure>(closure);
+ RsScriptFieldID _fieldID = hidl_to_rs<RsScriptFieldID>(fieldID);
+ int64_t _value = value;
+ int _size = static_cast<int>(size);
+ Device::getHal().ClosureSetGlobal(mContext, _closure, _fieldID, _value, _size);
+ return Void();
+}
+
+Return<ScriptKernelID> Context::scriptKernelIDCreate(Script script, int32_t slot, int32_t sig) {
+ RsScript _script = hidl_to_rs<RsScript>(script);
+ int _slot = static_cast<int>(slot);
+ int _sig = static_cast<int>(sig);
+ RsScriptKernelID _scriptKernelID = Device::getHal().ScriptKernelIDCreate(mContext, _script, _slot, _sig);
+ return rs_to_hidl<ScriptKernelID>(_scriptKernelID);
+}
+
+Return<ScriptInvokeID> Context::scriptInvokeIDCreate(Script script, int32_t slot) {
+ RsScript _script = hidl_to_rs<RsScript>(script);
+ int _slot = static_cast<int>(slot);
+ RsScriptInvokeID _scriptInvokeID = Device::getHal().ScriptInvokeIDCreate(mContext, _script, _slot);
+ return rs_to_hidl<ScriptInvokeID>(_scriptInvokeID);
+}
+
+Return<ScriptFieldID> Context::scriptFieldIDCreate(Script script, int32_t slot) {
+ RsScript _script = hidl_to_rs<RsScript>(script);
+ int _slot = static_cast<int>(slot);
+ RsScriptFieldID _scriptFieldID = Device::getHal().ScriptFieldIDCreate(mContext, _script, _slot);
+ return rs_to_hidl<ScriptFieldID>(_scriptFieldID);
+}
+
+Return<ScriptGroup> Context::scriptGroupCreate(const hidl_vec<ScriptKernelID>& kernels, const hidl_vec<ScriptKernelID>& srcK, const hidl_vec<ScriptKernelID>& dstK, const hidl_vec<ScriptFieldID>& dstF, const hidl_vec<Type>& types) {
+ std::vector<RsScriptKernelID> _kernels = hidl_to_rs<RsScriptKernelID>(kernels, [](ScriptFieldID val) { return hidl_to_rs<RsScriptKernelID>(val); });
+ std::vector<RsScriptKernelID> _srcK = hidl_to_rs<RsScriptKernelID>(srcK, [](ScriptFieldID val) { return hidl_to_rs<RsScriptKernelID>(val); });
+ std::vector<RsScriptKernelID> _dstK = hidl_to_rs<RsScriptKernelID>(dstK, [](ScriptFieldID val) { return hidl_to_rs<RsScriptKernelID>(val); });
+ std::vector<RsScriptFieldID> _dstF = hidl_to_rs<RsScriptFieldID>(dstF, [](ScriptFieldID val) { return hidl_to_rs<RsScriptFieldID>(val); });
+ std::vector<RsType> _types = hidl_to_rs<RsType>(types, [](Type val) { return hidl_to_rs<RsType>(val); });
+ RsScriptGroup _scriptGroup = Device::getHal().ScriptGroupCreate(mContext, _kernels.data(), _kernels.size(), _srcK.data(), _srcK.size(), _dstK.data(), _dstK.size(), _dstF.data(), _dstF.size(), _types.data(), _types.size());
+ return rs_to_hidl<ScriptGroup>(_scriptGroup);
+}
+
+Return<ScriptGroup2> Context::scriptGroup2Create(const hidl_string& name, const hidl_string& cacheDir, const hidl_vec<Closure>& closures) {
+ const hidl_string& _name = name;
+ const hidl_string& _cacheDir = cacheDir;
+ std::vector<RsClosure> _closures = hidl_to_rs<RsClosure>(closures, [](Closure val) { return hidl_to_rs<RsClosure>(val); });
+ RsScriptGroup2 _scriptGroup2 = Device::getHal().ScriptGroup2Create(mContext, _name.c_str(), _name.size(), _cacheDir.c_str(), _cacheDir.size(), _closures.data(), _closures.size());
+ return rs_to_hidl<ScriptGroup2>(_scriptGroup2);
+}
+
+Return<void> Context::scriptGroupSetOutput(ScriptGroup sg, ScriptKernelID kid, Allocation alloc) {
+ RsScriptGroup _sg = hidl_to_rs<RsScriptGroup>(sg);
+ RsScriptKernelID _kid = hidl_to_rs<RsScriptKernelID>(kid);
+ RsAllocation _alloc = hidl_to_rs<RsAllocation>(alloc);
+ Device::getHal().ScriptGroupSetOutput(mContext, _sg, _kid, _alloc);
+ return Void();
+}
+
+Return<void> Context::scriptGroupSetInput(ScriptGroup sg, ScriptKernelID kid, Allocation alloc) {
+ RsScriptGroup _sg = hidl_to_rs<RsScriptGroup>(sg);
+ RsScriptKernelID _kid = hidl_to_rs<RsScriptKernelID>(kid);
+ RsAllocation _alloc = hidl_to_rs<RsAllocation>(alloc);
+ Device::getHal().ScriptGroupSetInput(mContext, _sg, _kid, _alloc);
+ return Void();
+}
+
+Return<void> Context::scriptGroupExecute(ScriptGroup sg) {
+ RsScriptGroup _sg = hidl_to_rs<RsScriptGroup>(sg);
+ Device::getHal().ScriptGroupExecute(mContext, _sg);
+ return Void();
+}
+
+Return<void> Context::objDestroy(ObjectBase obj) {
+ RsAsyncVoidPtr _obj = hidl_to_rs<RsAsyncVoidPtr>(obj);
+ Device::getHal().ObjDestroy(mContext, _obj);
+ return Void();
+}
+
+Return<Sampler> Context::samplerCreate(SamplerValue magFilter, SamplerValue minFilter, SamplerValue wrapS, SamplerValue wrapT, SamplerValue wrapR, float aniso) {
+ RsSamplerValue _magFilter = static_cast<RsSamplerValue>(magFilter);
+ RsSamplerValue _minFilter = static_cast<RsSamplerValue>(minFilter);
+ RsSamplerValue _wrapS = static_cast<RsSamplerValue>(wrapS);
+ RsSamplerValue _wrapT = static_cast<RsSamplerValue>(wrapT);
+ RsSamplerValue _wrapR = static_cast<RsSamplerValue>(wrapR);
+ float _aniso = static_cast<float>(aniso);
+ RsSampler _sampler = Device::getHal().SamplerCreate(mContext, _magFilter, _minFilter, _wrapS, _wrapT, _wrapR, _aniso);
+ return rs_to_hidl<Sampler>(_sampler);
+}
+
+Return<void> Context::scriptBindAllocation(Script script, Allocation allocation, uint32_t slot) {
+ RsScript _script = hidl_to_rs<RsScript>(script);
+ RsAllocation _allocation = hidl_to_rs<RsAllocation>(allocation);
+ uint32_t _slot = slot;
+ Device::getHal().ScriptBindAllocation(mContext, _script, _allocation, _slot);
+ return Void();
+}
+
+Return<void> Context::scriptSetTimeZone(Script script, const hidl_string& timeZone) {
+ RsScript _script = hidl_to_rs<RsScript>(script);
+ const hidl_string& _timeZone = timeZone;
+ Device::getHal().ScriptSetTimeZone(mContext, _script, _timeZone.c_str(), _timeZone.size());
+ return Void();
+}
+
+Return<void> Context::scriptInvoke(Script vs, uint32_t slot) {
+ RsScript _vs = hidl_to_rs<RsScript>(vs);
+ uint32_t _slot = slot;
+ Device::getHal().ScriptInvoke(mContext, _vs, _slot);
+ return Void();
+}
+
+Return<void> Context::scriptInvokeV(Script vs, uint32_t slot, const hidl_vec<uint8_t>& data) {
+ RsScript _vs = hidl_to_rs<RsScript>(vs);
+ uint32_t _slot = slot;
+ const void* _dataPtr = hidl_to_rs<const void*>(data.data());
+ size_t _len = data.size();
+ Device::getHal().ScriptInvokeV(mContext, _vs, _slot, _dataPtr, _len);
+ return Void();
+}
+
+Return<void> Context::scriptForEach(Script vs, uint32_t slot, const hidl_vec<Allocation>& vains, Allocation vaout, const hidl_vec<uint8_t>& params, Ptr sc) {
+ RsScript _vs = hidl_to_rs<RsScript>(vs);
+ uint32_t _slot = slot;
+ std::vector<RsAllocation> _vains = hidl_to_rs<RsAllocation>(vains, [](Allocation val) { return hidl_to_rs<RsAllocation>(val); });
+ RsAllocation _vaout = hidl_to_rs<RsAllocation>(vaout);
+ const void* _paramsPtr = hidl_to_rs<const void*>(params.data());
+ size_t _paramLen = params.size();
+ const RsScriptCall* _sc = hidl_to_rs<const RsScriptCall*>(sc);
+ size_t _scLen = _sc != nullptr ? sizeof(ScriptCall) : 0;
+ Device::getHal().ScriptForEachMulti(mContext, _vs, _slot, _vains.data(), _vains.size(), _vaout, _paramsPtr, _paramLen, _sc, _scLen);
+ return Void();
+}
+
+Return<void> Context::scriptReduce(Script vs, uint32_t slot, const hidl_vec<Allocation>& vains, Allocation vaout, Ptr sc) {
+ RsScript _vs = hidl_to_rs<RsScript>(vs);
+ uint32_t _slot = slot;
+ std::vector<RsAllocation> _vains = hidl_to_rs<RsAllocation>(vains, [](Allocation val) { return hidl_to_rs<RsAllocation>(val); });
+ RsAllocation _vaout = hidl_to_rs<RsAllocation>(vaout);
+ const RsScriptCall* _sc = hidl_to_rs<const RsScriptCall*>(sc);
+ size_t _scLen = _sc != nullptr ? sizeof(ScriptCall) : 0;
+ Device::getHal().ScriptReduce(mContext, _vs, _slot, _vains.data(), _vains.size(), _vaout, _sc, _scLen);
+ return Void();
+}
+
+Return<void> Context::scriptSetVarI(Script vs, uint32_t slot, int32_t value) {
+ RsScript _vs = hidl_to_rs<RsScript>(vs);
+ uint32_t _slot = slot;
+ int _value = static_cast<int>(value);
+ Device::getHal().ScriptSetVarI(mContext, _vs, _slot, _value);
+ return Void();
+}
+
+Return<void> Context::scriptSetVarObj(Script vs, uint32_t slot, ObjectBase obj) {
+ RsScript _vs = hidl_to_rs<RsScript>(vs);
+ uint32_t _slot = slot;
+ RsObjectBase _obj = hidl_to_rs<RsObjectBase>(obj);
+ Device::getHal().ScriptSetVarObj(mContext, _vs, _slot, _obj);
+ return Void();
+}
+
+Return<void> Context::scriptSetVarJ(Script vs, uint32_t slot, int64_t value) {
+ RsScript _vs = hidl_to_rs<RsScript>(vs);
+ uint32_t _slot = slot;
+ int64_t _value = static_cast<int64_t>(value);
+ Device::getHal().ScriptSetVarJ(mContext, _vs, _slot, _value);
+ return Void();
+}
+
+Return<void> Context::scriptSetVarF(Script vs, uint32_t slot, float value) {
+ RsScript _vs = hidl_to_rs<RsScript>(vs);
+ uint32_t _slot = slot;
+ float _value = value;
+ Device::getHal().ScriptSetVarF(mContext, _vs, _slot, _value);
+ return Void();
+}
+
+Return<void> Context::scriptSetVarD(Script vs, uint32_t slot, double value) {
+ RsScript _vs = hidl_to_rs<RsScript>(vs);
+ uint32_t _slot = slot;
+ double _value = value;
+ Device::getHal().ScriptSetVarD(mContext, _vs, _slot, _value);
+ return Void();
+}
+
+Return<void> Context::scriptSetVarV(Script vs, uint32_t slot, const hidl_vec<uint8_t>& data) {
+ RsScript _vs = hidl_to_rs<RsScript>(vs);
+ uint32_t _slot = slot;
+ const void* _dataPtr = hidl_to_rs<const void*>(data.data());
+ size_t _len = data.size();
+ Device::getHal().ScriptSetVarV(mContext, _vs, _slot, _dataPtr, _len);
+ return Void();
+}
+
+Return<void> Context::scriptGetVarV(Script vs, uint32_t slot, Size len, scriptGetVarV_cb _hidl_cb) {
+ RsScript _vs = hidl_to_rs<RsScript>(vs);
+ uint32_t _slot = slot;
+ size_t _len = static_cast<size_t>(len);
+ std::vector<uint8_t> _data(static_cast<size_t>(len));
+ Device::getHal().ScriptGetVarV(mContext, _vs, _slot, _data.data(), _data.size());
+ hidl_vec<uint8_t> data = _data;
+ _hidl_cb(data);
+ return Void();
+}
+
+Return<void> Context::scriptSetVarVE(Script vs, uint32_t slot, const hidl_vec<uint8_t>& data, Element ve, const hidl_vec<uint32_t>& dims) {
+ RsScript _vs = hidl_to_rs<RsScript>(vs);
+ uint32_t _slot = slot;
+ const void* _dataPtr = hidl_to_rs<const void*>(data.data());
+ size_t _len = data.size();
+ RsElement _ve = hidl_to_rs<RsElement>(ve);
+ const uint32_t* _dimsPtr = dims.data();
+ size_t _dimLen = dims.size();
+ Device::getHal().ScriptSetVarVE(mContext, _vs, _slot, _dataPtr, _len, _ve, _dimsPtr, _dimLen);
+ return Void();
+}
+
+Return<Script> Context::scriptCCreate(const hidl_string& resName, const hidl_string& cacheDir, const hidl_vec<uint8_t>& text) {
+ const hidl_string& _resName = resName;
+ const hidl_string& _cacheDir = cacheDir;
+ const char* _textPtr = hidl_to_rs<const char*>(text.data());
+ size_t _textSize = text.size();
+ RsScript _script = Device::getHal().ScriptCCreate(mContext, _resName.c_str(), _resName.size(), _cacheDir.c_str(), _cacheDir.size(), _textPtr, _textSize);
+ return rs_to_hidl<Script>(_script);
+}
+
+Return<Script> Context::scriptIntrinsicCreate(ScriptIntrinsicID id, Element elem) {
+ RsScriptIntrinsicID _id = static_cast<RsScriptIntrinsicID>(id);
+ RsElement _elem = hidl_to_rs<RsElement>(elem);
+ RsScript _script = Device::getHal().ScriptIntrinsicCreate(mContext, _id, _elem);
+ return rs_to_hidl<Script>(_script);
+}
+
+
+// Methods from ::android::hidl::base::V1_0::IBase follow.
+
+
+} // namespace implementation
+} // namespace V1_0
+} // namespace renderscript
+} // namespace hardware
+} // namespace android
diff --git a/renderscript/1.0/default/Context.h b/renderscript/1.0/default/Context.h
new file mode 100644
index 0000000..38c45c5
--- /dev/null
+++ b/renderscript/1.0/default/Context.h
@@ -0,0 +1,129 @@
+#ifndef ANDROID_HARDWARE_RENDERSCRIPT_V1_0_CONTEXT_H
+#define ANDROID_HARDWARE_RENDERSCRIPT_V1_0_CONTEXT_H
+
+#include "cpp/rsDispatch.h"
+#include "dlfcn.h"
+#include <android/hardware/renderscript/1.0/IContext.h>
+#include <hidl/MQDescriptor.h>
+#include <hidl/Status.h>
+
+namespace android {
+namespace hardware {
+namespace renderscript {
+namespace V1_0 {
+namespace implementation {
+
+using ::android::hardware::renderscript::V1_0::AllocationCubemapFace;
+using ::android::hardware::renderscript::V1_0::AllocationMipmapControl;
+using ::android::hardware::renderscript::V1_0::AllocationUsageType;
+using ::android::hardware::renderscript::V1_0::ContextType;
+using ::android::hardware::renderscript::V1_0::DataKind;
+using ::android::hardware::renderscript::V1_0::DataType;
+using ::android::hardware::renderscript::V1_0::IContext;
+using ::android::hardware::renderscript::V1_0::MessageToClientType;
+using ::android::hardware::renderscript::V1_0::SamplerValue;
+using ::android::hardware::renderscript::V1_0::ScriptCall;
+using ::android::hardware::renderscript::V1_0::ScriptIntrinsicID;
+using ::android::hardware::renderscript::V1_0::ThreadPriorities;
+using ::android::hardware::renderscript::V1_0::YuvFormat;
+using ::android::hidl::base::V1_0::IBase;
+using ::android::hardware::hidl_string;
+using ::android::hardware::hidl_vec;
+using ::android::hardware::Return;
+using ::android::hardware::Void;
+using ::android::sp;
+
+struct Context : public IContext {
+ Context(uint32_t sdkVersion, ContextType ct, int32_t flags);
+
+ // Methods from ::android::hardware::renderscript::V1_0::IContext follow.
+ Return<Allocation> allocationAdapterCreate(Type type, Allocation baseAlloc) override;
+ Return<void> allocationAdapterOffset(Allocation alloc, const hidl_vec<uint32_t>& offsets) override;
+ Return<Type> allocationGetType(Allocation allocation) override;
+ Return<Allocation> allocationCreateTyped(Type type, AllocationMipmapControl mips, int32_t usage, Ptr ptr) override;
+ Return<Allocation> allocationCreateFromBitmap(Type type, AllocationMipmapControl mips, const hidl_vec<uint8_t>& bitmap, int32_t usage) override;
+ Return<Allocation> allocationCubeCreateFromBitmap(Type type, AllocationMipmapControl mips, const hidl_vec<uint8_t>& bitmap, int32_t usage) override;
+ Return<NativeWindow> allocationGetNativeWindow(Allocation allocation) override;
+ Return<void> allocationSetNativeWindow(Allocation allocation, NativeWindow nativewindow) override;
+ Return<void> allocationSetupBufferQueue(Allocation alloc, uint32_t numBuffer) override;
+ Return<void> allocationShareBufferQueue(Allocation baseAlloc, Allocation subAlloc) override;
+ Return<void> allocationCopyToBitmap(Allocation allocation, Ptr data, Size sizeBytes) override;
+ Return<void> allocation1DWrite(Allocation allocation, uint32_t offset, uint32_t lod, uint32_t count, const hidl_vec<uint8_t>& data) override;
+ Return<void> allocationElementWrite(Allocation allocation, uint32_t x, uint32_t y, uint32_t z, uint32_t lod, const hidl_vec<uint8_t>& data, Size compIdx) override;
+ Return<void> allocation2DWrite(Allocation allocation, uint32_t xoff, uint32_t yoff, uint32_t lod, AllocationCubemapFace face, uint32_t w, uint32_t h, const hidl_vec<uint8_t>& data, Size stride) override;
+ Return<void> allocation3DWrite(Allocation allocation, uint32_t xoff, uint32_t yoff, uint32_t zoff, uint32_t lod, uint32_t w, uint32_t h, uint32_t d, const hidl_vec<uint8_t>& data, Size stride) override;
+ Return<void> allocationGenerateMipmaps(Allocation allocation) override;
+ Return<void> allocationRead(Allocation allocation, Ptr data, Size sizeBytes) override;
+ Return<void> allocation1DRead(Allocation allocation, uint32_t xoff, uint32_t lod, uint32_t count, Ptr data, Size sizeBytes) override;
+ Return<void> allocationElementRead(Allocation allocation, uint32_t x, uint32_t y, uint32_t z, uint32_t lod, Ptr data, Size sizeBytes, Size compIdx) override;
+ Return<void> allocation2DRead(Allocation allocation, uint32_t xoff, uint32_t yoff, uint32_t lod, AllocationCubemapFace face, uint32_t w, uint32_t h, Ptr data, Size sizeBytes, Size stride) override;
+ Return<void> allocation3DRead(Allocation allocation, uint32_t xoff, uint32_t yoff, uint32_t zoff, uint32_t lod, uint32_t w, uint32_t h, uint32_t d, Ptr data, Size sizeBytes, Size stride) override;
+ Return<void> allocationSyncAll(Allocation allocation, AllocationUsageType usageType) override;
+ Return<void> allocationResize1D(Allocation allocation, uint32_t dimX) override;
+ Return<void> allocationCopy2DRange(Allocation dstAlloc, uint32_t dstXoff, uint32_t dstYoff, uint32_t dstMip, AllocationCubemapFace dstFace, uint32_t width, uint32_t height, Allocation srcAlloc, uint32_t srcXoff, uint32_t srcYoff, uint32_t srcMip, AllocationCubemapFace srcFace) override;
+ Return<void> allocationCopy3DRange(Allocation dstAlloc, uint32_t dstXoff, uint32_t dstYoff, uint32_t dstZoff, uint32_t dstMip, uint32_t width, uint32_t height, uint32_t depth, Allocation srcAlloc, uint32_t srcXoff, uint32_t srcYoff, uint32_t srcZoff, uint32_t srcMip) override;
+ Return<void> allocationIoSend(Allocation allocation) override;
+ Return<void> allocationIoReceive(Allocation allocation) override;
+ Return<void> allocationGetPointer(Allocation allocation, uint32_t lod, AllocationCubemapFace face, uint32_t z, allocationGetPointer_cb _hidl_cb) override;
+ Return<void> elementGetNativeMetadata(Element element, elementGetNativeMetadata_cb _hidl_cb) override;
+ Return<void> elementGetSubElements(Element element, Size numSubElem, elementGetSubElements_cb _hidl_cb) override;
+ Return<Element> elementCreate(DataType dt, DataKind dk, bool norm, uint32_t size) override;
+ Return<Element> elementComplexCreate(const hidl_vec<Element>& eins, const hidl_vec<hidl_string>& names, const hidl_vec<Size>& arraySizes) override;
+ Return<void> typeGetNativeMetadata(Type type, typeGetNativeMetadata_cb _hidl_cb) override;
+ Return<Type> typeCreate(Element element, uint32_t dimX, uint32_t dimY, uint32_t dimZ, bool mipmaps, bool faces, YuvFormat yuv) override;
+ Return<void> contextDestroy() override;
+ Return<void> contextGetMessage(Ptr data, Size size, contextGetMessage_cb _hidl_cb) override;
+ Return<void> contextPeekMessage(contextPeekMessage_cb _hidl_cb) override;
+ Return<void> contextSendMessage(uint32_t id, const hidl_vec<uint8_t>& data) override;
+ Return<void> contextInitToClient() override;
+ Return<void> contextDeinitToClient() override;
+ Return<void> contextFinish() override;
+ Return<void> contextLog() override;
+ Return<void> contextSetPriority(ThreadPriorities priority) override;
+ Return<void> contextSetCacheDir(const hidl_string& cacheDir) override;
+ Return<void> assignName(ObjectBase obj, const hidl_string& name) override;
+ Return<void> getName(ObjectBase obj, getName_cb _hidl_cb) override;
+ Return<Closure> closureCreate(ScriptKernelID kernelID, Allocation returnValue, const hidl_vec<ScriptFieldID>& fieldIDS, const hidl_vec<int64_t>& values, const hidl_vec<int32_t>& sizes, const hidl_vec<Closure>& depClosures, const hidl_vec<ScriptFieldID>& depFieldIDS) override;
+ Return<Closure> invokeClosureCreate(ScriptInvokeID invokeID, const hidl_vec<uint8_t>& params, const hidl_vec<ScriptFieldID>& fieldIDS, const hidl_vec<int64_t>& values, const hidl_vec<int32_t>& sizes) override;
+ Return<void> closureSetArg(Closure closure, uint32_t index, Ptr value, int32_t size) override;
+ Return<void> closureSetGlobal(Closure closure, ScriptFieldID fieldID, int64_t value, int32_t size) override;
+ Return<ScriptKernelID> scriptKernelIDCreate(Script script, int32_t slot, int32_t sig) override;
+ Return<ScriptInvokeID> scriptInvokeIDCreate(Script script, int32_t slot) override;
+ Return<ScriptFieldID> scriptFieldIDCreate(Script script, int32_t slot) override;
+ Return<ScriptGroup> scriptGroupCreate(const hidl_vec<ScriptKernelID>& kernels, const hidl_vec<ScriptKernelID>& srcK, const hidl_vec<ScriptKernelID>& dstK, const hidl_vec<ScriptFieldID>& dstF, const hidl_vec<Type>& types) override;
+ Return<ScriptGroup2> scriptGroup2Create(const hidl_string& name, const hidl_string& cacheDir, const hidl_vec<Closure>& closures) override;
+ Return<void> scriptGroupSetOutput(ScriptGroup sg, ScriptKernelID kid, Allocation alloc) override;
+ Return<void> scriptGroupSetInput(ScriptGroup sg, ScriptKernelID kid, Allocation alloc) override;
+ Return<void> scriptGroupExecute(ScriptGroup sg) override;
+ Return<void> objDestroy(ObjectBase obj) override;
+ Return<Sampler> samplerCreate(SamplerValue magFilter, SamplerValue minFilter, SamplerValue wrapS, SamplerValue wrapT, SamplerValue wrapR, float aniso) override;
+ Return<void> scriptBindAllocation(Script script, Allocation allocation, uint32_t slot) override;
+ Return<void> scriptSetTimeZone(Script script, const hidl_string& timeZone) override;
+ Return<void> scriptInvoke(Script vs, uint32_t slot) override;
+ Return<void> scriptInvokeV(Script vs, uint32_t slot, const hidl_vec<uint8_t>& data) override;
+ Return<void> scriptForEach(Script vs, uint32_t slot, const hidl_vec<Allocation>& vains, Allocation vaout, const hidl_vec<uint8_t>& params, Ptr sc) override;
+ Return<void> scriptReduce(Script vs, uint32_t slot, const hidl_vec<Allocation>& vains, Allocation vaout, Ptr sc) override;
+ Return<void> scriptSetVarI(Script vs, uint32_t slot, int32_t value) override;
+ Return<void> scriptSetVarObj(Script vs, uint32_t slot, ObjectBase obj) override;
+ Return<void> scriptSetVarJ(Script vs, uint32_t slot, int64_t value) override;
+ Return<void> scriptSetVarF(Script vs, uint32_t slot, float value) override;
+ Return<void> scriptSetVarD(Script vs, uint32_t slot, double value) override;
+ Return<void> scriptSetVarV(Script vs, uint32_t slot, const hidl_vec<uint8_t>& data) override;
+ Return<void> scriptGetVarV(Script vs, uint32_t slot, Size len, scriptGetVarV_cb _hidl_cb) override;
+ Return<void> scriptSetVarVE(Script vs, uint32_t slot, const hidl_vec<uint8_t>& data, Element ve, const hidl_vec<uint32_t>& dims) override;
+ Return<Script> scriptCCreate(const hidl_string& resName, const hidl_string& cacheDir, const hidl_vec<uint8_t>& text) override;
+ Return<Script> scriptIntrinsicCreate(ScriptIntrinsicID id, Element elem) override;
+
+ // Methods from ::android::hidl::base::V1_0::IBase follow.
+
+ private:
+ RsContext mContext;
+};
+
+} // namespace implementation
+} // namespace V1_0
+} // namespace renderscript
+} // namespace hardware
+} // namespace android
+
+#endif // ANDROID_HARDWARE_RENDERSCRIPT_V1_0_CONTEXT_H
diff --git a/renderscript/1.0/default/Device.cpp b/renderscript/1.0/default/Device.cpp
new file mode 100644
index 0000000..86cf8eb
--- /dev/null
+++ b/renderscript/1.0/default/Device.cpp
@@ -0,0 +1,139 @@
+#include "Context.h"
+#include "Device.h"
+
+namespace android {
+namespace hardware {
+namespace renderscript {
+namespace V1_0 {
+namespace implementation {
+
+
+static dispatchTable loadHAL();
+dispatchTable Device::mDispatchHal = loadHAL();
+
+Device::Device() {
+}
+
+dispatchTable& Device::getHal() {
+ return mDispatchHal;
+}
+
+
+// Methods from ::android::hardware::renderscript::V1_0::IDevice follow.
+
+Return<sp<IContext>> Device::contextCreate(uint32_t sdkVersion, ContextType ct, int32_t flags) {
+ return new Context(sdkVersion, ct, flags);
+}
+
+
+// Methods from ::android::hidl::base::V1_0::IBase follow.
+
+IDevice* HIDL_FETCH_IDevice(const char* /* name */) {
+ return new Device();
+}
+
+// Helper function
+dispatchTable loadHAL() {
+
+ static_assert(sizeof(void*) <= sizeof(uint64_t), "RenderScript HIDL Error: sizeof(void*) > sizeof(uint64_t)");
+ static_assert(sizeof(size_t) <= sizeof(uint64_t), "RenderScript HIDL Error: sizeof(size_t) > sizeof(uint64_t)");
+
+ const char* filename = "libRS_internal.so";
+ void* handle = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
+
+ dispatchTable dispatchHal = {
+ .SetNativeLibDir = (SetNativeLibDirFnPtr)nullptr,
+
+ .Allocation1DData = (Allocation1DDataFnPtr)dlsym(handle, "rsAllocation1DData"),
+ .Allocation1DElementData = (Allocation1DElementDataFnPtr)nullptr,
+ .Allocation1DRead = (Allocation1DReadFnPtr)dlsym(handle, "rsAllocation1DRead"),
+ .Allocation2DData = (Allocation2DDataFnPtr)dlsym(handle, "rsAllocation2DData"),
+ .Allocation2DRead = (Allocation2DReadFnPtr)dlsym(handle, "rsAllocation2DRead"),
+ .Allocation3DData = (Allocation3DDataFnPtr)dlsym(handle, "rsAllocation3DData"),
+ .Allocation3DRead = (Allocation3DReadFnPtr)dlsym(handle, "rsAllocation3DRead"),
+ .AllocationAdapterCreate = (AllocationAdapterCreateFnPtr)dlsym(handle, "rsAllocationAdapterCreate"),
+ .AllocationAdapterOffset = (AllocationAdapterOffsetFnPtr)dlsym(handle, "rsAllocationAdapterOffset"),
+ .AllocationCopy2DRange = (AllocationCopy2DRangeFnPtr)dlsym(handle, "rsAllocationCopy2DRange"),
+ .AllocationCopy3DRange = (AllocationCopy3DRangeFnPtr)dlsym(handle, "rsAllocationCopy3DRange"),
+ .AllocationCopyToBitmap = (AllocationCopyToBitmapFnPtr)dlsym(handle, "rsAllocationCopyToBitmap"),
+ .AllocationCreateFromBitmap = (AllocationCreateFromBitmapFnPtr)dlsym(handle, "rsAllocationCreateFromBitmap"),
+ .AllocationCreateStrided = (AllocationCreateStridedFnPtr)dlsym(handle, "rsAllocationCreateStrided"),
+ .AllocationCreateTyped = (AllocationCreateTypedFnPtr)dlsym(handle, "rsAllocationCreateTyped"),
+ .AllocationCubeCreateFromBitmap = (AllocationCubeCreateFromBitmapFnPtr)dlsym(handle, "rsAllocationCubeCreateFromBitmap"),
+ .AllocationElementData = (AllocationElementDataFnPtr)dlsym(handle, "rsAllocationElementData"),
+ .AllocationElementRead = (AllocationElementReadFnPtr)dlsym(handle, "rsAllocationElementRead"),
+ .AllocationGenerateMipmaps = (AllocationGenerateMipmapsFnPtr)dlsym(handle, "rsAllocationGenerateMipmaps"),
+ .AllocationGetPointer = (AllocationGetPointerFnPtr)dlsym(handle, "rsAllocationGetPointer"),
+ .AllocationGetSurface = (AllocationGetSurfaceFnPtr)dlsym(handle, "rsAllocationGetSurface"),
+ .AllocationGetType = (AllocationGetTypeFnPtr)dlsym(handle, "rsaAllocationGetType"),
+ .AllocationIoReceive = (AllocationIoReceiveFnPtr)dlsym(handle, "rsAllocationIoReceive"),
+ .AllocationIoSend = (AllocationIoSendFnPtr)dlsym(handle, "rsAllocationIoSend"),
+ .AllocationRead = (AllocationReadFnPtr)dlsym(handle, "rsAllocationRead"),
+ .AllocationResize1D = (AllocationResize1DFnPtr)dlsym(handle, "rsAllocationResize1D"),
+ .AllocationSetSurface = (AllocationSetSurfaceFnPtr)dlsym(handle, "rsAllocationSetSurface"),
+ .AllocationSetupBufferQueue = (AllocationSetupBufferQueueFnPtr)dlsym(handle, "rsAllocationSetupBufferQueue"),
+ .AllocationShareBufferQueue = (AllocationShareBufferQueueFnPtr)dlsym(handle, "rsAllocationShareBufferQueue"),
+ .AllocationSyncAll = (AllocationSyncAllFnPtr)dlsym(handle, "rsAllocationSyncAll"),
+ .AssignName = (AssignNameFnPtr)dlsym(handle, "rsAssignName"),
+ .ClosureCreate = (ClosureCreateFnPtr)dlsym(handle, "rsClosureCreate"),
+ .ClosureSetArg = (ClosureSetArgFnPtr)dlsym(handle, "rsClosureSetArg"),
+ .ClosureSetGlobal = (ClosureSetGlobalFnPtr)dlsym(handle, "rsClosureSetGlobal"),
+ .ContextCreate = (ContextCreateFnPtr)dlsym(handle, "rsContextCreate"),
+ .ContextDeinitToClient = (ContextDeinitToClientFnPtr)dlsym(handle, "rsContextDeinitToClient"),
+ .ContextDestroy = (ContextDestroyFnPtr)dlsym(handle, "rsContextDestroy"),
+ .ContextDump = (ContextDumpFnPtr)dlsym(handle, "rsContextDump"),
+ .ContextFinish = (ContextFinishFnPtr)dlsym(handle, "rsContextFinish"),
+ .ContextGetMessage = (ContextGetMessageFnPtr)dlsym(handle, "rsContextGetMessage"),
+ .ContextInitToClient = (ContextInitToClientFnPtr)dlsym(handle, "rsContextInitToClient"),
+ .ContextPeekMessage = (ContextPeekMessageFnPtr)dlsym(handle, "rsContextPeekMessage"),
+ .ContextSendMessage = (ContextSendMessageFnPtr)dlsym(handle, "rsContextSendMessage"),
+ .ContextSetCacheDir = (ContextSetCacheDirFnPtr)dlsym(handle, "rsContextSetCacheDir"),
+ .ContextSetPriority = (ContextSetPriorityFnPtr)dlsym(handle, "rsContextSetPriority"),
+ .DeviceCreate = (DeviceCreateFnPtr)nullptr,
+ .DeviceDestroy = (DeviceDestroyFnPtr)nullptr,
+ .DeviceSetConfig = (DeviceSetConfigFnPtr)nullptr,
+ .ElementCreate2 = (ElementCreate2FnPtr)dlsym(handle, "rsElementCreate2"),
+ .ElementCreate = (ElementCreateFnPtr)dlsym(handle, "rsElementCreate"),
+ .ElementGetNativeData = (ElementGetNativeDataFnPtr)dlsym(handle, "rsaElementGetNativeData"),
+ .ElementGetSubElements = (ElementGetSubElementsFnPtr)dlsym(handle, "rsaElementGetSubElements"),
+ .GetName = (GetNameFnPtr)dlsym(handle, "rsaGetName"),
+ .InvokeClosureCreate = (InvokeClosureCreateFnPtr)dlsym(handle, "rsInvokeClosureCreate"),
+ .ObjDestroy = (ObjDestroyFnPtr)dlsym(handle, "rsObjDestroy"),
+ .SamplerCreate = (SamplerCreateFnPtr)dlsym(handle, "rsSamplerCreate"),
+ .ScriptBindAllocation = (ScriptBindAllocationFnPtr)dlsym(handle, "rsScriptBindAllocation"),
+ .ScriptCCreate = (ScriptCCreateFnPtr)dlsym(handle, "rsScriptCCreate"),
+ .ScriptFieldIDCreate = (ScriptFieldIDCreateFnPtr)dlsym(handle, "rsScriptFieldIDCreate"),
+ .ScriptForEach = (ScriptForEachFnPtr)nullptr,
+ .ScriptForEachMulti = (ScriptForEachMultiFnPtr)dlsym(handle, "rsScriptForEachMulti"),
+ .ScriptGetVarV = (ScriptGetVarVFnPtr)dlsym(handle, "rsScriptGetVarV"),
+ .ScriptGroup2Create = (ScriptGroup2CreateFnPtr)dlsym(handle, "rsScriptGroup2Create"),
+ .ScriptGroupCreate = (ScriptGroupCreateFnPtr)dlsym(handle, "rsScriptGroupCreate"),
+ .ScriptGroupExecute = (ScriptGroupExecuteFnPtr)dlsym(handle, "rsScriptGroupExecute"),
+ .ScriptGroupSetInput = (ScriptGroupSetInputFnPtr)dlsym(handle, "rsScriptGroupSetInput"),
+ .ScriptGroupSetOutput = (ScriptGroupSetOutputFnPtr)dlsym(handle, "rsScriptGroupSetOutput"),
+ .ScriptIntrinsicCreate = (ScriptIntrinsicCreateFnPtr)dlsym(handle, "rsScriptIntrinsicCreate"),
+ .ScriptInvoke = (ScriptInvokeFnPtr)dlsym(handle, "rsScriptInvoke"),
+ .ScriptInvokeIDCreate = (ScriptInvokeIDCreateFnPtr)dlsym(handle, "rsScriptInvokeIDCreate"),
+ .ScriptInvokeV = (ScriptInvokeVFnPtr)dlsym(handle, "rsScriptInvokeV"),
+ .ScriptKernelIDCreate = (ScriptKernelIDCreateFnPtr)dlsym(handle, "rsScriptKernelIDCreate"),
+ .ScriptReduce = (ScriptReduceFnPtr)dlsym(handle, "rsScriptReduce"),
+ .ScriptSetTimeZone = (ScriptSetTimeZoneFnPtr)dlsym(handle, "rsScriptSetTimeZone"),
+ .ScriptSetVarD = (ScriptSetVarDFnPtr)dlsym(handle, "rsScriptSetVarD"),
+ .ScriptSetVarF = (ScriptSetVarFFnPtr)dlsym(handle, "rsScriptSetVarF"),
+ .ScriptSetVarI = (ScriptSetVarIFnPtr)dlsym(handle, "rsScriptSetVarI"),
+ .ScriptSetVarJ = (ScriptSetVarJFnPtr)dlsym(handle, "rsScriptSetVarJ"),
+ .ScriptSetVarObj = (ScriptSetVarObjFnPtr)dlsym(handle, "rsScriptSetVarObj"),
+ .ScriptSetVarVE = (ScriptSetVarVEFnPtr)dlsym(handle, "rsScriptSetVarVE"),
+ .ScriptSetVarV = (ScriptSetVarVFnPtr)dlsym(handle, "rsScriptSetVarV"),
+ .TypeCreate = (TypeCreateFnPtr)dlsym(handle, "rsTypeCreate"),
+ .TypeGetNativeData = (TypeGetNativeDataFnPtr)dlsym(handle, "rsaTypeGetNativeData"),
+ };
+
+ return dispatchHal;
+}
+
+} // namespace implementation
+} // namespace V1_0
+} // namespace renderscript
+} // namespace hardware
+} // namespace android
diff --git a/renderscript/1.0/default/Device.h b/renderscript/1.0/default/Device.h
new file mode 100644
index 0000000..f5bda37
--- /dev/null
+++ b/renderscript/1.0/default/Device.h
@@ -0,0 +1,44 @@
+#ifndef ANDROID_HARDWARE_RENDERSCRIPT_V1_0_DEVICE_H
+#define ANDROID_HARDWARE_RENDERSCRIPT_V1_0_DEVICE_H
+
+#include "cpp/rsDispatch.h"
+#include "dlfcn.h"
+#include <android/hardware/renderscript/1.0/IDevice.h>
+#include <hidl/MQDescriptor.h>
+#include <hidl/Status.h>
+
+namespace android {
+namespace hardware {
+namespace renderscript {
+namespace V1_0 {
+namespace implementation {
+
+using ::android::hardware::renderscript::V1_0::ContextType;
+using ::android::hardware::renderscript::V1_0::IContext;
+using ::android::hardware::renderscript::V1_0::IDevice;
+using ::android::hidl::base::V1_0::IBase;
+using ::android::hardware::Return;
+using ::android::sp;
+
+struct Device : public IDevice {
+ Device();
+ static dispatchTable& getHal();
+
+ // Methods from ::android::hardware::renderscript::V1_0::IDevice follow.
+ Return<sp<IContext>> contextCreate(uint32_t sdkVersion, ContextType ct, int32_t flags) override;
+
+ // Methods from ::android::hidl::base::V1_0::IBase follow.
+
+ private:
+ static dispatchTable mDispatchHal;
+};
+
+extern "C" IDevice* HIDL_FETCH_IDevice(const char* name);
+
+} // namespace implementation
+} // namespace V1_0
+} // namespace renderscript
+} // namespace hardware
+} // namespace android
+
+#endif // ANDROID_HARDWARE_RENDERSCRIPT_V1_0_DEVICE_H
diff --git a/renderscript/1.0/types.hal b/renderscript/1.0/types.hal
new file mode 100644
index 0000000..7c32188
--- /dev/null
+++ b/renderscript/1.0/types.hal
@@ -0,0 +1,253 @@
+/*
+ * Copyright (C) 2017 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.
+ */
+
+// TODO: Currently, most of the types are simply typedefs of uint64_t, so
+// misusing one type as another won't be caught by the compiler. Should we wrap
+// each type in a unique class to have stronger type guarantees?
+// TODO: is there an enum for intrinsics?
+
+package android.hardware.renderscript@1.0;
+
+// OpaqueHandle is an object that is used entirely in the driver but still needs
+// to be identified by the framework.
+typedef uint64_t OpaqueHandle;
+
+// A pointer is an actual local pointer that can be accessed by both the
+// framework and the driver. This is possible because RenderScript is always
+// running in Passthrough mode.
+typedef pointer Ptr;
+
+// This is an abstraction of size_t because it is not supported in HIDL.
+typedef uint64_t Size;
+
+// In RenderScript code, these are all defined as void*, but act only as
+// handles.
+typedef OpaqueHandle Allocation;
+typedef OpaqueHandle AllocationAdapter;
+typedef OpaqueHandle Closure;
+typedef OpaqueHandle Element;
+typedef OpaqueHandle NativeWindow;
+typedef OpaqueHandle ObjectBase;
+typedef OpaqueHandle Sampler;
+typedef OpaqueHandle Script;
+typedef OpaqueHandle ScriptFieldID;
+typedef OpaqueHandle ScriptGroup;
+typedef OpaqueHandle ScriptGroup2;
+typedef OpaqueHandle ScriptInvokeID;
+typedef OpaqueHandle ScriptKernelID;
+typedef OpaqueHandle Type;
+
+// types below are same as those in frameworks/rs/rsDefines.h
+
+@export(name="RsContextType", value_prefix="RS_CONTEXT_TYPE_")
+enum ContextType : int32_t {
+ NORMAL,
+ DEBUG,
+ PROFILE,
+};
+
+@export(name="RsAllocationUsageType", value_prefix="RS_ALLOCATION_USAGE_")
+enum AllocationUsageType : int32_t {
+ SCRIPT = 0x0001,
+ GRAPHICS_TEXTURE = 0x0002,
+ GRAPHICS_VERTEX = 0x0004,
+ GRAPHICS_CONSTANTS = 0x0008,
+ GRAPHICS_RENDER_TARGET = 0x0010,
+ IO_INPUT = 0x0020,
+ IO_OUTPUT = 0x0040,
+ SHARED = 0x0080,
+ OEM = 0x8000,
+ ALL = 0x80FF,
+};
+
+@export(name="RsAllocationMipmapControl", value_prefix="RS_ALLOCATION_MIPMAP_")
+enum AllocationMipmapControl : int32_t {
+ NONE = 0,
+ FULL = 1,
+ ON_SYNC_TO_TEXTURE = 2,
+};
+
+@export(name="RsAllocationCubemapFace",
+ value_prefix="RS_ALLOCATION_CUBEMAP_FACE_")
+enum AllocationCubemapFace : int32_t {
+ POSITIVE_X = 0,
+ NEGATIVE_X = 1,
+ POSITIVE_Y = 2,
+ NEGATIVE_Y = 3,
+ POSITIVE_Z = 4,
+ NEGATIVE_Z = 5,
+};
+
+@export(name="RsDataType", value_prefix="RS_TYPE_")
+enum DataType : int32_t {
+ NONE = 0,
+ FLOAT_16,
+ FLOAT_32,
+ FLOAT_64,
+ SIGNED_8,
+ SIGNED_16,
+ SIGNED_32,
+ SIGNED_64,
+ UNSIGNED_8,
+ UNSIGNED_16,
+ UNSIGNED_32,
+ UNSIGNED_64,
+ BOOLEAN,
+ UNSIGNED_5_6_5,
+ UNSIGNED_5_5_5_1,
+ UNSIGNED_4_4_4_4,
+ MATRIX_4X4,
+ MATRIX_3X3,
+ MATRIX_2X2,
+ ELEMENT = 1000,
+ TYPE,
+ ALLOCATION,
+ SAMPLER,
+ SCRIPT,
+ MESH,
+ PROGRAM_FRAGMENT,
+ PROGRAM_VERTEX,
+ PROGRAM_RASTER,
+ PROGRAM_STORE,
+ FONT,
+ INVALID = 10000,
+};
+
+@export(name="RsDataKind", value_prefix="RS_KIND_")
+enum DataKind : int32_t {
+ USER,
+ PIXEL_L = 7,
+ PIXEL_A,
+ PIXEL_LA,
+ PIXEL_RGB,
+ PIXEL_RGBA,
+ PIXEL_DEPTH,
+ PIXEL_YUV,
+ INVALID = 100,
+};
+
+@export(name="RsYuvFormat", value_prefix="RS_")
+enum YuvFormat : int32_t {
+ YUV_NONE = 0,
+ YUV_YV12 = 0x32315659, // HAL_PIXEL_FORMAT_YV12 in system/graphics.h
+ YUV_NV21 = 0x11, // HAL_PIXEL_FORMAT_YCrCb_420_SP
+ YUV_420_888 = 0x23, // HAL_PIXEL_FORMAT_YCbCr_420_888
+};
+
+@export(name="RsSamplerValue", value_prefix="RS_SAMPLER_")
+enum SamplerValue : int32_t {
+ NEAREST,
+ LINEAR,
+ LINEAR_MIP_LINEAR,
+ WRAP,
+ CLAMP,
+ LINEAR_MIP_NEAREST,
+ MIRRORED_REPEAT,
+ INVALID = 100,
+};
+
+@export(name="RsForEachStrategy", value_prefix="RS_FOR_EACH_STRATEGY_")
+enum ForEachStrategy : int32_t {
+ SERIAL = 0,
+ DONT_CARE = 1,
+ DST_LINEAR = 2,
+ TILE_SMALL = 3,
+ TILE_MEDIUM = 4,
+ TILE_LARGE = 5,
+};
+
+// Script to Script
+@export(name="RsScriptCall")
+struct ScriptCall {
+ ForEachStrategy strategy;
+ uint32_t xStart;
+ uint32_t xEnd;
+ uint32_t yStart;
+ uint32_t yEnd;
+ uint32_t zStart;
+ uint32_t zEnd;
+ uint32_t arrayStart;
+ uint32_t arrayEnd;
+ uint32_t array2Start;
+ uint32_t array2End;
+ uint32_t array3Start;
+ uint32_t array3End;
+ uint32_t array4Start;
+ uint32_t array4End;
+};
+
+@export(name="RsContextFlags", value_prefix="RS_CONTEXT_")
+enum ContextFlags : int32_t {
+ SYNCHRONOUS = 1<<0,
+ LOW_LATENCY = 1<<1,
+ LOW_POWER = 1<<2,
+ WAIT_FOR_ATTACH = 1<<3,
+};
+
+// types below are same as those in frameworks/rs/rsInternalDefines.h
+
+@export(name="RsMessageToClientType", value_prefix="RS_MESSAGE_TO_CLIENT_")
+enum MessageToClientType : int32_t {
+ NONE = 0,
+ EXCEPTION = 1,
+ RESIZE = 2,
+ ERROR = 3,
+ USER = 4,
+ NEW_BUFFER = 5,
+};
+
+@export(name="RsScriptIntrinsicID", value_prefix="RS_SCRIPT_INTRINSIC_")
+enum ScriptIntrinsicID : int32_t {
+ ID_UNDEFINED = 0,
+ ID_CONVOLVE_3X3 = 1,
+ ID_COLOR_MATRIX = 2,
+ ID_LUT = 3,
+ ID_CONVOLVE_5X5 = 4,
+ ID_BLUR = 5,
+ ID_YUV_TO_RGB = 6,
+ ID_BLEND = 7,
+ ID_3DLUT = 8,
+ ID_HISTOGRAM = 9,
+ // unused 10, 11
+ ID_RESIZE = 12,
+ ID_BLAS = 13,
+ ID_EXTBLAS = 14,
+ ID_OEM_START = 0x10000000,
+};
+
+@export(name="RsThreadPriorities", value_prefix="RS_THREAD_PRIORITY_")
+enum ThreadPriorities : int32_t {
+ LOW = 15,
+ NORMAL_GRAPHICS = -8,
+ NORMAL = -1,
+ LOW_LATENCY = -4,
+};
+
+// types below are same as those in
+// frameworks/compile/libbcc/include/bcinfo/MetadataExtractor.h
+
+@export(name="", value_prefix="RS_MD_")
+enum MetadataSignatureBitval : int32_t {
+ SIG_None = 0,
+ SIG_In = 1<<0,
+ SIG_Out = 1<<1,
+ SIG_Usr = 1<<2,
+ SIG_X = 1<<3,
+ SIG_Y = 1<<4,
+ SIG_Kernel = 1<<5,
+ SIG_Z = 1<<6,
+ SIG_Ctxt = 1<<7,
+};
diff --git a/example/Android.bp b/renderscript/Android.bp
similarity index 66%
rename from example/Android.bp
rename to renderscript/Android.bp
index ea6dbb5..ba90f2c 100644
--- a/example/Android.bp
+++ b/renderscript/Android.bp
@@ -1,4 +1,5 @@
// This is an autogenerated file, do not edit.
subdirs = [
- "extension/light/2.0",
+ "1.0",
+ "1.0/default",
]
diff --git a/sensors/1.0/Android.bp b/sensors/1.0/Android.bp
index 2995504..8357dbe 100644
--- a/sensors/1.0/Android.bp
+++ b/sensors/1.0/Android.bp
@@ -1,12 +1,19 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
+filegroup {
+ name: "android.hardware.sensors@1.0_hal",
+ srcs: [
+ "types.hal",
+ "ISensors.hal",
+ ],
+}
+
genrule {
name: "android.hardware.sensors@1.0_genc++",
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.sensors@1.0",
srcs: [
- "types.hal",
- "ISensors.hal",
+ ":android.hardware.sensors@1.0_hal",
],
out: [
"android/hardware/sensors/1.0/types.cpp",
@@ -19,8 +26,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.sensors@1.0",
srcs: [
- "types.hal",
- "ISensors.hal",
+ ":android.hardware.sensors@1.0_hal",
],
out: [
"android/hardware/sensors/1.0/types.h",
@@ -54,106 +60,3 @@
"android.hidl.base@1.0",
],
}
-
-genrule {
- name: "android.hardware.sensors.vts.driver@1.0_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.sensors@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/sensors/1.0/ $(genDir)/android/hardware/sensors/1.0/",
- srcs: [
- "types.hal",
- "ISensors.hal",
- ],
- out: [
- "android/hardware/sensors/1.0/types.vts.cpp",
- "android/hardware/sensors/1.0/Sensors.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.sensors.vts.driver@1.0_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.sensors@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/sensors/1.0/ $(genDir)/android/hardware/sensors/1.0/",
- srcs: [
- "types.hal",
- "ISensors.hal",
- ],
- out: [
- "android/hardware/sensors/1.0/types.vts.h",
- "android/hardware/sensors/1.0/Sensors.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.sensors.vts.driver@1.0",
- generated_sources: ["android.hardware.sensors.vts.driver@1.0_genc++"],
- generated_headers: ["android.hardware.sensors.vts.driver@1.0_genc++_headers"],
- export_generated_headers: ["android.hardware.sensors.vts.driver@1.0_genc++_headers"],
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libvts_common",
- "libvts_datatype",
- "libvts_measurement",
- "libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
- "android.hidl.base@1.0",
- "android.hardware.sensors@1.0",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "android.hidl.base@1.0",
- ],
-}
-
-genrule {
- name: "android.hardware.sensors@1.0-ISensors-vts.profiler_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.sensors@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/sensors/1.0/ $(genDir)/android/hardware/sensors/1.0/",
- srcs: [
- "ISensors.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/sensors/1.0/Sensors.vts.cpp",
- "android/hardware/sensors/1.0/types.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.sensors@1.0-ISensors-vts.profiler_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.sensors@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/sensors/1.0/ $(genDir)/android/hardware/sensors/1.0/",
- srcs: [
- "ISensors.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/sensors/1.0/Sensors.vts.h",
- "android/hardware/sensors/1.0/types.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.sensors@1.0-ISensors-vts.profiler",
- generated_sources: ["android.hardware.sensors@1.0-ISensors-vts.profiler_genc++"],
- generated_headers: ["android.hardware.sensors@1.0-ISensors-vts.profiler_genc++_headers"],
- export_generated_headers: ["android.hardware.sensors@1.0-ISensors-vts.profiler_genc++_headers"],
- shared_libs: [
- "libbase",
- "libhidlbase",
- "libhidltransport",
- "libvts_profiling",
- "libvts_multidevice_proto",
- "libprotobuf-cpp-full",
- "android.hidl.base@1.0",
- "android.hardware.sensors@1.0",
- ],
-}
diff --git a/sensors/1.0/Android.mk b/sensors/1.0/Android.mk
index 5784916..29f7c7e 100644
--- a/sensors/1.0/Android.mk
+++ b/sensors/1.0/Android.mk
@@ -8,7 +8,7 @@
LOCAL_MODULE := android.hardware.sensors@1.0-java-constants
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
#
diff --git a/sensors/1.0/default/Android.bp b/sensors/1.0/default/Android.bp
index 994febe..3930504 100644
--- a/sensors/1.0/default/Android.bp
+++ b/sensors/1.0/default/Android.bp
@@ -1,5 +1,6 @@
cc_library_shared {
name: "android.hardware.sensors@1.0-impl",
+ proprietary: true,
relative_install_path: "hw",
srcs: ["Sensors.cpp"],
shared_libs: [
diff --git a/sensors/1.0/default/Android.mk b/sensors/1.0/default/Android.mk
index f37c3cb..6a1aab4 100644
--- a/sensors/1.0/default/Android.mk
+++ b/sensors/1.0/default/Android.mk
@@ -2,6 +2,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE_RELATIVE_PATH := hw
+LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE := android.hardware.sensors@1.0-service
LOCAL_INIT_RC := android.hardware.sensors@1.0-service.rc
LOCAL_SRC_FILES := \
diff --git a/sensors/1.0/default/android.hardware.sensors@1.0-service.rc b/sensors/1.0/default/android.hardware.sensors@1.0-service.rc
index 2cba0fc..2360863 100644
--- a/sensors/1.0/default/android.hardware.sensors@1.0-service.rc
+++ b/sensors/1.0/default/android.hardware.sensors@1.0-service.rc
@@ -1,4 +1,4 @@
-service sensors-hal-1-0 /system/bin/hw/android.hardware.sensors@1.0-service
+service sensors-hal-1-0 /vendor/bin/hw/android.hardware.sensors@1.0-service
class main
user system
group system readproc
diff --git a/sensors/1.0/default/convert.cpp b/sensors/1.0/default/convert.cpp
index acff6ca..748a963 100644
--- a/sensors/1.0/default/convert.cpp
+++ b/sensors/1.0/default/convert.cpp
@@ -25,8 +25,8 @@
namespace implementation {
void convertFromSensor(const sensor_t &src, SensorInfo *dst) {
- dst->name = src.name;
- dst->vendor = src.vendor;
+ dst->name = src.name == nullptr ? "" : src.name;
+ dst->vendor = src.vendor == nullptr ? "" : src.vendor;
dst->version = src.version;
dst->sensorHandle = src.handle;
dst->type = (SensorType)src.type;
@@ -36,8 +36,8 @@
dst->minDelay = src.minDelay;
dst->fifoReservedEventCount = src.fifoReservedEventCount;
dst->fifoMaxEventCount = src.fifoMaxEventCount;
- dst->typeAsString = src.stringType;
- dst->requiredPermission = src.requiredPermission;
+ dst->typeAsString = src.stringType == nullptr ? "" : src.stringType;
+ dst->requiredPermission = src.requiredPermission == nullptr ? "" : src.requiredPermission;
dst->maxDelay = src.maxDelay;
dst->flags = src.flags;
}
@@ -75,6 +75,10 @@
case SensorType::META_DATA:
{
dst->u.meta.what = (MetaDataEventType)src.meta_data.what;
+ // Legacy HALs contain the handle reference in the meta data field.
+ // Copy that over to the handle of the event. In legacy HALs this
+ // field was expected to be 0.
+ dst->sensorHandle = src.meta_data.sensor;
break;
}
@@ -212,8 +216,12 @@
switch (src.sensorType) {
case SensorType::META_DATA:
{
+ // Legacy HALs expect the handle reference in the meta data field.
+ // Copy it over from the handle of the event.
dst->meta_data.what = (int32_t)src.u.meta.what;
- dst->meta_data.sensor = dst->sensor;
+ dst->meta_data.sensor = src.sensorHandle;
+ // Set the sensor handle to 0 to maintain compatibility.
+ dst->sensor = 0;
break;
}
diff --git a/sensors/1.0/default/service.cpp b/sensors/1.0/default/service.cpp
index 5bcfe4b..65f6d81 100644
--- a/sensors/1.0/default/service.cpp
+++ b/sensors/1.0/default/service.cpp
@@ -23,5 +23,9 @@
using android::hardware::defaultPassthroughServiceImplementation;
int main() {
- return defaultPassthroughServiceImplementation<ISensors>();
+ /* Sensors framework service needs at least two threads.
+ * One thread blocks on a "poll"
+ * The second thread is needed for all other HAL methods.
+ */
+ return defaultPassthroughServiceImplementation<ISensors>(2);
}
diff --git a/sensors/1.0/vts/Android.mk b/sensors/1.0/vts/Android.mk
deleted file mode 100644
index e22fba7..0000000
--- a/sensors/1.0/vts/Android.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-# include hidl test makefiles
-include $(LOCAL_PATH)/functional/vts/testcases/hal/sensors/hidl/Android.mk
diff --git a/sensors/1.0/vts/Sensors.vts b/sensors/1.0/vts/Sensors.vts
index 9e90755..558c36d 100644
--- a/sensors/1.0/vts/Sensors.vts
+++ b/sensors/1.0/vts/Sensors.vts
@@ -5,6 +5,7 @@
package: "android.hardware.sensors"
import: "android.hardware.sensors@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
api: {
diff --git a/sensors/1.0/vts/functional/vts/testcases/hal/sensors/__init__.py b/sensors/1.0/vts/functional/vts/testcases/hal/sensors/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/sensors/1.0/vts/functional/vts/testcases/hal/sensors/__init__.py
+++ /dev/null
diff --git a/sensors/1.0/vts/functional/vts/testcases/hal/sensors/hidl/Android.mk b/sensors/1.0/vts/functional/vts/testcases/hal/sensors/hidl/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/sensors/1.0/vts/functional/vts/testcases/hal/sensors/hidl/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/sensors/1.0/vts/functional/vts/testcases/hal/sensors/hidl/__init__.py b/sensors/1.0/vts/functional/vts/testcases/hal/sensors/hidl/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/sensors/1.0/vts/functional/vts/testcases/hal/sensors/hidl/__init__.py
+++ /dev/null
diff --git a/sensors/1.0/vts/functional/vts/testcases/hal/sensors/hidl/host/Android.mk b/sensors/1.0/vts/functional/vts/testcases/hal/sensors/hidl/host/Android.mk
deleted file mode 100644
index 79f8f7a..0000000
--- a/sensors/1.0/vts/functional/vts/testcases/hal/sensors/hidl/host/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := SensorsHidlTest
-VTS_CONFIG_SRC_DIR := testcases/hal/sensors/hidl/host
-include test/vts/tools/build/Android.host_config.mk
diff --git a/sensors/1.0/vts/functional/vts/testcases/hal/sensors/hidl/host/AndroidTest.xml b/sensors/1.0/vts/functional/vts/testcases/hal/sensors/hidl/host/AndroidTest.xml
deleted file mode 100644
index 6e40610..0000000
--- a/sensors/1.0/vts/functional/vts/testcases/hal/sensors/hidl/host/AndroidTest.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<configuration description="Config for VTS HAL sensors test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- <option name="cleanup" value="true" />
- <option name="push" value="spec/hardware/interfaces/sensors/1.0/vts/Sensors.vts->/data/local/tmp/spec/Sensors.vts" />
- <option name="push" value="spec/hardware/interfaces/sensors/1.0/vts/types.vts->/data/local/tmp/spec/types.vts" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="SensorsHidlTest" />
- <option name="test-case-path" value="vts/testcases/hal/sensors/hidl/host/SensorsHidlTest" />
- <option name="test-timeout" value="3m" />
- </test>
-</configuration>
diff --git a/sensors/1.0/vts/functional/vts/testcases/hal/sensors/hidl/host/SensorsHidlTest.py b/sensors/1.0/vts/functional/vts/testcases/hal/sensors/hidl/host/SensorsHidlTest.py
deleted file mode 100644
index 3c7fbbb..0000000
--- a/sensors/1.0/vts/functional/vts/testcases/hal/sensors/hidl/host/SensorsHidlTest.py
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/usr/bin/env python3.4
-#
-# Copyright (C) 2016 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.
-#
-
-import logging
-import time
-
-from vts.runners.host import asserts
-from vts.runners.host import base_test_with_webdb
-from vts.runners.host import test_runner
-from vts.utils.python.controllers import android_device
-from vts.utils.python.profiling import profiling_utils
-
-
-class SensorsHidlTest(base_test_with_webdb.BaseTestWithWebDbClass):
- """Host testcase class for the SENSORS HIDL HAL.
-
- This class set-up/tear-down the webDB host test framwork and contains host test cases for
- sensors HIDL HAL.
- """
-
- def setUpClass(self):
- """Creates a mirror and turns on the framework-layer SENSORS service."""
- self.dut = self.registerController(android_device)[0]
-
- self.dut.shell.InvokeTerminal("one")
- self.dut.shell.one.Execute("setenforce 0") # SELinux permissive mode
-
- # Test using the binderized mode
- self.dut.shell.one.Execute(
- "setprop vts.hal.vts.hidl.get_stub true")
-
- self.dut.hal.InitHidlHal(
- target_type="sensors",
- target_basepaths=self.dut.libPaths,
- target_version=1.0,
- target_package="android.hardware.sensors",
- target_component_name="ISensors",
- hw_binder_service_name=None,
- bits=64 if self.dut.is64Bit else 32)
-
- def tearDownClass(self):
- """ If profiling is enabled for the test, collect the profiling data
- and disable profiling after the test is done.
- """
- if self.enable_profiling:
- self.ProcessAndUploadTraceData()
-
- def setUpTest(self):
- if self.enable_profiling:
- profiling_utils.EnableVTSProfiling(self.dut.shell.one)
-
- def tearDownTest(self):
- if self.enable_profiling:
- profiling_trace_path = getattr(
- self, self.VTS_PROFILING_TRACING_PATH, "")
- self.ProcessTraceDataForTestCase(self.dut, profiling_trace_path)
- profiling_utils.DisableVTSProfiling(self.dut.shell.one)
-
- def testSensorsBasic(self):
- """Test the basic operation of test framework and sensor HIDL HAL
-
- This test obtains predefined enum values via sensors HIDL HAL host test framework and
- compares them to known values as a sanity check to make sure both sensors HAL
- and the test framework are working properly.
- """
- sensors_types = self.dut.hal.sensors.GetHidlTypeInterface("types")
- logging.info("sensors_types: %s", sensors_types)
- logging.info("OK: %s", sensors_types.OK)
- logging.info("BAD_VALUE: %s", sensors_types.BAD_VALUE)
- logging.info("PERMISSION_DENIED: %s", sensors_types.PERMISSION_DENIED)
- logging.info("INVALID_OPERATION: %s", sensors_types.INVALID_OPERATION)
- asserts.assertEqual(sensors_types.OK, 0);
- asserts.assertEqual(sensors_types.BAD_VALUE, -22);
-
- logging.info("sensor types:")
- logging.info("SENSOR_TYPE_ACCELEROMETER: %s", sensors_types.SENSOR_TYPE_ACCELEROMETER)
- logging.info("SENSOR_TYPE_GEOMAGNETIC_FIELD: %s", sensors_types.SENSOR_TYPE_GEOMAGNETIC_FIELD)
- logging.info("SENSOR_TYPE_GYROSCOPE: %s", sensors_types.SENSOR_TYPE_GYROSCOPE)
- asserts.assertEqual(sensors_types.SENSOR_TYPE_ACCELEROMETER, 1);
- asserts.assertEqual(sensors_types.SENSOR_TYPE_GEOMAGNETIC_FIELD, 2);
- asserts.assertEqual(sensors_types.SENSOR_TYPE_GYROSCOPE, 4);
-
-if __name__ == "__main__":
- test_runner.main()
diff --git a/sensors/1.0/vts/functional/vts/testcases/hal/sensors/hidl/host/__init__.py b/sensors/1.0/vts/functional/vts/testcases/hal/sensors/hidl/host/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/sensors/1.0/vts/functional/vts/testcases/hal/sensors/hidl/host/__init__.py
+++ /dev/null
diff --git a/sensors/1.0/vts/functional/vts/testcases/hal/sensors/hidl/host_profiling/Android.mk b/sensors/1.0/vts/functional/vts/testcases/hal/sensors/hidl/host_profiling/Android.mk
deleted file mode 100644
index 6029cc0..0000000
--- a/sensors/1.0/vts/functional/vts/testcases/hal/sensors/hidl/host_profiling/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := SensorsHidlProfilingTest
-VTS_CONFIG_SRC_DIR := testcases/hal/sensors/hidl/host_profiling
-include test/vts/tools/build/Android.host_config.mk
diff --git a/sensors/1.0/vts/functional/vts/testcases/hal/sensors/hidl/host_profiling/AndroidTest.xml b/sensors/1.0/vts/functional/vts/testcases/hal/sensors/hidl/host_profiling/AndroidTest.xml
deleted file mode 100644
index c056d90..0000000
--- a/sensors/1.0/vts/functional/vts/testcases/hal/sensors/hidl/host_profiling/AndroidTest.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<configuration description="Config for VTS HAL sensors test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- <option name="cleanup" value="true" />
- <option name="push" value="spec/hardware/interfaces/sensors/1.0/vts/Sensors.vts->/data/local/tmp/spec/Sensors.vts" />
- <option name="push" value="spec/hardware/interfaces/sensors/1.0/vts/types.vts->/data/local/tmp/spec/types.vts" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="SensorsHidlProfilingTest" />
- <option name="test-case-path" value="vts/testcases/hal/sensors/hidl/host/SensorsHidlTest" />
- <option name="test-timeout" value="3m" />
- <option name="enable-profiling" value="true" />
- </test>
-</configuration>
diff --git a/sensors/1.0/vts/functional/vts/testcases/hal/sensors/hidl/target/Android.mk b/sensors/1.0/vts/functional/vts/testcases/hal/sensors/hidl/target/Android.mk
deleted file mode 100644
index c71a661..0000000
--- a/sensors/1.0/vts/functional/vts/testcases/hal/sensors/hidl/target/Android.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := SensorsHidlTargetTest
-VTS_CONFIG_SRC_DIR := testcases/hal/sensors/hidl/target
-include test/vts/tools/build/Android.host_config.mk
diff --git a/sensors/1.0/vts/functional/vts/testcases/hal/sensors/hidl/target/AndroidTest.xml b/sensors/1.0/vts/functional/vts/testcases/hal/sensors/hidl/target/AndroidTest.xml
deleted file mode 100644
index 6329d5d..0000000
--- a/sensors/1.0/vts/functional/vts/testcases/hal/sensors/hidl/target/AndroidTest.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<configuration description="Config for VTS sensors HIDL HAL's target-side test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="SensorsHidlTargetTest" />
- <option name="binary-test-sources" value="
- _32bit::DATA/nativetest/sensors_hidl_hal_test/sensors_hidl_hal_test,
- _64bit::DATA/nativetest64/sensors_hidl_hal_test/sensors_hidl_hal_test,
- "/>
- <option name="binary-test-type" value="gtest" />
- <option name="binary-test-disable-framework" value="true" />
- <option name="test-timeout" value="10m" />
- </test>
-</configuration>
-
diff --git a/sensors/1.0/vts/functional/vts/testcases/hal/sensors/hidl/target_profiling/Android.mk b/sensors/1.0/vts/functional/vts/testcases/hal/sensors/hidl/target_profiling/Android.mk
deleted file mode 100644
index 1b81381..0000000
--- a/sensors/1.0/vts/functional/vts/testcases/hal/sensors/hidl/target_profiling/Android.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := SensorsHidlTargetProfilingTest
-VTS_CONFIG_SRC_DIR := testcases/hal/sensors/hidl/target_profiling
-include test/vts/tools/build/Android.host_config.mk
diff --git a/sensors/1.0/vts/functional/vts/testcases/hal/sensors/hidl/target_profiling/AndroidTest.xml b/sensors/1.0/vts/functional/vts/testcases/hal/sensors/hidl/target_profiling/AndroidTest.xml
deleted file mode 100644
index 80e46b7..0000000
--- a/sensors/1.0/vts/functional/vts/testcases/hal/sensors/hidl/target_profiling/AndroidTest.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<configuration description="Config for VTS sensors HIDL HAL's target-side test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="SensorsHidlTargetProfilingTest" />
- <option name="binary-test-sources" value="
- _32bit::DATA/nativetest/sensors_hidl_hal_test/sensors_hidl_hal_test,
- _64bit::DATA/nativetest64/sensors_hidl_hal_test/sensors_hidl_hal_test,
- "/>
- <option name="binary-test-type" value="gtest" />
- <option name="binary-test-disable-framework" value="true" />
- <option name="test-timeout" value="10m" />
- <option name="enable-profiling" value="true" />
- </test>
-</configuration>
-
diff --git a/sensors/1.0/vts/types.vts b/sensors/1.0/vts/types.vts
index 1b48916..bc87823 100644
--- a/sensors/1.0/vts/types.vts
+++ b/sensors/1.0/vts/types.vts
@@ -374,6 +374,7 @@
struct_value: {
name: "flags"
type: TYPE_MASK
+ scalar_type: "uint32_t"
predefined_type: "::android::hardware::sensors::V1_0::SensorFlagBits"
}
}
@@ -546,8 +547,8 @@
struct_value: {
name: "uuid"
type: TYPE_ARRAY
+ vector_size: 16
vector_value: {
- vector_size: 16
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -652,8 +653,8 @@
union_value: {
name: "data_int32"
type: TYPE_ARRAY
+ vector_size: 14
vector_value: {
- vector_size: 14
type: TYPE_SCALAR
scalar_type: "int32_t"
}
@@ -661,8 +662,8 @@
union_value: {
name: "data_float"
type: TYPE_ARRAY
+ vector_size: 14
vector_value: {
- vector_size: 14
type: TYPE_SCALAR
scalar_type: "float_t"
}
@@ -726,8 +727,8 @@
union_value: {
name: "pose6DOF"
type: TYPE_ARRAY
+ vector_size: 15
vector_value: {
- vector_size: 15
type: TYPE_SCALAR
scalar_type: "float_t"
}
@@ -745,8 +746,8 @@
union_value: {
name: "data"
type: TYPE_ARRAY
+ vector_size: 16
vector_value: {
- vector_size: 16
type: TYPE_SCALAR
scalar_type: "float_t"
}
diff --git a/soundtrigger/2.0/Android.bp b/soundtrigger/2.0/Android.bp
index 5b50f39..4d2bb1a 100644
--- a/soundtrigger/2.0/Android.bp
+++ b/soundtrigger/2.0/Android.bp
@@ -1,13 +1,20 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
+filegroup {
+ name: "android.hardware.soundtrigger@2.0_hal",
+ srcs: [
+ "types.hal",
+ "ISoundTriggerHw.hal",
+ "ISoundTriggerHwCallback.hal",
+ ],
+}
+
genrule {
name: "android.hardware.soundtrigger@2.0_genc++",
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.soundtrigger@2.0",
srcs: [
- "types.hal",
- "ISoundTriggerHw.hal",
- "ISoundTriggerHwCallback.hal",
+ ":android.hardware.soundtrigger@2.0_hal",
],
out: [
"android/hardware/soundtrigger/2.0/types.cpp",
@@ -21,9 +28,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.soundtrigger@2.0",
srcs: [
- "types.hal",
- "ISoundTriggerHw.hal",
- "ISoundTriggerHwCallback.hal",
+ ":android.hardware.soundtrigger@2.0_hal",
],
out: [
"android/hardware/soundtrigger/2.0/types.h",
@@ -64,159 +69,3 @@
"android.hidl.base@1.0",
],
}
-
-genrule {
- name: "android.hardware.soundtrigger.vts.driver@2.0_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.soundtrigger@2.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/soundtrigger/2.0/ $(genDir)/android/hardware/soundtrigger/2.0/",
- srcs: [
- "types.hal",
- "ISoundTriggerHw.hal",
- "ISoundTriggerHwCallback.hal",
- ],
- out: [
- "android/hardware/soundtrigger/2.0/types.vts.cpp",
- "android/hardware/soundtrigger/2.0/SoundTriggerHw.vts.cpp",
- "android/hardware/soundtrigger/2.0/SoundTriggerHwCallback.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.soundtrigger.vts.driver@2.0_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.soundtrigger@2.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/soundtrigger/2.0/ $(genDir)/android/hardware/soundtrigger/2.0/",
- srcs: [
- "types.hal",
- "ISoundTriggerHw.hal",
- "ISoundTriggerHwCallback.hal",
- ],
- out: [
- "android/hardware/soundtrigger/2.0/types.vts.h",
- "android/hardware/soundtrigger/2.0/SoundTriggerHw.vts.h",
- "android/hardware/soundtrigger/2.0/SoundTriggerHwCallback.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.soundtrigger.vts.driver@2.0",
- generated_sources: ["android.hardware.soundtrigger.vts.driver@2.0_genc++"],
- generated_headers: ["android.hardware.soundtrigger.vts.driver@2.0_genc++_headers"],
- export_generated_headers: ["android.hardware.soundtrigger.vts.driver@2.0_genc++_headers"],
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libvts_common",
- "libvts_datatype",
- "libvts_measurement",
- "libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
- "android.hardware.audio.common@2.0",
- "android.hidl.base@1.0",
- "android.hardware.soundtrigger@2.0",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "android.hardware.audio.common@2.0",
- "android.hidl.base@1.0",
- ],
-}
-
-genrule {
- name: "android.hardware.soundtrigger@2.0-ISoundTriggerHw-vts.profiler_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.soundtrigger@2.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/soundtrigger/2.0/ $(genDir)/android/hardware/soundtrigger/2.0/",
- srcs: [
- "ISoundTriggerHw.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/soundtrigger/2.0/SoundTriggerHw.vts.cpp",
- "android/hardware/soundtrigger/2.0/types.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.soundtrigger@2.0-ISoundTriggerHw-vts.profiler_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.soundtrigger@2.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/soundtrigger/2.0/ $(genDir)/android/hardware/soundtrigger/2.0/",
- srcs: [
- "ISoundTriggerHw.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/soundtrigger/2.0/SoundTriggerHw.vts.h",
- "android/hardware/soundtrigger/2.0/types.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.soundtrigger@2.0-ISoundTriggerHw-vts.profiler",
- generated_sources: ["android.hardware.soundtrigger@2.0-ISoundTriggerHw-vts.profiler_genc++"],
- generated_headers: ["android.hardware.soundtrigger@2.0-ISoundTriggerHw-vts.profiler_genc++_headers"],
- export_generated_headers: ["android.hardware.soundtrigger@2.0-ISoundTriggerHw-vts.profiler_genc++_headers"],
- shared_libs: [
- "libbase",
- "libhidlbase",
- "libhidltransport",
- "libvts_profiling",
- "libvts_multidevice_proto",
- "libprotobuf-cpp-full",
- "android.hardware.audio.common@2.0",
- "android.hidl.base@1.0",
- "android.hardware.soundtrigger@2.0",
- ],
-}
-
-genrule {
- name: "android.hardware.soundtrigger@2.0-ISoundTriggerHwCallback-vts.profiler_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.soundtrigger@2.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/soundtrigger/2.0/ $(genDir)/android/hardware/soundtrigger/2.0/",
- srcs: [
- "ISoundTriggerHwCallback.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/soundtrigger/2.0/SoundTriggerHwCallback.vts.cpp",
- "android/hardware/soundtrigger/2.0/types.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.soundtrigger@2.0-ISoundTriggerHwCallback-vts.profiler_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.soundtrigger@2.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/soundtrigger/2.0/ $(genDir)/android/hardware/soundtrigger/2.0/",
- srcs: [
- "ISoundTriggerHwCallback.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/soundtrigger/2.0/SoundTriggerHwCallback.vts.h",
- "android/hardware/soundtrigger/2.0/types.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.soundtrigger@2.0-ISoundTriggerHwCallback-vts.profiler",
- generated_sources: ["android.hardware.soundtrigger@2.0-ISoundTriggerHwCallback-vts.profiler_genc++"],
- generated_headers: ["android.hardware.soundtrigger@2.0-ISoundTriggerHwCallback-vts.profiler_genc++_headers"],
- export_generated_headers: ["android.hardware.soundtrigger@2.0-ISoundTriggerHwCallback-vts.profiler_genc++_headers"],
- shared_libs: [
- "libbase",
- "libhidlbase",
- "libhidltransport",
- "libvts_profiling",
- "libvts_multidevice_proto",
- "libprotobuf-cpp-full",
- "android.hardware.audio.common@2.0",
- "android.hidl.base@1.0",
- "android.hardware.soundtrigger@2.0",
- ],
-}
diff --git a/soundtrigger/2.0/default/Android.mk b/soundtrigger/2.0/default/Android.mk
index 498c54f..70c78e0 100644
--- a/soundtrigger/2.0/default/Android.mk
+++ b/soundtrigger/2.0/default/Android.mk
@@ -18,6 +18,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.soundtrigger@2.0-impl
+LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_SRC_FILES := \
SoundTriggerHalImpl.cpp
diff --git a/soundtrigger/2.0/vts/functional/Android.mk b/soundtrigger/2.0/vts/functional/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/soundtrigger/2.0/vts/functional/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/soundtrigger/2.0/vts/functional/vts/Android.mk b/soundtrigger/2.0/vts/functional/vts/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/soundtrigger/2.0/vts/functional/vts/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/soundtrigger/2.0/vts/functional/vts/testcases/Android.mk b/soundtrigger/2.0/vts/functional/vts/testcases/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/soundtrigger/2.0/vts/functional/vts/testcases/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/soundtrigger/2.0/vts/functional/vts/testcases/hal/Android.mk b/soundtrigger/2.0/vts/functional/vts/testcases/hal/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/soundtrigger/2.0/vts/functional/vts/testcases/hal/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/soundtrigger/2.0/vts/functional/vts/testcases/hal/soundtrigger/Android.mk b/soundtrigger/2.0/vts/functional/vts/testcases/hal/soundtrigger/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/soundtrigger/2.0/vts/functional/vts/testcases/hal/soundtrigger/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/soundtrigger/2.0/vts/functional/vts/testcases/hal/soundtrigger/hidl/Android.mk b/soundtrigger/2.0/vts/functional/vts/testcases/hal/soundtrigger/hidl/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/soundtrigger/2.0/vts/functional/vts/testcases/hal/soundtrigger/hidl/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/soundtrigger/2.0/vts/functional/vts/testcases/hal/soundtrigger/hidl/target/Android.mk b/soundtrigger/2.0/vts/functional/vts/testcases/hal/soundtrigger/hidl/target/Android.mk
deleted file mode 100644
index a99f4ce..0000000
--- a/soundtrigger/2.0/vts/functional/vts/testcases/hal/soundtrigger/hidl/target/Android.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := HalSoundTriggerHidlTargetBasicTest
-VTS_CONFIG_SRC_DIR := testcases/hal/soundtrigger/hidl/target
-include test/vts/tools/build/Android.host_config.mk
diff --git a/soundtrigger/2.0/vts/functional/vts/testcases/hal/soundtrigger/hidl/target/AndroidTest.xml b/soundtrigger/2.0/vts/functional/vts/testcases/hal/soundtrigger/hidl/target/AndroidTest.xml
deleted file mode 100644
index d450315..0000000
--- a/soundtrigger/2.0/vts/functional/vts/testcases/hal/soundtrigger/hidl/target/AndroidTest.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<configuration description="Config for VTS sound trigger HIDL HAL's basic target-side test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="HalSoundTriggerHidlTargetBasicTest" />
- <option name="binary-test-sources" value="
- _32bit::DATA/nativetest/soundtrigger_hidl_hal_test/soundtrigger_hidl_hal_test,
- _64bit::DATA/nativetest64/soundtrigger_hidl_hal_test/soundtrigger_hidl_hal_test,
- "/>
- <option name="test-config-path" value="vts/testcases/hal/soundtrigger/hidl/target/HalSoundTriggerHidlTargetBasicTest.config" />
- <option name="binary-test-type" value="hal_hidl_gtest" />
- <option name="precondition-file-path-prefix" value="/*/lib/hw/sound_trigger.primary." />
- <option name="skip-on-64bit-abi" value="true" />
- <option name="test-timeout" value="1m" />
- </test>
-</configuration>
diff --git a/soundtrigger/2.0/vts/functional/vts/testcases/hal/soundtrigger/hidl/target/HalSoundTriggerHidlTargetBasicTest.config b/soundtrigger/2.0/vts/functional/vts/testcases/hal/soundtrigger/hidl/target/HalSoundTriggerHidlTargetBasicTest.config
deleted file mode 100644
index 5c12d13..0000000
--- a/soundtrigger/2.0/vts/functional/vts/testcases/hal/soundtrigger/hidl/target/HalSoundTriggerHidlTargetBasicTest.config
+++ /dev/null
@@ -1,41 +0,0 @@
-{
- "use_gae_db": true,
- "coverage": true,
- "modules": [
- {
- "module_name": "system/lib/hw/sound_trigger.primary.bullhead",
- "git_project": {
- "name": "platform/vendor/lge/bullhead",
- "path": "vendor/lge/bullhead"
- }
- },
- {
- "module_name": "system/lib/hw/sound_trigger.primary.angler",
- "git_project": {
- "name": "platform/vendor/huawei/angler",
- "path": "vendor/huawei/angler"
- }
- },
- {
- "module_name": "system/lib/hw/sound_trigger.primary.marlin",
- "git_project": {
- "name": "platform/vendor/google_devices/marlin",
- "path": "vendor/google_devices/marlin"
- }
- },
- {
- "module_name": "system/lib/hw/sound_trigger.primary.sailfish",
- "git_project": {
- "name": "platform/vendor/google_devices/marlin",
- "path": "vendor/google_devices/marlin"
- }
- },
- {
- "module_name": "system/lib/hw/android.hardware.soundtrigger@2.0-impl",
- "git_project": {
- "name": "platform/hardware/interfaces",
- "path": "hardware/interfaces"
- }
- }
- ]
-}
diff --git a/soundtrigger/2.0/vts/functional/vts/testcases/hal/soundtrigger/hidl/target_profiling/Android.mk b/soundtrigger/2.0/vts/functional/vts/testcases/hal/soundtrigger/hidl/target_profiling/Android.mk
deleted file mode 100644
index fc0f9c4..0000000
--- a/soundtrigger/2.0/vts/functional/vts/testcases/hal/soundtrigger/hidl/target_profiling/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := HalSoundTriggerHidlTargetBasicProfilingTest
-VTS_CONFIG_SRC_DIR := testcases/hal/soundtrigger/hidl/target_profiling
-include test/vts/tools/build/Android.host_config.mk
diff --git a/soundtrigger/2.0/vts/functional/vts/testcases/hal/soundtrigger/hidl/target_profiling/AndroidTest.xml b/soundtrigger/2.0/vts/functional/vts/testcases/hal/soundtrigger/hidl/target_profiling/AndroidTest.xml
deleted file mode 100644
index cd95b5f..0000000
--- a/soundtrigger/2.0/vts/functional/vts/testcases/hal/soundtrigger/hidl/target_profiling/AndroidTest.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<configuration description="Config for VTS sound trigger HIDL HAL's basic target-side, profiling test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="HalSoundTriggerHidlTargetBasicProfilingTest" />
- <option name="binary-test-sources" value="
- _32bit::DATA/nativetest/soundtrigger_hidl_hal_test/soundtrigger_hidl_hal_test,
- _64bit::DATA/nativetest64/soundtrigger_hidl_hal_test/soundtrigger_hidl_hal_test,
- "/>
- <option name="binary-test-type" value="hal_hidl_gtest" />
- <option name="precondition-file-path-prefix" value="*/lib/hw/sound_trigger.primary." />
- <option name="test-timeout" value="1m" />
- <option name="enable-profiling" value="true" />
- </test>
-</configuration>
diff --git a/tests/Android.bp b/tests/Android.bp
index 8b3e8b1..040a6fb 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -4,6 +4,7 @@
"bar/1.0/default",
"baz/1.0",
"expression/1.0",
+ "extension/light/2.0",
"foo/1.0",
"foo/1.0/default",
"foo/1.0/default/lib",
@@ -17,4 +18,7 @@
"pointer/1.0",
"pointer/1.0/default",
"pointer/1.0/default/lib",
+ "versioning/1.0",
+ "versioning/2.2",
+ "versioning/2.3",
]
diff --git a/tests/bar/1.0/Android.bp b/tests/bar/1.0/Android.bp
index fbec8d1..694804c 100644
--- a/tests/bar/1.0/Android.bp
+++ b/tests/bar/1.0/Android.bp
@@ -1,9 +1,7 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
-genrule {
- name: "android.hardware.tests.bar@1.0_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.bar@1.0",
+filegroup {
+ name: "android.hardware.tests.bar@1.0_hal",
srcs: [
"types.hal",
"IBar.hal",
@@ -12,6 +10,15 @@
"IImportRules.hal",
"IImportTypes.hal",
],
+}
+
+genrule {
+ name: "android.hardware.tests.bar@1.0_genc++",
+ tools: ["hidl-gen"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.bar@1.0",
+ srcs: [
+ ":android.hardware.tests.bar@1.0_hal",
+ ],
out: [
"android/hardware/tests/bar/1.0/types.cpp",
"android/hardware/tests/bar/1.0/BarAll.cpp",
@@ -27,12 +34,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.bar@1.0",
srcs: [
- "types.hal",
- "IBar.hal",
- "IComplicated.hal",
- "IFooCallback.hal",
- "IImportRules.hal",
- "IImportTypes.hal",
+ ":android.hardware.tests.bar@1.0_hal",
],
out: [
"android/hardware/tests/bar/1.0/types.h",
diff --git a/tests/bar/1.0/default/Android.bp b/tests/bar/1.0/default/Android.bp
index 7e349c2..2c79357 100644
--- a/tests/bar/1.0/default/Android.bp
+++ b/tests/bar/1.0/default/Android.bp
@@ -3,6 +3,7 @@
cc_library_shared {
name: "android.hardware.tests.bar@1.0-impl",
relative_install_path: "hw",
+ proprietary: true,
srcs: [
"Bar.cpp",
"ImportTypes.cpp",
diff --git a/tests/baz/1.0/Android.bp b/tests/baz/1.0/Android.bp
index 4106838..7939444 100644
--- a/tests/baz/1.0/Android.bp
+++ b/tests/baz/1.0/Android.bp
@@ -1,15 +1,22 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
-genrule {
- name: "android.hardware.tests.baz@1.0_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.baz@1.0",
+filegroup {
+ name: "android.hardware.tests.baz@1.0_hal",
srcs: [
"types.hal",
"IBase.hal",
"IBaz.hal",
"IBazCallback.hal",
],
+}
+
+genrule {
+ name: "android.hardware.tests.baz@1.0_genc++",
+ tools: ["hidl-gen"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.baz@1.0",
+ srcs: [
+ ":android.hardware.tests.baz@1.0_hal",
+ ],
out: [
"android/hardware/tests/baz/1.0/types.cpp",
"android/hardware/tests/baz/1.0/BaseAll.cpp",
@@ -23,10 +30,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.baz@1.0",
srcs: [
- "types.hal",
- "IBase.hal",
- "IBaz.hal",
- "IBazCallback.hal",
+ ":android.hardware.tests.baz@1.0_hal",
],
out: [
"android/hardware/tests/baz/1.0/types.h",
diff --git a/tests/baz/1.0/Android.mk b/tests/baz/1.0/Android.mk
index 82ba3cb..40026ec 100644
--- a/tests/baz/1.0/Android.mk
+++ b/tests/baz/1.0/Android.mk
@@ -8,7 +8,7 @@
LOCAL_MODULE := android.hardware.tests.baz@1.0-java
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -85,7 +85,7 @@
LOCAL_MODULE := android.hardware.tests.baz@1.0-java-static
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
diff --git a/tests/expression/1.0/Android.bp b/tests/expression/1.0/Android.bp
index bb7aedd..5279503 100644
--- a/tests/expression/1.0/Android.bp
+++ b/tests/expression/1.0/Android.bp
@@ -1,12 +1,19 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
+filegroup {
+ name: "android.hardware.tests.expression@1.0_hal",
+ srcs: [
+ "IExpression.hal",
+ "IExpressionExt.hal",
+ ],
+}
+
genrule {
name: "android.hardware.tests.expression@1.0_genc++",
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.expression@1.0",
srcs: [
- "IExpression.hal",
- "IExpressionExt.hal",
+ ":android.hardware.tests.expression@1.0_hal",
],
out: [
"android/hardware/tests/expression/1.0/ExpressionAll.cpp",
@@ -19,8 +26,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.expression@1.0",
srcs: [
- "IExpression.hal",
- "IExpressionExt.hal",
+ ":android.hardware.tests.expression@1.0_hal",
],
out: [
"android/hardware/tests/expression/1.0/IExpression.h",
diff --git a/tests/expression/1.0/Android.mk b/tests/expression/1.0/Android.mk
index 1c7da4b..6bc9390 100644
--- a/tests/expression/1.0/Android.mk
+++ b/tests/expression/1.0/Android.mk
@@ -8,7 +8,7 @@
LOCAL_MODULE := android.hardware.tests.expression@1.0-java
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -64,7 +64,7 @@
LOCAL_MODULE := android.hardware.tests.expression@1.0-java-static
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
diff --git a/tests/extension/light/2.0/Android.bp b/tests/extension/light/2.0/Android.bp
new file mode 100644
index 0000000..5203da6
--- /dev/null
+++ b/tests/extension/light/2.0/Android.bp
@@ -0,0 +1,62 @@
+// This file is autogenerated by hidl-gen. Do not edit manually.
+
+filegroup {
+ name: "android.hardware.tests.extension.light@2.0_hal",
+ srcs: [
+ "types.hal",
+ "IExtLight.hal",
+ ],
+}
+
+genrule {
+ name: "android.hardware.tests.extension.light@2.0_genc++",
+ tools: ["hidl-gen"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.extension.light@2.0",
+ srcs: [
+ ":android.hardware.tests.extension.light@2.0_hal",
+ ],
+ out: [
+ "android/hardware/tests/extension/light/2.0/types.cpp",
+ "android/hardware/tests/extension/light/2.0/ExtLightAll.cpp",
+ ],
+}
+
+genrule {
+ name: "android.hardware.tests.extension.light@2.0_genc++_headers",
+ tools: ["hidl-gen"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.extension.light@2.0",
+ srcs: [
+ ":android.hardware.tests.extension.light@2.0_hal",
+ ],
+ out: [
+ "android/hardware/tests/extension/light/2.0/types.h",
+ "android/hardware/tests/extension/light/2.0/IExtLight.h",
+ "android/hardware/tests/extension/light/2.0/IHwExtLight.h",
+ "android/hardware/tests/extension/light/2.0/BnHwExtLight.h",
+ "android/hardware/tests/extension/light/2.0/BpHwExtLight.h",
+ "android/hardware/tests/extension/light/2.0/BsExtLight.h",
+ ],
+}
+
+cc_library_shared {
+ name: "android.hardware.tests.extension.light@2.0",
+ generated_sources: ["android.hardware.tests.extension.light@2.0_genc++"],
+ generated_headers: ["android.hardware.tests.extension.light@2.0_genc++_headers"],
+ export_generated_headers: ["android.hardware.tests.extension.light@2.0_genc++_headers"],
+ shared_libs: [
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "liblog",
+ "libutils",
+ "libcutils",
+ "android.hardware.light@2.0",
+ ],
+ export_shared_lib_headers: [
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "libutils",
+ "android.hardware.light@2.0",
+ ],
+}
diff --git a/example/extension/light/2.0/Android.mk b/tests/extension/light/2.0/Android.mk
similarity index 76%
rename from example/extension/light/2.0/Android.mk
rename to tests/extension/light/2.0/Android.mk
index deb7a2a..16424a3 100644
--- a/example/extension/light/2.0/Android.mk
+++ b/tests/extension/light/2.0/Android.mk
@@ -5,10 +5,10 @@
################################################################################
include $(CLEAR_VARS)
-LOCAL_MODULE := android.hardware.example.extension.light@2.0-java
+LOCAL_MODULE := android.hardware.tests.extension.light@2.0-java
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -20,7 +20,7 @@
#
# Build types.hal (Default)
#
-GEN := $(intermediates)/android/hardware/example/extension/light/V2_0/Default.java
+GEN := $(intermediates)/android/hardware/tests/extension/light/V2_0/Default.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -30,7 +30,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.example.extension.light@2.0::types.Default
+ android.hardware.tests.extension.light@2.0::types.Default
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -39,7 +39,7 @@
#
# Build types.hal (ExtBrightness)
#
-GEN := $(intermediates)/android/hardware/example/extension/light/V2_0/ExtBrightness.java
+GEN := $(intermediates)/android/hardware/tests/extension/light/V2_0/ExtBrightness.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -49,7 +49,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.example.extension.light@2.0::types.ExtBrightness
+ android.hardware.tests.extension.light@2.0::types.ExtBrightness
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -58,7 +58,7 @@
#
# Build types.hal (ExtLightState)
#
-GEN := $(intermediates)/android/hardware/example/extension/light/V2_0/ExtLightState.java
+GEN := $(intermediates)/android/hardware/tests/extension/light/V2_0/ExtLightState.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -68,7 +68,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.example.extension.light@2.0::types.ExtLightState
+ android.hardware.tests.extension.light@2.0::types.ExtLightState
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -77,7 +77,7 @@
#
# Build IExtLight.hal
#
-GEN := $(intermediates)/android/hardware/example/extension/light/V2_0/IExtLight.java
+GEN := $(intermediates)/android/hardware/tests/extension/light/V2_0/IExtLight.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IExtLight.hal
@@ -89,7 +89,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.example.extension.light@2.0::IExtLight
+ android.hardware.tests.extension.light@2.0::IExtLight
$(GEN): $(LOCAL_PATH)/IExtLight.hal
$(transform-generated-source)
@@ -100,10 +100,10 @@
################################################################################
include $(CLEAR_VARS)
-LOCAL_MODULE := android.hardware.example.extension.light@2.0-java-static
+LOCAL_MODULE := android.hardware.tests.extension.light@2.0-java-static
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -115,7 +115,7 @@
#
# Build types.hal (Default)
#
-GEN := $(intermediates)/android/hardware/example/extension/light/V2_0/Default.java
+GEN := $(intermediates)/android/hardware/tests/extension/light/V2_0/Default.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -125,7 +125,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.example.extension.light@2.0::types.Default
+ android.hardware.tests.extension.light@2.0::types.Default
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -134,7 +134,7 @@
#
# Build types.hal (ExtBrightness)
#
-GEN := $(intermediates)/android/hardware/example/extension/light/V2_0/ExtBrightness.java
+GEN := $(intermediates)/android/hardware/tests/extension/light/V2_0/ExtBrightness.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -144,7 +144,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.example.extension.light@2.0::types.ExtBrightness
+ android.hardware.tests.extension.light@2.0::types.ExtBrightness
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -153,7 +153,7 @@
#
# Build types.hal (ExtLightState)
#
-GEN := $(intermediates)/android/hardware/example/extension/light/V2_0/ExtLightState.java
+GEN := $(intermediates)/android/hardware/tests/extension/light/V2_0/ExtLightState.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -163,7 +163,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.example.extension.light@2.0::types.ExtLightState
+ android.hardware.tests.extension.light@2.0::types.ExtLightState
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
@@ -172,7 +172,7 @@
#
# Build IExtLight.hal
#
-GEN := $(intermediates)/android/hardware/example/extension/light/V2_0/IExtLight.java
+GEN := $(intermediates)/android/hardware/tests/extension/light/V2_0/IExtLight.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IExtLight.hal
@@ -184,7 +184,7 @@
-Ljava \
-randroid.hardware:hardware/interfaces \
-randroid.hidl:system/libhidl/transport \
- android.hardware.example.extension.light@2.0::IExtLight
+ android.hardware.tests.extension.light@2.0::IExtLight
$(GEN): $(LOCAL_PATH)/IExtLight.hal
$(transform-generated-source)
diff --git a/example/extension/light/2.0/IExtLight.hal b/tests/extension/light/2.0/IExtLight.hal
similarity index 95%
rename from example/extension/light/2.0/IExtLight.hal
rename to tests/extension/light/2.0/IExtLight.hal
index f12a272..1515b86 100644
--- a/example/extension/light/2.0/IExtLight.hal
+++ b/tests/extension/light/2.0/IExtLight.hal
@@ -17,7 +17,7 @@
// Would normally be 'vendor.example.extension.light@2.0' however, this is
// a google extension example. A vendor extension should also live in the
// vendor partition.
-package android.hardware.example.extension.light@2.0;
+package android.hardware.tests.extension.light@2.0;
import android.hardware.light@2.0;
diff --git a/tests/extension/light/2.0/default/Android.mk b/tests/extension/light/2.0/default/Android.mk
new file mode 100644
index 0000000..4dee3ee
--- /dev/null
+++ b/tests/extension/light/2.0/default/Android.mk
@@ -0,0 +1,20 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := android.hardware.tests.extension.light@2.0-service
+LOCAL_INIT_RC := android.hardware.tests.extension.light@2.0-service.rc
+LOCAL_PROPRIETARY_MODULE := true
+LOCAL_MODULE_RELATIVE_PATH := hw
+LOCAL_SRC_FILES := \
+ Light.cpp \
+ service.cpp
+
+LOCAL_SHARED_LIBRARIES := \
+ libhidlbase \
+ libhidltransport \
+ libhwbinder \
+ libutils \
+ android.hardware.light@2.0 \
+ android.hardware.tests.extension.light@2.0 \
+
+include $(BUILD_EXECUTABLE)
diff --git a/example/extension/light/2.0/default/Light.cpp b/tests/extension/light/2.0/default/Light.cpp
similarity index 97%
rename from example/extension/light/2.0/default/Light.cpp
rename to tests/extension/light/2.0/default/Light.cpp
index 2e56319..d941e73 100644
--- a/example/extension/light/2.0/default/Light.cpp
+++ b/tests/extension/light/2.0/default/Light.cpp
@@ -17,7 +17,7 @@
namespace android {
namespace hardware {
-namespace example {
+namespace tests {
namespace extension {
namespace light {
namespace V2_0 {
@@ -66,6 +66,6 @@
} // namespace V2_0
} // namespace light
} // namespace extension
-} // namespace example
+} // namespace tests
} // namespace hardware
} // namespace android
diff --git a/example/extension/light/2.0/default/Light.h b/tests/extension/light/2.0/default/Light.h
similarity index 79%
rename from example/extension/light/2.0/default/Light.h
rename to tests/extension/light/2.0/default/Light.h
index e3b60df..dc2c5dd 100644
--- a/example/extension/light/2.0/default/Light.h
+++ b/tests/extension/light/2.0/default/Light.h
@@ -13,23 +13,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#ifndef ANDROID_HARDWARE_EXAMPLE_EXTENSION_LIGHT_V2_0_LIGHT_H
-#define ANDROID_HARDWARE_EXAMPLE_EXTENSION_LIGHT_V2_0_LIGHT_H
+#ifndef ANDROID_HARDWARE_TESTS_EXTENSION_LIGHT_V2_0_LIGHT_H
+#define ANDROID_HARDWARE_TESTS_EXTENSION_LIGHT_V2_0_LIGHT_H
-#include <android/hardware/example/extension/light/2.0/IExtLight.h>
+#include <android/hardware/tests/extension/light/2.0/IExtLight.h>
#include <hidl/Status.h>
#include <hidl/MQDescriptor.h>
namespace android {
namespace hardware {
-namespace example {
+namespace tests {
namespace extension {
namespace light {
namespace V2_0 {
namespace implementation {
-using ::android::hardware::example::extension::light::V2_0::ExtLightState;
-using ::android::hardware::example::extension::light::V2_0::IExtLight;
+using ::android::hardware::tests::extension::light::V2_0::ExtLightState;
+using ::android::hardware::tests::extension::light::V2_0::IExtLight;
using ::android::hardware::light::V2_0::ILight;
using ::android::hardware::light::V2_0::LightState;
using ::android::hardware::light::V2_0::Status;
@@ -54,8 +54,8 @@
} // namespace V2_0
} // namespace light
} // namespace extension
-} // namespace example
+} // namespace tests
} // namespace hardware
} // namespace android
-#endif // ANDROID_HARDWARE_EXAMPLE_EXTENSION_LIGHT_V2_0_LIGHT_H
+#endif // ANDROID_HARDWARE_TESTS_EXTENSION_LIGHT_V2_0_LIGHT_H
diff --git a/tests/extension/light/2.0/default/android.hardware.tests.extension.light@2.0-service.rc b/tests/extension/light/2.0/default/android.hardware.tests.extension.light@2.0-service.rc
new file mode 100644
index 0000000..8f379ee
--- /dev/null
+++ b/tests/extension/light/2.0/default/android.hardware.tests.extension.light@2.0-service.rc
@@ -0,0 +1,4 @@
+service light-ext-2-0 /vendor/bin/hw/android.hardware.tests.extension.light@2.0-service
+ class hal
+ user system
+ group system
\ No newline at end of file
diff --git a/example/extension/light/2.0/default/service.cpp b/tests/extension/light/2.0/default/service.cpp
similarity index 84%
rename from example/extension/light/2.0/default/service.cpp
rename to tests/extension/light/2.0/default/service.cpp
index d3fb4de..4d839b2 100644
--- a/example/extension/light/2.0/default/service.cpp
+++ b/tests/extension/light/2.0/default/service.cpp
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#define LOG_TAG "android.hardware.light@2.0-service"
+#define LOG_TAG "android.hardware.tests.extension.light@2.0-service"
#include <android/log.h>
#include <hidl/HidlTransportSupport.h>
@@ -24,14 +24,12 @@
using android::hardware::joinRpcThreadpool;
using android::sp;
-// Generated HIDL files
using android::hardware::light::V2_0::ILight;
+using android::hardware::tests::extension::light::V2_0::implementation::Light;
int main() {
- const char instance[] = "light";
-
android::sp<ILight> service = new Light();
configureRpcThreadpool(1, true /*callerWillJoin*/);
- service->registerAsService(instance);
+ service->registerAsService();
joinRpcThreadpool();
}
diff --git a/example/extension/light/2.0/types.hal b/tests/extension/light/2.0/types.hal
similarity index 97%
rename from example/extension/light/2.0/types.hal
rename to tests/extension/light/2.0/types.hal
index 5be41bb..1b09479 100644
--- a/example/extension/light/2.0/types.hal
+++ b/tests/extension/light/2.0/types.hal
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.hardware.example.extension.light@2.0;
+package android.hardware.tests.extension.light@2.0;
import android.hardware.light@2.0;
diff --git a/tests/foo/1.0/Android.bp b/tests/foo/1.0/Android.bp
index 8294c65..9572855 100644
--- a/tests/foo/1.0/Android.bp
+++ b/tests/foo/1.0/Android.bp
@@ -1,9 +1,7 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
-genrule {
- name: "android.hardware.tests.foo@1.0_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.foo@1.0",
+filegroup {
+ name: "android.hardware.tests.foo@1.0_hal",
srcs: [
"types.hal",
"IFoo.hal",
@@ -12,6 +10,15 @@
"ISimple.hal",
"ITheirTypes.hal",
],
+}
+
+genrule {
+ name: "android.hardware.tests.foo@1.0_genc++",
+ tools: ["hidl-gen"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.foo@1.0",
+ srcs: [
+ ":android.hardware.tests.foo@1.0_hal",
+ ],
out: [
"android/hardware/tests/foo/1.0/types.cpp",
"android/hardware/tests/foo/1.0/FooAll.cpp",
@@ -27,12 +34,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.foo@1.0",
srcs: [
- "types.hal",
- "IFoo.hal",
- "IFooCallback.hal",
- "IMyTypes.hal",
- "ISimple.hal",
- "ITheirTypes.hal",
+ ":android.hardware.tests.foo@1.0_hal",
],
out: [
"android/hardware/tests/foo/1.0/types.h",
diff --git a/tests/foo/1.0/default/Android.bp b/tests/foo/1.0/default/Android.bp
index 952f25d..f4a80d5 100644
--- a/tests/foo/1.0/default/Android.bp
+++ b/tests/foo/1.0/default/Android.bp
@@ -3,6 +3,7 @@
cc_library_shared {
name: "android.hardware.tests.foo@1.0-impl",
relative_install_path: "hw",
+ proprietary: true,
srcs: [
"Foo.cpp",
],
diff --git a/tests/inheritance/1.0/Android.bp b/tests/inheritance/1.0/Android.bp
index 4389147..f50aee4 100644
--- a/tests/inheritance/1.0/Android.bp
+++ b/tests/inheritance/1.0/Android.bp
@@ -1,15 +1,22 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
-genrule {
- name: "android.hardware.tests.inheritance@1.0_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.inheritance@1.0",
+filegroup {
+ name: "android.hardware.tests.inheritance@1.0_hal",
srcs: [
"IChild.hal",
"IFetcher.hal",
"IGrandparent.hal",
"IParent.hal",
],
+}
+
+genrule {
+ name: "android.hardware.tests.inheritance@1.0_genc++",
+ tools: ["hidl-gen"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.inheritance@1.0",
+ srcs: [
+ ":android.hardware.tests.inheritance@1.0_hal",
+ ],
out: [
"android/hardware/tests/inheritance/1.0/ChildAll.cpp",
"android/hardware/tests/inheritance/1.0/FetcherAll.cpp",
@@ -23,10 +30,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.inheritance@1.0",
srcs: [
- "IChild.hal",
- "IFetcher.hal",
- "IGrandparent.hal",
- "IParent.hal",
+ ":android.hardware.tests.inheritance@1.0_hal",
],
out: [
"android/hardware/tests/inheritance/1.0/IChild.h",
diff --git a/tests/inheritance/1.0/Android.mk b/tests/inheritance/1.0/Android.mk
index 8c1b1c8..21aac00 100644
--- a/tests/inheritance/1.0/Android.mk
+++ b/tests/inheritance/1.0/Android.mk
@@ -8,7 +8,7 @@
LOCAL_MODULE := android.hardware.tests.inheritance@1.0-java
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -110,7 +110,7 @@
LOCAL_MODULE := android.hardware.tests.inheritance@1.0-java-static
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
diff --git a/tests/inheritance/1.0/default/Android.bp b/tests/inheritance/1.0/default/Android.bp
index 638d3a4..090c36e 100644
--- a/tests/inheritance/1.0/default/Android.bp
+++ b/tests/inheritance/1.0/default/Android.bp
@@ -3,6 +3,7 @@
cc_library_shared {
name: "android.hardware.tests.inheritance@1.0-impl",
relative_install_path: "hw",
+ proprietary: true,
srcs: [
"Fetcher.cpp",
"Parent.cpp",
diff --git a/tests/libhwbinder/1.0/Android.bp b/tests/libhwbinder/1.0/Android.bp
index 8c27225..580e961 100644
--- a/tests/libhwbinder/1.0/Android.bp
+++ b/tests/libhwbinder/1.0/Android.bp
@@ -1,11 +1,18 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
+filegroup {
+ name: "android.hardware.tests.libhwbinder@1.0_hal",
+ srcs: [
+ "IBenchmark.hal",
+ ],
+}
+
genrule {
name: "android.hardware.tests.libhwbinder@1.0_genc++",
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.libhwbinder@1.0",
srcs: [
- "IBenchmark.hal",
+ ":android.hardware.tests.libhwbinder@1.0_hal",
],
out: [
"android/hardware/tests/libhwbinder/1.0/BenchmarkAll.cpp",
@@ -17,7 +24,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.libhwbinder@1.0",
srcs: [
- "IBenchmark.hal",
+ ":android.hardware.tests.libhwbinder@1.0_hal",
],
out: [
"android/hardware/tests/libhwbinder/1.0/IBenchmark.h",
diff --git a/tests/libhwbinder/1.0/Android.mk b/tests/libhwbinder/1.0/Android.mk
index ae873af..2ee26d6 100644
--- a/tests/libhwbinder/1.0/Android.mk
+++ b/tests/libhwbinder/1.0/Android.mk
@@ -8,7 +8,7 @@
LOCAL_MODULE := android.hardware.tests.libhwbinder@1.0-java
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -43,7 +43,7 @@
LOCAL_MODULE := android.hardware.tests.libhwbinder@1.0-java-static
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
diff --git a/tests/libhwbinder/1.0/default/Android.bp b/tests/libhwbinder/1.0/default/Android.bp
index 73dcc61..0edabfc 100644
--- a/tests/libhwbinder/1.0/default/Android.bp
+++ b/tests/libhwbinder/1.0/default/Android.bp
@@ -1,6 +1,7 @@
cc_library_shared {
name: "android.hardware.tests.libhwbinder@1.0-impl",
relative_install_path: "hw",
+ proprietary: true,
srcs: [
"Benchmark.cpp",
],
diff --git a/tests/memory/1.0/Android.bp b/tests/memory/1.0/Android.bp
index d8fe811..49faf41 100644
--- a/tests/memory/1.0/Android.bp
+++ b/tests/memory/1.0/Android.bp
@@ -1,11 +1,18 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
+filegroup {
+ name: "android.hardware.tests.memory@1.0_hal",
+ srcs: [
+ "IMemoryTest.hal",
+ ],
+}
+
genrule {
name: "android.hardware.tests.memory@1.0_genc++",
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.memory@1.0",
srcs: [
- "IMemoryTest.hal",
+ ":android.hardware.tests.memory@1.0_hal",
],
out: [
"android/hardware/tests/memory/1.0/MemoryTestAll.cpp",
@@ -17,7 +24,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.memory@1.0",
srcs: [
- "IMemoryTest.hal",
+ ":android.hardware.tests.memory@1.0_hal",
],
out: [
"android/hardware/tests/memory/1.0/IMemoryTest.h",
diff --git a/tests/memory/1.0/default/Android.bp b/tests/memory/1.0/default/Android.bp
index bde7c03..14dc08d 100644
--- a/tests/memory/1.0/default/Android.bp
+++ b/tests/memory/1.0/default/Android.bp
@@ -14,6 +14,7 @@
cc_library_shared {
name: "android.hardware.tests.memory@1.0-impl",
+ proprietary: true,
relative_install_path: "hw",
srcs: [
"MemoryTest.cpp",
diff --git a/tests/msgq/1.0/Android.bp b/tests/msgq/1.0/Android.bp
index 669722e..d17efe4 100644
--- a/tests/msgq/1.0/Android.bp
+++ b/tests/msgq/1.0/Android.bp
@@ -1,11 +1,18 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
+filegroup {
+ name: "android.hardware.tests.msgq@1.0_hal",
+ srcs: [
+ "ITestMsgQ.hal",
+ ],
+}
+
genrule {
name: "android.hardware.tests.msgq@1.0_genc++",
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.msgq@1.0",
srcs: [
- "ITestMsgQ.hal",
+ ":android.hardware.tests.msgq@1.0_hal",
],
out: [
"android/hardware/tests/msgq/1.0/TestMsgQAll.cpp",
@@ -17,7 +24,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.msgq@1.0",
srcs: [
- "ITestMsgQ.hal",
+ ":android.hardware.tests.msgq@1.0_hal",
],
out: [
"android/hardware/tests/msgq/1.0/ITestMsgQ.h",
diff --git a/tests/msgq/1.0/ITestMsgQ.hal b/tests/msgq/1.0/ITestMsgQ.hal
index 3ed1b37..dfb9be4 100644
--- a/tests/msgq/1.0/ITestMsgQ.hal
+++ b/tests/msgq/1.0/ITestMsgQ.hal
@@ -34,15 +34,19 @@
generates(bool ret, fmq_sync<uint16_t> mqDesc);
/*
- * This method requests the service to set up an unsynchronized write
- * wait-free FMQ with the client as reader.
+ * This method requests the service to return an MQDescriptor to
+ * an unsynchronized FMQ set up by the server. If 'configureFmq' is
+ * true, then the server sets up a new unsynchronized FMQ. This
+ * method is to be used to test multiple reader processes.
*
- * @return ret True if the setup is successful.
- * @return mqDesc This structure describes the FMQ that was
+ * @param configureFmq The server sets up a new unsynchronized FMQ if
+ * this parameter is true.
+ *
+ * @return ret True if successful.
+ * @return mqDesc This structure describes the unsynchronized FMQ that was
* set up by the service. Client can use it to set up the FMQ at its end.
*/
- configureFmqUnsyncWrite()
- generates(bool ret, fmq_unsync<uint16_t> mqDesc);
+ getFmqUnsyncWrite(bool configureFmq) generates(bool ret, fmq_unsync<uint16_t> mqDesc);
/*
* This method request the service to write into the synchronized read/write
diff --git a/tests/pointer/1.0/Android.bp b/tests/pointer/1.0/Android.bp
index be7f873..7f66e2a 100644
--- a/tests/pointer/1.0/Android.bp
+++ b/tests/pointer/1.0/Android.bp
@@ -1,12 +1,19 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
+filegroup {
+ name: "android.hardware.tests.pointer@1.0_hal",
+ srcs: [
+ "IGraph.hal",
+ "IPointer.hal",
+ ],
+}
+
genrule {
name: "android.hardware.tests.pointer@1.0_genc++",
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.pointer@1.0",
srcs: [
- "IGraph.hal",
- "IPointer.hal",
+ ":android.hardware.tests.pointer@1.0_hal",
],
out: [
"android/hardware/tests/pointer/1.0/GraphAll.cpp",
@@ -19,8 +26,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.pointer@1.0",
srcs: [
- "IGraph.hal",
- "IPointer.hal",
+ ":android.hardware.tests.pointer@1.0_hal",
],
out: [
"android/hardware/tests/pointer/1.0/IGraph.h",
diff --git a/tests/pointer/1.0/default/Android.bp b/tests/pointer/1.0/default/Android.bp
index f7180f1..ab7f8fa 100644
--- a/tests/pointer/1.0/default/Android.bp
+++ b/tests/pointer/1.0/default/Android.bp
@@ -3,6 +3,7 @@
cc_library_shared {
name: "android.hardware.tests.pointer@1.0-impl",
relative_install_path: "hw",
+ proprietary: true,
srcs: [
"Graph.cpp",
"Pointer.cpp",
diff --git a/tests/versioning/1.0/Android.bp b/tests/versioning/1.0/Android.bp
new file mode 100644
index 0000000..fbabc10
--- /dev/null
+++ b/tests/versioning/1.0/Android.bp
@@ -0,0 +1,59 @@
+// This file is autogenerated by hidl-gen. Do not edit manually.
+
+filegroup {
+ name: "android.hardware.tests.versioning@1.0_hal",
+ srcs: [
+ "IFoo.hal",
+ ],
+}
+
+genrule {
+ name: "android.hardware.tests.versioning@1.0_genc++",
+ tools: ["hidl-gen"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@1.0",
+ srcs: [
+ ":android.hardware.tests.versioning@1.0_hal",
+ ],
+ out: [
+ "android/hardware/tests/versioning/1.0/FooAll.cpp",
+ ],
+}
+
+genrule {
+ name: "android.hardware.tests.versioning@1.0_genc++_headers",
+ tools: ["hidl-gen"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@1.0",
+ srcs: [
+ ":android.hardware.tests.versioning@1.0_hal",
+ ],
+ out: [
+ "android/hardware/tests/versioning/1.0/IFoo.h",
+ "android/hardware/tests/versioning/1.0/IHwFoo.h",
+ "android/hardware/tests/versioning/1.0/BnHwFoo.h",
+ "android/hardware/tests/versioning/1.0/BpHwFoo.h",
+ "android/hardware/tests/versioning/1.0/BsFoo.h",
+ ],
+}
+
+cc_library_shared {
+ name: "android.hardware.tests.versioning@1.0",
+ generated_sources: ["android.hardware.tests.versioning@1.0_genc++"],
+ generated_headers: ["android.hardware.tests.versioning@1.0_genc++_headers"],
+ export_generated_headers: ["android.hardware.tests.versioning@1.0_genc++_headers"],
+ shared_libs: [
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "liblog",
+ "libutils",
+ "libcutils",
+ "android.hidl.base@1.0",
+ ],
+ export_shared_lib_headers: [
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "libutils",
+ "android.hidl.base@1.0",
+ ],
+}
diff --git a/tests/versioning/1.0/Android.mk b/tests/versioning/1.0/Android.mk
new file mode 100644
index 0000000..ba18384
--- /dev/null
+++ b/tests/versioning/1.0/Android.mk
@@ -0,0 +1,76 @@
+# This file is autogenerated by hidl-gen. Do not edit manually.
+
+LOCAL_PATH := $(call my-dir)
+
+################################################################################
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := android.hardware.tests.versioning@1.0-java
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+
+intermediates := $(call local-generated-sources-dir, COMMON)
+
+HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
+
+LOCAL_JAVA_LIBRARIES := \
+ android.hidl.base@1.0-java \
+
+
+#
+# Build IFoo.hal
+#
+GEN := $(intermediates)/android/hardware/tests/versioning/V1_0/IFoo.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IFoo.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
+ android.hardware.tests.versioning@1.0::IFoo
+
+$(GEN): $(LOCAL_PATH)/IFoo.hal
+ $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+include $(BUILD_JAVA_LIBRARY)
+
+
+################################################################################
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := android.hardware.tests.versioning@1.0-java-static
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+
+intermediates := $(call local-generated-sources-dir, COMMON)
+
+HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+ android.hidl.base@1.0-java-static \
+
+
+#
+# Build IFoo.hal
+#
+GEN := $(intermediates)/android/hardware/tests/versioning/V1_0/IFoo.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IFoo.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
+ android.hardware.tests.versioning@1.0::IFoo
+
+$(GEN): $(LOCAL_PATH)/IFoo.hal
+ $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+include $(BUILD_STATIC_JAVA_LIBRARY)
+
+
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tests/versioning/1.0/IFoo.hal b/tests/versioning/1.0/IFoo.hal
new file mode 100644
index 0000000..0571eff
--- /dev/null
+++ b/tests/versioning/1.0/IFoo.hal
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2016 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.tests.versioning@1.0;
+
+interface IFoo {
+};
diff --git a/tests/versioning/2.2/Android.bp b/tests/versioning/2.2/Android.bp
new file mode 100644
index 0000000..953b6df
--- /dev/null
+++ b/tests/versioning/2.2/Android.bp
@@ -0,0 +1,66 @@
+// This file is autogenerated by hidl-gen. Do not edit manually.
+
+filegroup {
+ name: "android.hardware.tests.versioning@2.2_hal",
+ srcs: [
+ "IBar.hal",
+ "IFoo.hal",
+ ],
+}
+
+genrule {
+ name: "android.hardware.tests.versioning@2.2_genc++",
+ tools: ["hidl-gen"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@2.2",
+ srcs: [
+ ":android.hardware.tests.versioning@2.2_hal",
+ ],
+ out: [
+ "android/hardware/tests/versioning/2.2/BarAll.cpp",
+ "android/hardware/tests/versioning/2.2/FooAll.cpp",
+ ],
+}
+
+genrule {
+ name: "android.hardware.tests.versioning@2.2_genc++_headers",
+ tools: ["hidl-gen"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@2.2",
+ srcs: [
+ ":android.hardware.tests.versioning@2.2_hal",
+ ],
+ out: [
+ "android/hardware/tests/versioning/2.2/IBar.h",
+ "android/hardware/tests/versioning/2.2/IHwBar.h",
+ "android/hardware/tests/versioning/2.2/BnHwBar.h",
+ "android/hardware/tests/versioning/2.2/BpHwBar.h",
+ "android/hardware/tests/versioning/2.2/BsBar.h",
+ "android/hardware/tests/versioning/2.2/IFoo.h",
+ "android/hardware/tests/versioning/2.2/IHwFoo.h",
+ "android/hardware/tests/versioning/2.2/BnHwFoo.h",
+ "android/hardware/tests/versioning/2.2/BpHwFoo.h",
+ "android/hardware/tests/versioning/2.2/BsFoo.h",
+ ],
+}
+
+cc_library_shared {
+ name: "android.hardware.tests.versioning@2.2",
+ generated_sources: ["android.hardware.tests.versioning@2.2_genc++"],
+ generated_headers: ["android.hardware.tests.versioning@2.2_genc++_headers"],
+ export_generated_headers: ["android.hardware.tests.versioning@2.2_genc++_headers"],
+ shared_libs: [
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "liblog",
+ "libutils",
+ "libcutils",
+ "android.hidl.base@1.0",
+ ],
+ export_shared_lib_headers: [
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "libutils",
+ "android.hidl.base@1.0",
+ ],
+}
diff --git a/tests/versioning/2.2/Android.mk b/tests/versioning/2.2/Android.mk
new file mode 100644
index 0000000..e2a2ff7
--- /dev/null
+++ b/tests/versioning/2.2/Android.mk
@@ -0,0 +1,114 @@
+# This file is autogenerated by hidl-gen. Do not edit manually.
+
+LOCAL_PATH := $(call my-dir)
+
+################################################################################
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := android.hardware.tests.versioning@2.2-java
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+
+intermediates := $(call local-generated-sources-dir, COMMON)
+
+HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
+
+LOCAL_JAVA_LIBRARIES := \
+ android.hidl.base@1.0-java \
+
+
+#
+# Build IBar.hal
+#
+GEN := $(intermediates)/android/hardware/tests/versioning/V2_2/IBar.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBar.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
+ android.hardware.tests.versioning@2.2::IBar
+
+$(GEN): $(LOCAL_PATH)/IBar.hal
+ $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+
+#
+# Build IFoo.hal
+#
+GEN := $(intermediates)/android/hardware/tests/versioning/V2_2/IFoo.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IFoo.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
+ android.hardware.tests.versioning@2.2::IFoo
+
+$(GEN): $(LOCAL_PATH)/IFoo.hal
+ $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+include $(BUILD_JAVA_LIBRARY)
+
+
+################################################################################
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := android.hardware.tests.versioning@2.2-java-static
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+
+intermediates := $(call local-generated-sources-dir, COMMON)
+
+HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+ android.hidl.base@1.0-java-static \
+
+
+#
+# Build IBar.hal
+#
+GEN := $(intermediates)/android/hardware/tests/versioning/V2_2/IBar.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBar.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
+ android.hardware.tests.versioning@2.2::IBar
+
+$(GEN): $(LOCAL_PATH)/IBar.hal
+ $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+
+#
+# Build IFoo.hal
+#
+GEN := $(intermediates)/android/hardware/tests/versioning/V2_2/IFoo.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IFoo.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
+ android.hardware.tests.versioning@2.2::IFoo
+
+$(GEN): $(LOCAL_PATH)/IFoo.hal
+ $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+include $(BUILD_STATIC_JAVA_LIBRARY)
+
+
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tests/versioning/2.2/IBar.hal b/tests/versioning/2.2/IBar.hal
new file mode 100644
index 0000000..e28ce19
--- /dev/null
+++ b/tests/versioning/2.2/IBar.hal
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2016 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.tests.versioning@2.2;
+
+interface IBar {
+
+};
diff --git a/tests/versioning/2.2/IFoo.hal b/tests/versioning/2.2/IFoo.hal
new file mode 100644
index 0000000..d6b8782
--- /dev/null
+++ b/tests/versioning/2.2/IFoo.hal
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2016 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.tests.versioning@2.2;
+
+interface IFoo {
+
+};
diff --git a/tests/versioning/2.3/Android.bp b/tests/versioning/2.3/Android.bp
new file mode 100644
index 0000000..3cc2076
--- /dev/null
+++ b/tests/versioning/2.3/Android.bp
@@ -0,0 +1,77 @@
+// This file is autogenerated by hidl-gen. Do not edit manually.
+
+filegroup {
+ name: "android.hardware.tests.versioning@2.3_hal",
+ srcs: [
+ "IBar.hal",
+ "IBaz.hal",
+ "IFoo.hal",
+ ],
+}
+
+genrule {
+ name: "android.hardware.tests.versioning@2.3_genc++",
+ tools: ["hidl-gen"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@2.3",
+ srcs: [
+ ":android.hardware.tests.versioning@2.3_hal",
+ ],
+ out: [
+ "android/hardware/tests/versioning/2.3/BarAll.cpp",
+ "android/hardware/tests/versioning/2.3/BazAll.cpp",
+ "android/hardware/tests/versioning/2.3/FooAll.cpp",
+ ],
+}
+
+genrule {
+ name: "android.hardware.tests.versioning@2.3_genc++_headers",
+ tools: ["hidl-gen"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@2.3",
+ srcs: [
+ ":android.hardware.tests.versioning@2.3_hal",
+ ],
+ out: [
+ "android/hardware/tests/versioning/2.3/IBar.h",
+ "android/hardware/tests/versioning/2.3/IHwBar.h",
+ "android/hardware/tests/versioning/2.3/BnHwBar.h",
+ "android/hardware/tests/versioning/2.3/BpHwBar.h",
+ "android/hardware/tests/versioning/2.3/BsBar.h",
+ "android/hardware/tests/versioning/2.3/IBaz.h",
+ "android/hardware/tests/versioning/2.3/IHwBaz.h",
+ "android/hardware/tests/versioning/2.3/BnHwBaz.h",
+ "android/hardware/tests/versioning/2.3/BpHwBaz.h",
+ "android/hardware/tests/versioning/2.3/BsBaz.h",
+ "android/hardware/tests/versioning/2.3/IFoo.h",
+ "android/hardware/tests/versioning/2.3/IHwFoo.h",
+ "android/hardware/tests/versioning/2.3/BnHwFoo.h",
+ "android/hardware/tests/versioning/2.3/BpHwFoo.h",
+ "android/hardware/tests/versioning/2.3/BsFoo.h",
+ ],
+}
+
+cc_library_shared {
+ name: "android.hardware.tests.versioning@2.3",
+ generated_sources: ["android.hardware.tests.versioning@2.3_genc++"],
+ generated_headers: ["android.hardware.tests.versioning@2.3_genc++_headers"],
+ export_generated_headers: ["android.hardware.tests.versioning@2.3_genc++_headers"],
+ shared_libs: [
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "liblog",
+ "libutils",
+ "libcutils",
+ "android.hardware.tests.versioning@1.0",
+ "android.hardware.tests.versioning@2.2",
+ "android.hidl.base@1.0",
+ ],
+ export_shared_lib_headers: [
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "libutils",
+ "android.hardware.tests.versioning@1.0",
+ "android.hardware.tests.versioning@2.2",
+ "android.hidl.base@1.0",
+ ],
+}
diff --git a/tests/versioning/2.3/Android.mk b/tests/versioning/2.3/Android.mk
new file mode 100644
index 0000000..68e6be4
--- /dev/null
+++ b/tests/versioning/2.3/Android.mk
@@ -0,0 +1,156 @@
+# This file is autogenerated by hidl-gen. Do not edit manually.
+
+LOCAL_PATH := $(call my-dir)
+
+################################################################################
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := android.hardware.tests.versioning@2.3-java
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+
+intermediates := $(call local-generated-sources-dir, COMMON)
+
+HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
+
+LOCAL_JAVA_LIBRARIES := \
+ android.hardware.tests.versioning@1.0-java \
+ android.hardware.tests.versioning@2.2-java \
+ android.hidl.base@1.0-java \
+
+
+#
+# Build IBar.hal
+#
+GEN := $(intermediates)/android/hardware/tests/versioning/V2_3/IBar.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBar.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
+ android.hardware.tests.versioning@2.3::IBar
+
+$(GEN): $(LOCAL_PATH)/IBar.hal
+ $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+
+#
+# Build IBaz.hal
+#
+GEN := $(intermediates)/android/hardware/tests/versioning/V2_3/IBaz.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBaz.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
+ android.hardware.tests.versioning@2.3::IBaz
+
+$(GEN): $(LOCAL_PATH)/IBaz.hal
+ $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+
+#
+# Build IFoo.hal
+#
+GEN := $(intermediates)/android/hardware/tests/versioning/V2_3/IFoo.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IFoo.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
+ android.hardware.tests.versioning@2.3::IFoo
+
+$(GEN): $(LOCAL_PATH)/IFoo.hal
+ $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+include $(BUILD_JAVA_LIBRARY)
+
+
+################################################################################
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := android.hardware.tests.versioning@2.3-java-static
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+
+intermediates := $(call local-generated-sources-dir, COMMON)
+
+HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+ android.hardware.tests.versioning@1.0-java-static \
+ android.hardware.tests.versioning@2.2-java-static \
+ android.hidl.base@1.0-java-static \
+
+
+#
+# Build IBar.hal
+#
+GEN := $(intermediates)/android/hardware/tests/versioning/V2_3/IBar.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBar.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
+ android.hardware.tests.versioning@2.3::IBar
+
+$(GEN): $(LOCAL_PATH)/IBar.hal
+ $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+
+#
+# Build IBaz.hal
+#
+GEN := $(intermediates)/android/hardware/tests/versioning/V2_3/IBaz.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBaz.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
+ android.hardware.tests.versioning@2.3::IBaz
+
+$(GEN): $(LOCAL_PATH)/IBaz.hal
+ $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+
+#
+# Build IFoo.hal
+#
+GEN := $(intermediates)/android/hardware/tests/versioning/V2_3/IFoo.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IFoo.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
+ android.hardware.tests.versioning@2.3::IFoo
+
+$(GEN): $(LOCAL_PATH)/IFoo.hal
+ $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+include $(BUILD_STATIC_JAVA_LIBRARY)
+
+
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tests/versioning/2.3/IBar.hal b/tests/versioning/2.3/IBar.hal
new file mode 100644
index 0000000..fe38e76
--- /dev/null
+++ b/tests/versioning/2.3/IBar.hal
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2016 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.tests.versioning@2.3;
+
+import @2.2::IBar;
+
+// Must extend @2.2::IBar.
+interface IBar extends @2.2::IBar {
+
+};
diff --git a/tests/versioning/2.3/IBaz.hal b/tests/versioning/2.3/IBaz.hal
new file mode 100644
index 0000000..e28792c
--- /dev/null
+++ b/tests/versioning/2.3/IBaz.hal
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2016 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.tests.versioning@2.3;
+
+import @1.0::IFoo;
+
+interface IBaz extends @1.0::IFoo {
+
+};
diff --git a/tests/versioning/2.3/IFoo.hal b/tests/versioning/2.3/IFoo.hal
new file mode 100644
index 0000000..2c76500
--- /dev/null
+++ b/tests/versioning/2.3/IFoo.hal
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2016 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.tests.versioning@2.3;
+
+import @2.2::IFoo;
+
+// Must extend @2.2::IFoo.
+interface IFoo extends @2.2::IFoo {
+
+};
diff --git a/thermal/1.0/Android.bp b/thermal/1.0/Android.bp
index e80bedc..fab5533 100644
--- a/thermal/1.0/Android.bp
+++ b/thermal/1.0/Android.bp
@@ -1,12 +1,19 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
+filegroup {
+ name: "android.hardware.thermal@1.0_hal",
+ srcs: [
+ "types.hal",
+ "IThermal.hal",
+ ],
+}
+
genrule {
name: "android.hardware.thermal@1.0_genc++",
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.thermal@1.0",
srcs: [
- "types.hal",
- "IThermal.hal",
+ ":android.hardware.thermal@1.0_hal",
],
out: [
"android/hardware/thermal/1.0/types.cpp",
@@ -19,8 +26,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.thermal@1.0",
srcs: [
- "types.hal",
- "IThermal.hal",
+ ":android.hardware.thermal@1.0_hal",
],
out: [
"android/hardware/thermal/1.0/types.h",
@@ -54,106 +60,3 @@
"android.hidl.base@1.0",
],
}
-
-genrule {
- name: "android.hardware.thermal.vts.driver@1.0_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.thermal@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/thermal/1.0/ $(genDir)/android/hardware/thermal/1.0/",
- srcs: [
- "types.hal",
- "IThermal.hal",
- ],
- out: [
- "android/hardware/thermal/1.0/types.vts.cpp",
- "android/hardware/thermal/1.0/Thermal.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.thermal.vts.driver@1.0_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.thermal@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/thermal/1.0/ $(genDir)/android/hardware/thermal/1.0/",
- srcs: [
- "types.hal",
- "IThermal.hal",
- ],
- out: [
- "android/hardware/thermal/1.0/types.vts.h",
- "android/hardware/thermal/1.0/Thermal.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.thermal.vts.driver@1.0",
- generated_sources: ["android.hardware.thermal.vts.driver@1.0_genc++"],
- generated_headers: ["android.hardware.thermal.vts.driver@1.0_genc++_headers"],
- export_generated_headers: ["android.hardware.thermal.vts.driver@1.0_genc++_headers"],
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libvts_common",
- "libvts_datatype",
- "libvts_measurement",
- "libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
- "android.hidl.base@1.0",
- "android.hardware.thermal@1.0",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "android.hidl.base@1.0",
- ],
-}
-
-genrule {
- name: "android.hardware.thermal@1.0-IThermal-vts.profiler_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.thermal@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/thermal/1.0/ $(genDir)/android/hardware/thermal/1.0/",
- srcs: [
- "IThermal.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/thermal/1.0/Thermal.vts.cpp",
- "android/hardware/thermal/1.0/types.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.thermal@1.0-IThermal-vts.profiler_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.thermal@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/thermal/1.0/ $(genDir)/android/hardware/thermal/1.0/",
- srcs: [
- "IThermal.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/thermal/1.0/Thermal.vts.h",
- "android/hardware/thermal/1.0/types.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.thermal@1.0-IThermal-vts.profiler",
- generated_sources: ["android.hardware.thermal@1.0-IThermal-vts.profiler_genc++"],
- generated_headers: ["android.hardware.thermal@1.0-IThermal-vts.profiler_genc++_headers"],
- export_generated_headers: ["android.hardware.thermal@1.0-IThermal-vts.profiler_genc++_headers"],
- shared_libs: [
- "libbase",
- "libhidlbase",
- "libhidltransport",
- "libvts_profiling",
- "libvts_multidevice_proto",
- "libprotobuf-cpp-full",
- "android.hidl.base@1.0",
- "android.hardware.thermal@1.0",
- ],
-}
diff --git a/thermal/1.0/Android.mk b/thermal/1.0/Android.mk
index b88bb81..7748b9e 100644
--- a/thermal/1.0/Android.mk
+++ b/thermal/1.0/Android.mk
@@ -8,7 +8,7 @@
LOCAL_MODULE := android.hardware.thermal@1.0-java
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -178,7 +178,7 @@
LOCAL_MODULE := android.hardware.thermal@1.0-java-static
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -348,7 +348,7 @@
LOCAL_MODULE := android.hardware.thermal@1.0-java-constants
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
#
diff --git a/thermal/1.0/default/Android.bp b/thermal/1.0/default/Android.bp
index 819f0b1..96f69cc 100644
--- a/thermal/1.0/default/Android.bp
+++ b/thermal/1.0/default/Android.bp
@@ -1,5 +1,6 @@
cc_library_shared {
name: "android.hardware.thermal@1.0-impl",
+ proprietary: true,
relative_install_path: "hw",
srcs: ["Thermal.cpp"],
shared_libs: [
diff --git a/thermal/1.0/default/Android.mk b/thermal/1.0/default/Android.mk
index 9039e9f..72c46af 100644
--- a/thermal/1.0/default/Android.mk
+++ b/thermal/1.0/default/Android.mk
@@ -17,6 +17,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE_RELATIVE_PATH := hw
+LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE := android.hardware.thermal@1.0-service
LOCAL_INIT_RC := android.hardware.thermal@1.0-service.rc
LOCAL_SRC_FILES := \
diff --git a/thermal/1.0/default/android.hardware.thermal@1.0-service.rc b/thermal/1.0/default/android.hardware.thermal@1.0-service.rc
index cc7ba6a..f8da101 100644
--- a/thermal/1.0/default/android.hardware.thermal@1.0-service.rc
+++ b/thermal/1.0/default/android.hardware.thermal@1.0-service.rc
@@ -1,4 +1,4 @@
-service thermal-hal-1-0 /system/bin/hw/android.hardware.thermal@1.0-service
+service thermal-hal-1-0 /vendor/bin/hw/android.hardware.thermal@1.0-service
class hal
user system
group system readproc
diff --git a/thermal/1.0/default/service.cpp b/thermal/1.0/default/service.cpp
index ea86de4..b83cbf8 100644
--- a/thermal/1.0/default/service.cpp
+++ b/thermal/1.0/default/service.cpp
@@ -23,5 +23,5 @@
using android::hardware::defaultPassthroughServiceImplementation;
int main() {
- return defaultPassthroughServiceImplementation<IThermal>("thermal");
+ return defaultPassthroughServiceImplementation<IThermal>();
}
diff --git a/thermal/1.0/vts/Thermal.vts b/thermal/1.0/vts/Thermal.vts
index e76d943..4611924 100644
--- a/thermal/1.0/vts/Thermal.vts
+++ b/thermal/1.0/vts/Thermal.vts
@@ -5,6 +5,7 @@
package: "android.hardware.thermal"
import: "android.hardware.thermal@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
api: {
diff --git a/thermal/1.0/vts/functional/Android.bp b/thermal/1.0/vts/functional/Android.bp
index bef7bc2..fedb760 100644
--- a/thermal/1.0/vts/functional/Android.bp
+++ b/thermal/1.0/vts/functional/Android.bp
@@ -31,12 +31,8 @@
],
static_libs: ["libgtest"],
cflags: [
- "--coverage",
"-O0",
"-g",
],
- ldflags: [
- "--coverage"
- ]
}
diff --git a/thermal/1.0/vts/functional/Android.mk b/thermal/1.0/vts/functional/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/thermal/1.0/vts/functional/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/thermal/1.0/vts/functional/thermal_hidl_hal_test.cpp b/thermal/1.0/vts/functional/thermal_hidl_hal_test.cpp
index 3c887c8..5bdd2c2 100644
--- a/thermal/1.0/vts/functional/thermal_hidl_hal_test.cpp
+++ b/thermal/1.0/vts/functional/thermal_hidl_hal_test.cpp
@@ -40,7 +40,6 @@
using ::android::hardware::Void;
using ::android::sp;
-#define THERMAL_SERVICE_NAME "thermal"
#define MONITORING_OPERATION_NUMBER 10
#define MAX_DEVICE_TEMPERATURE 200
@@ -50,7 +49,7 @@
class ThermalHidlTest : public ::testing::Test {
public:
virtual void SetUp() override {
- thermal_ = IThermal::getService(THERMAL_SERVICE_NAME);
+ thermal_ = IThermal::getService();
ASSERT_NE(thermal_, nullptr);
baseSize_ = 0;
names_.clear();
diff --git a/thermal/1.0/vts/functional/vts/Android.mk b/thermal/1.0/vts/functional/vts/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/thermal/1.0/vts/functional/vts/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/thermal/1.0/vts/functional/vts/testcases/Android.mk b/thermal/1.0/vts/functional/vts/testcases/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/thermal/1.0/vts/functional/vts/testcases/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/thermal/1.0/vts/functional/vts/testcases/hal/Android.mk b/thermal/1.0/vts/functional/vts/testcases/hal/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/thermal/1.0/vts/functional/vts/testcases/hal/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/thermal/1.0/vts/functional/vts/testcases/hal/thermal/Android.mk b/thermal/1.0/vts/functional/vts/testcases/hal/thermal/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/thermal/1.0/vts/functional/vts/testcases/hal/thermal/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/thermal/1.0/vts/functional/vts/testcases/hal/thermal/__init__.py b/thermal/1.0/vts/functional/vts/testcases/hal/thermal/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/thermal/1.0/vts/functional/vts/testcases/hal/thermal/__init__.py
+++ /dev/null
diff --git a/thermal/1.0/vts/functional/vts/testcases/hal/thermal/hidl/Android.mk b/thermal/1.0/vts/functional/vts/testcases/hal/thermal/hidl/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/thermal/1.0/vts/functional/vts/testcases/hal/thermal/hidl/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/thermal/1.0/vts/functional/vts/testcases/hal/thermal/hidl/__init__.py b/thermal/1.0/vts/functional/vts/testcases/hal/thermal/hidl/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/thermal/1.0/vts/functional/vts/testcases/hal/thermal/hidl/__init__.py
+++ /dev/null
diff --git a/thermal/1.0/vts/functional/vts/testcases/hal/thermal/hidl/target/Android.mk b/thermal/1.0/vts/functional/vts/testcases/hal/thermal/hidl/target/Android.mk
deleted file mode 100644
index 1c3ceb3..0000000
--- a/thermal/1.0/vts/functional/vts/testcases/hal/thermal/hidl/target/Android.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := ThermalHidlTargetTest
-VTS_CONFIG_SRC_DIR := testcases/hal/thermal/hidl/target
-include test/vts/tools/build/Android.host_config.mk
diff --git a/thermal/1.0/vts/functional/vts/testcases/hal/thermal/hidl/target/AndroidTest.xml b/thermal/1.0/vts/functional/vts/testcases/hal/thermal/hidl/target/AndroidTest.xml
deleted file mode 100644
index 169264d..0000000
--- a/thermal/1.0/vts/functional/vts/testcases/hal/thermal/hidl/target/AndroidTest.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<configuration description="Config for VTS VIBRATOR HIDL HAL's target-side test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="ThermalHidlTargetTest" />
- <option name="binary-test-sources" value="
- _32bit::DATA/nativetest/thermal_hidl_hal_test/thermal_hidl_hal_test,
- _64bit::DATA/nativetest64/thermal_hidl_hal_test/thermal_hidl_hal_test,
- "/>
- <option name="binary-test-type" value="gtest" />
- <option name="test-timeout" value="5m" />
- </test>
-</configuration>
-
diff --git a/thermal/1.0/vts/functional/vts/testcases/hal/thermal/hidl/target_profiling/Android.mk b/thermal/1.0/vts/functional/vts/testcases/hal/thermal/hidl/target_profiling/Android.mk
deleted file mode 100644
index 1f937fa..0000000
--- a/thermal/1.0/vts/functional/vts/testcases/hal/thermal/hidl/target_profiling/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := ThermalHidlTargetProfilingTest
-VTS_CONFIG_SRC_DIR := testcases/hal/thermal/hidl/target_profiling
-include test/vts/tools/build/Android.host_config.mk
diff --git a/thermal/1.0/vts/functional/vts/testcases/hal/thermal/hidl/target_profiling/AndroidTest.xml b/thermal/1.0/vts/functional/vts/testcases/hal/thermal/hidl/target_profiling/AndroidTest.xml
deleted file mode 100644
index 46ae05a..0000000
--- a/thermal/1.0/vts/functional/vts/testcases/hal/thermal/hidl/target_profiling/AndroidTest.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<configuration description="Config for VTS THERMAL HIDL HAL's target-side test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="ThermalHidlTargetProfilingTest" />
- <option name="binary-test-sources" value="
- _32bit::DATA/nativetest/thermal_hidl_hal_test/thermal_hidl_hal_test,
- _64bit::DATA/nativetest64/thermal_hidl_hal_test/thermal_hidl_hal_test,
- "/>
- <option name="binary-test-type" value="gtest" />
- <option name="test-timeout" value="5m" />
- <option name="enable-profiling" value="true" />
- </test>
-</configuration>
-
diff --git a/thermal/1.0/vts/types.vts b/thermal/1.0/vts/types.vts
index 1e60f48..f004bd8 100644
--- a/thermal/1.0/vts/types.vts
+++ b/thermal/1.0/vts/types.vts
@@ -9,27 +9,27 @@
name: "::android::hardware::thermal::V1_0::TemperatureType"
type: TYPE_ENUM
enum_value: {
- scalar_type: "uint32_t"
+ scalar_type: "int32_t"
enumerator: "UNKNOWN"
scalar_value: {
- uint32_t: 1000
+ int32_t: -1
}
enumerator: "CPU"
scalar_value: {
- uint32_t: 0
+ int32_t: 0
}
enumerator: "GPU"
scalar_value: {
- uint32_t: 1
+ int32_t: 1
}
enumerator: "BATTERY"
scalar_value: {
- uint32_t: 2
+ int32_t: 2
}
enumerator: "SKIN"
scalar_value: {
- uint32_t: 3
+ int32_t: 3
}
}
}
diff --git a/tv/cec/1.0/Android.bp b/tv/cec/1.0/Android.bp
index 21233ab..5c6919d 100644
--- a/tv/cec/1.0/Android.bp
+++ b/tv/cec/1.0/Android.bp
@@ -1,13 +1,20 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
+filegroup {
+ name: "android.hardware.tv.cec@1.0_hal",
+ srcs: [
+ "types.hal",
+ "IHdmiCec.hal",
+ "IHdmiCecCallback.hal",
+ ],
+}
+
genrule {
name: "android.hardware.tv.cec@1.0_genc++",
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tv.cec@1.0",
srcs: [
- "types.hal",
- "IHdmiCec.hal",
- "IHdmiCecCallback.hal",
+ ":android.hardware.tv.cec@1.0_hal",
],
out: [
"android/hardware/tv/cec/1.0/types.cpp",
@@ -21,9 +28,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tv.cec@1.0",
srcs: [
- "types.hal",
- "IHdmiCec.hal",
- "IHdmiCecCallback.hal",
+ ":android.hardware.tv.cec@1.0_hal",
],
out: [
"android/hardware/tv/cec/1.0/types.h",
@@ -62,155 +67,3 @@
"android.hidl.base@1.0",
],
}
-
-genrule {
- name: "android.hardware.tv.cec.vts.driver@1.0_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tv.cec@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/tv/cec/1.0/ $(genDir)/android/hardware/tv/cec/1.0/",
- srcs: [
- "types.hal",
- "IHdmiCec.hal",
- "IHdmiCecCallback.hal",
- ],
- out: [
- "android/hardware/tv/cec/1.0/types.vts.cpp",
- "android/hardware/tv/cec/1.0/HdmiCec.vts.cpp",
- "android/hardware/tv/cec/1.0/HdmiCecCallback.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.tv.cec.vts.driver@1.0_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tv.cec@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/tv/cec/1.0/ $(genDir)/android/hardware/tv/cec/1.0/",
- srcs: [
- "types.hal",
- "IHdmiCec.hal",
- "IHdmiCecCallback.hal",
- ],
- out: [
- "android/hardware/tv/cec/1.0/types.vts.h",
- "android/hardware/tv/cec/1.0/HdmiCec.vts.h",
- "android/hardware/tv/cec/1.0/HdmiCecCallback.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.tv.cec.vts.driver@1.0",
- generated_sources: ["android.hardware.tv.cec.vts.driver@1.0_genc++"],
- generated_headers: ["android.hardware.tv.cec.vts.driver@1.0_genc++_headers"],
- export_generated_headers: ["android.hardware.tv.cec.vts.driver@1.0_genc++_headers"],
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libvts_common",
- "libvts_datatype",
- "libvts_measurement",
- "libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
- "android.hidl.base@1.0",
- "android.hardware.tv.cec@1.0",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "android.hidl.base@1.0",
- ],
-}
-
-genrule {
- name: "android.hardware.tv.cec@1.0-IHdmiCec-vts.profiler_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tv.cec@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/tv/cec/1.0/ $(genDir)/android/hardware/tv/cec/1.0/",
- srcs: [
- "IHdmiCec.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/tv/cec/1.0/HdmiCec.vts.cpp",
- "android/hardware/tv/cec/1.0/types.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.tv.cec@1.0-IHdmiCec-vts.profiler_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tv.cec@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/tv/cec/1.0/ $(genDir)/android/hardware/tv/cec/1.0/",
- srcs: [
- "IHdmiCec.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/tv/cec/1.0/HdmiCec.vts.h",
- "android/hardware/tv/cec/1.0/types.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.tv.cec@1.0-IHdmiCec-vts.profiler",
- generated_sources: ["android.hardware.tv.cec@1.0-IHdmiCec-vts.profiler_genc++"],
- generated_headers: ["android.hardware.tv.cec@1.0-IHdmiCec-vts.profiler_genc++_headers"],
- export_generated_headers: ["android.hardware.tv.cec@1.0-IHdmiCec-vts.profiler_genc++_headers"],
- shared_libs: [
- "libbase",
- "libhidlbase",
- "libhidltransport",
- "libvts_profiling",
- "libvts_multidevice_proto",
- "libprotobuf-cpp-full",
- "android.hidl.base@1.0",
- "android.hardware.tv.cec@1.0",
- ],
-}
-
-genrule {
- name: "android.hardware.tv.cec@1.0-IHdmiCecCallback-vts.profiler_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tv.cec@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/tv/cec/1.0/ $(genDir)/android/hardware/tv/cec/1.0/",
- srcs: [
- "IHdmiCecCallback.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/tv/cec/1.0/HdmiCecCallback.vts.cpp",
- "android/hardware/tv/cec/1.0/types.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.tv.cec@1.0-IHdmiCecCallback-vts.profiler_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tv.cec@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/tv/cec/1.0/ $(genDir)/android/hardware/tv/cec/1.0/",
- srcs: [
- "IHdmiCecCallback.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/tv/cec/1.0/HdmiCecCallback.vts.h",
- "android/hardware/tv/cec/1.0/types.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.tv.cec@1.0-IHdmiCecCallback-vts.profiler",
- generated_sources: ["android.hardware.tv.cec@1.0-IHdmiCecCallback-vts.profiler_genc++"],
- generated_headers: ["android.hardware.tv.cec@1.0-IHdmiCecCallback-vts.profiler_genc++_headers"],
- export_generated_headers: ["android.hardware.tv.cec@1.0-IHdmiCecCallback-vts.profiler_genc++_headers"],
- shared_libs: [
- "libbase",
- "libhidlbase",
- "libhidltransport",
- "libvts_profiling",
- "libvts_multidevice_proto",
- "libprotobuf-cpp-full",
- "android.hidl.base@1.0",
- "android.hardware.tv.cec@1.0",
- ],
-}
diff --git a/tv/cec/1.0/Android.mk b/tv/cec/1.0/Android.mk
index efa71a1..b08099e 100644
--- a/tv/cec/1.0/Android.mk
+++ b/tv/cec/1.0/Android.mk
@@ -8,7 +8,7 @@
LOCAL_MODULE := android.hardware.tv.cec@1.0-java
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -296,7 +296,7 @@
LOCAL_MODULE := android.hardware.tv.cec@1.0-java-static
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
diff --git a/tv/cec/1.0/default/Android.mk b/tv/cec/1.0/default/Android.mk
index 492fc8c..3f986e6 100644
--- a/tv/cec/1.0/default/Android.mk
+++ b/tv/cec/1.0/default/Android.mk
@@ -2,6 +2,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.tv.cec@1.0-impl
+LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_SRC_FILES := \
HdmiCec.cpp
@@ -21,6 +22,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE_RELATIVE_PATH := hw
+LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE := android.hardware.tv.cec@1.0-service
LOCAL_INIT_RC := android.hardware.tv.cec@1.0-service.rc
LOCAL_SRC_FILES := \
diff --git a/tv/cec/1.0/default/android.hardware.tv.cec@1.0-service.rc b/tv/cec/1.0/default/android.hardware.tv.cec@1.0-service.rc
index 1af32cb..9c80094 100644
--- a/tv/cec/1.0/default/android.hardware.tv.cec@1.0-service.rc
+++ b/tv/cec/1.0/default/android.hardware.tv.cec@1.0-service.rc
@@ -1,4 +1,4 @@
-service cec-hal-1-0 /system/bin/hw/android.hardware.tv.cec@1.0-service
+service cec-hal-1-0 /vendor/bin/hw/android.hardware.tv.cec@1.0-service
class hal
user system
group system
diff --git a/tv/cec/1.0/vts/Android.mk b/tv/cec/1.0/vts/Android.mk
deleted file mode 100644
index fc636f7..0000000
--- a/tv/cec/1.0/vts/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(LOCAL_PATH)/functional/vts/testcases/hal/tv_cec/hidl/Android.mk
diff --git a/tv/cec/1.0/vts/HdmiCec.vts b/tv/cec/1.0/vts/HdmiCec.vts
index d7d09de..6e71d24 100644
--- a/tv/cec/1.0/vts/HdmiCec.vts
+++ b/tv/cec/1.0/vts/HdmiCec.vts
@@ -6,6 +6,7 @@
import: "android.hardware.tv.cec@1.0::IHdmiCecCallback"
import: "android.hardware.tv.cec@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
api: {
@@ -67,8 +68,7 @@
name: "setCallback"
arg: {
type: TYPE_HIDL_CALLBACK
- predefined_type: "IHdmiCecCallback"
- is_callback: true
+ predefined_type: "::android::hardware::tv::cec::V1_0::IHdmiCecCallback"
}
callflow: {
next: "addLogicalAddress"
diff --git a/tv/cec/1.0/vts/HdmiCecCallback.vts b/tv/cec/1.0/vts/HdmiCecCallback.vts
index 864e6f5..a98db06 100644
--- a/tv/cec/1.0/vts/HdmiCecCallback.vts
+++ b/tv/cec/1.0/vts/HdmiCecCallback.vts
@@ -5,6 +5,7 @@
package: "android.hardware.tv.cec"
import: "android.hardware.tv.cec@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
api: {
diff --git a/tv/cec/1.0/vts/functional/vts/testcases/hal/tv_cec/__init__.py b/tv/cec/1.0/vts/functional/vts/testcases/hal/tv_cec/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/tv/cec/1.0/vts/functional/vts/testcases/hal/tv_cec/__init__.py
+++ /dev/null
diff --git a/tv/cec/1.0/vts/functional/vts/testcases/hal/tv_cec/hidl/Android.mk b/tv/cec/1.0/vts/functional/vts/testcases/hal/tv_cec/hidl/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/tv/cec/1.0/vts/functional/vts/testcases/hal/tv_cec/hidl/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/tv/cec/1.0/vts/functional/vts/testcases/hal/tv_cec/hidl/__init__.py b/tv/cec/1.0/vts/functional/vts/testcases/hal/tv_cec/hidl/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/tv/cec/1.0/vts/functional/vts/testcases/hal/tv_cec/hidl/__init__.py
+++ /dev/null
diff --git a/tv/cec/1.0/vts/functional/vts/testcases/hal/tv_cec/hidl/host/Android.mk b/tv/cec/1.0/vts/functional/vts/testcases/hal/tv_cec/hidl/host/Android.mk
deleted file mode 100644
index 14a57a6..0000000
--- a/tv/cec/1.0/vts/functional/vts/testcases/hal/tv_cec/hidl/host/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := TvCecHidlTest
-VTS_CONFIG_SRC_DIR := testcases/hal/tv_cec/hidl/host
-include test/vts/tools/build/Android.host_config.mk
diff --git a/tv/cec/1.0/vts/functional/vts/testcases/hal/tv_cec/hidl/host/AndroidTest.xml b/tv/cec/1.0/vts/functional/vts/testcases/hal/tv_cec/hidl/host/AndroidTest.xml
deleted file mode 100644
index 79584d5..0000000
--- a/tv/cec/1.0/vts/functional/vts/testcases/hal/tv_cec/hidl/host/AndroidTest.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<configuration description="Config for VTS Tv Input HIDL HAL's host-side test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- <option name="push" value="spec/hardware/interfaces/tv/cec/1.0/vts/HdmiCec.vts->/data/local/tmp/spec/HdmiCec.vts" />
- <option name="push" value="spec/hardware/interfaces/tv/cec/1.0/vts/HdmiCecCallback.vts->/data/local/tmp/spec/HdmiCecCallback.vts" />
- <option name="push" value="spec/hardware/interfaces/tv/cec/1.0/vts/types.vts->/data/local/tmp/spec/types.vts" />
- <option name="cleanup" value="true" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer">
- </target_preparer>
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="TvCecHidlTest" />
- <option name="test-case-path" value="vts/testcases/hal/tv_cec/hidl/host/TvCecHidlTest" />
- </test>
-</configuration>
\ No newline at end of file
diff --git a/tv/cec/1.0/vts/functional/vts/testcases/hal/tv_cec/hidl/host/TvCecHidlTest.py b/tv/cec/1.0/vts/functional/vts/testcases/hal/tv_cec/hidl/host/TvCecHidlTest.py
deleted file mode 100644
index 7cb1b06..0000000
--- a/tv/cec/1.0/vts/functional/vts/testcases/hal/tv_cec/hidl/host/TvCecHidlTest.py
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright (C) 2016 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.
-#
-
-import logging
-
-from vts.proto import ComponentSpecificationMessage_pb2 as CompSpecMsg
-from vts.runners.host import asserts
-from vts.runners.host import base_test_with_webdb
-from vts.runners.host import const
-from vts.runners.host import keys
-from vts.runners.host import test_runner
-from vts.utils.python.controllers import android_device
-from vts.utils.python.coverage import coverage_utils
-
-
-class TvCecHidlTest(base_test_with_webdb.BaseTestWithWebDbClass):
- """Host testcase class for the TV HDMI_CEC HIDL HAL."""
-
- def setUpClass(self):
- """Creates a mirror and init tv hdmi cec hal service."""
- self.dut = self.registerController(android_device)[0]
-
- self.dut.shell.InvokeTerminal("one")
- self.dut.shell.one.Execute("setenforce 0") # SELinux permissive mode
-
- self.dut.shell.one.Execute(
- "setprop vts.hal.vts.hidl.get_stub true")
-
- if getattr(self, keys.ConfigKeys.IKEY_ENABLE_COVERAGE, False):
- coverage_utils.InitializeDeviceCoverage(self.dut)
-
- self.dut.hal.InitHidlHal(
- target_type="tv_cec",
- target_basepaths=self.dut.libPaths,
- target_version=1.0,
- target_package="android.hardware.tv.cec",
- target_component_name="IHdmiCec",
- hw_binder_service_name="cec-hal-1-0",
- bits=64 if self.dut.is64Bit else 32)
-
- def tearDownClass(self):
- """To be executed when all test cases are finished."""
- if getattr(self, keys.ConfigKeys.IKEY_ENABLE_COVERAGE, False):
- self.SetCoverageData(coverage_utils.GetGcdaDict(self.dut))
-
- def testGetCecVersion1(self):
- """A simple test case which queries the cec version."""
- logging.info('DIR HAL %s', dir(self.dut.hal))
- version = self.dut.hal.tv_cec.getCecVersion()
- logging.info('Cec version: %s', version)
-
- def testSendRandomMessage(self):
- """A test case which sends a random message."""
- self.vtypes = self.dut.hal.tv_cec.GetHidlTypeInterface("types")
- logging.info("tv_cec types: %s", self.vtypes)
-
- cec_message = {
- "initiator": self.vtypes.TV,
- "destination": self.vtypes.PLAYBACK_1,
- "body": [1, 2, 3]
- }
- message = self.vtypes.Py2Pb("CecMessage", cec_message)
- logging.info("message: %s", message)
- result = self.dut.hal.tv_cec.sendMessage(message)
- logging.info('sendMessage result: %s', result)
-
-if __name__ == "__main__":
- test_runner.main()
diff --git a/tv/cec/1.0/vts/functional/vts/testcases/hal/tv_cec/hidl/host/__init__.py b/tv/cec/1.0/vts/functional/vts/testcases/hal/tv_cec/hidl/host/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/tv/cec/1.0/vts/functional/vts/testcases/hal/tv_cec/hidl/host/__init__.py
+++ /dev/null
diff --git a/tv/cec/1.0/vts/functional/vts/testcases/hal/tv_cec/hidl/host_profiling/Android.mk b/tv/cec/1.0/vts/functional/vts/testcases/hal/tv_cec/hidl/host_profiling/Android.mk
deleted file mode 100644
index 40536a5..0000000
--- a/tv/cec/1.0/vts/functional/vts/testcases/hal/tv_cec/hidl/host_profiling/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2017 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := TvCecHidlProfilingTest
-VTS_CONFIG_SRC_DIR := testcases/hal/tv_cec/hidl/host_profiling
-include test/vts/tools/build/Android.host_config.mk
diff --git a/tv/cec/1.0/vts/functional/vts/testcases/hal/tv_cec/hidl/host_profiling/AndroidTest.xml b/tv/cec/1.0/vts/functional/vts/testcases/hal/tv_cec/hidl/host_profiling/AndroidTest.xml
deleted file mode 100644
index ffd857e..0000000
--- a/tv/cec/1.0/vts/functional/vts/testcases/hal/tv_cec/hidl/host_profiling/AndroidTest.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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.
--->
-<configuration description="Config for VTS Tv Input HIDL HAL's host-side test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- <option name="push" value="spec/hardware/interfaces/tv/cec/1.0/vts/HdmiCec.vts->/data/local/tmp/spec/HdmiCec.vts" />
- <option name="push" value="spec/hardware/interfaces/tv/cec/1.0/vts/HdmiCecCallback.vts->/data/local/tmp/spec/HdmiCecCallback.vts" />
- <option name="push" value="spec/hardware/interfaces/tv/cec/1.0/vts/types.vts->/data/local/tmp/spec/types.vts" />
- <option name="cleanup" value="true" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer">
- </target_preparer>
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="TvCecHidlProfilingTest" />
- <option name="test-case-path" value="vts/testcases/hal/tv_cec/hidl/host/TvCecHidlTest" />
- <option name="enable-profiling" value="true" />
- </test>
-</configuration>
\ No newline at end of file
diff --git a/tv/cec/1.0/vts/functional/vts/testcases/hal/tv_cec/hidl/host_profiling/__init__.py b/tv/cec/1.0/vts/functional/vts/testcases/hal/tv_cec/hidl/host_profiling/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/tv/cec/1.0/vts/functional/vts/testcases/hal/tv_cec/hidl/host_profiling/__init__.py
+++ /dev/null
diff --git a/tv/input/1.0/Android.bp b/tv/input/1.0/Android.bp
index 6bcb985..ae5e3de 100644
--- a/tv/input/1.0/Android.bp
+++ b/tv/input/1.0/Android.bp
@@ -1,13 +1,20 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
+filegroup {
+ name: "android.hardware.tv.input@1.0_hal",
+ srcs: [
+ "types.hal",
+ "ITvInput.hal",
+ "ITvInputCallback.hal",
+ ],
+}
+
genrule {
name: "android.hardware.tv.input@1.0_genc++",
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tv.input@1.0",
srcs: [
- "types.hal",
- "ITvInput.hal",
- "ITvInputCallback.hal",
+ ":android.hardware.tv.input@1.0_hal",
],
out: [
"android/hardware/tv/input/1.0/types.cpp",
@@ -21,9 +28,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tv.input@1.0",
srcs: [
- "types.hal",
- "ITvInput.hal",
- "ITvInputCallback.hal",
+ ":android.hardware.tv.input@1.0_hal",
],
out: [
"android/hardware/tv/input/1.0/types.h",
@@ -64,159 +69,3 @@
"android.hidl.base@1.0",
],
}
-
-genrule {
- name: "android.hardware.tv.input.vts.driver@1.0_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tv.input@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/tv/input/1.0/ $(genDir)/android/hardware/tv/input/1.0/",
- srcs: [
- "types.hal",
- "ITvInput.hal",
- "ITvInputCallback.hal",
- ],
- out: [
- "android/hardware/tv/input/1.0/types.vts.cpp",
- "android/hardware/tv/input/1.0/TvInput.vts.cpp",
- "android/hardware/tv/input/1.0/TvInputCallback.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.tv.input.vts.driver@1.0_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tv.input@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/tv/input/1.0/ $(genDir)/android/hardware/tv/input/1.0/",
- srcs: [
- "types.hal",
- "ITvInput.hal",
- "ITvInputCallback.hal",
- ],
- out: [
- "android/hardware/tv/input/1.0/types.vts.h",
- "android/hardware/tv/input/1.0/TvInput.vts.h",
- "android/hardware/tv/input/1.0/TvInputCallback.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.tv.input.vts.driver@1.0",
- generated_sources: ["android.hardware.tv.input.vts.driver@1.0_genc++"],
- generated_headers: ["android.hardware.tv.input.vts.driver@1.0_genc++_headers"],
- export_generated_headers: ["android.hardware.tv.input.vts.driver@1.0_genc++_headers"],
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libvts_common",
- "libvts_datatype",
- "libvts_measurement",
- "libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
- "android.hardware.audio.common@2.0",
- "android.hidl.base@1.0",
- "android.hardware.tv.input@1.0",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "android.hardware.audio.common@2.0",
- "android.hidl.base@1.0",
- ],
-}
-
-genrule {
- name: "android.hardware.tv.input@1.0-ITvInput-vts.profiler_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tv.input@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/tv/input/1.0/ $(genDir)/android/hardware/tv/input/1.0/",
- srcs: [
- "ITvInput.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/tv/input/1.0/TvInput.vts.cpp",
- "android/hardware/tv/input/1.0/types.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.tv.input@1.0-ITvInput-vts.profiler_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tv.input@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/tv/input/1.0/ $(genDir)/android/hardware/tv/input/1.0/",
- srcs: [
- "ITvInput.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/tv/input/1.0/TvInput.vts.h",
- "android/hardware/tv/input/1.0/types.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.tv.input@1.0-ITvInput-vts.profiler",
- generated_sources: ["android.hardware.tv.input@1.0-ITvInput-vts.profiler_genc++"],
- generated_headers: ["android.hardware.tv.input@1.0-ITvInput-vts.profiler_genc++_headers"],
- export_generated_headers: ["android.hardware.tv.input@1.0-ITvInput-vts.profiler_genc++_headers"],
- shared_libs: [
- "libbase",
- "libhidlbase",
- "libhidltransport",
- "libvts_profiling",
- "libvts_multidevice_proto",
- "libprotobuf-cpp-full",
- "android.hardware.audio.common@2.0",
- "android.hidl.base@1.0",
- "android.hardware.tv.input@1.0",
- ],
-}
-
-genrule {
- name: "android.hardware.tv.input@1.0-ITvInputCallback-vts.profiler_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tv.input@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/tv/input/1.0/ $(genDir)/android/hardware/tv/input/1.0/",
- srcs: [
- "ITvInputCallback.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/tv/input/1.0/TvInputCallback.vts.cpp",
- "android/hardware/tv/input/1.0/types.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.tv.input@1.0-ITvInputCallback-vts.profiler_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tv.input@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/tv/input/1.0/ $(genDir)/android/hardware/tv/input/1.0/",
- srcs: [
- "ITvInputCallback.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/tv/input/1.0/TvInputCallback.vts.h",
- "android/hardware/tv/input/1.0/types.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.tv.input@1.0-ITvInputCallback-vts.profiler",
- generated_sources: ["android.hardware.tv.input@1.0-ITvInputCallback-vts.profiler_genc++"],
- generated_headers: ["android.hardware.tv.input@1.0-ITvInputCallback-vts.profiler_genc++_headers"],
- export_generated_headers: ["android.hardware.tv.input@1.0-ITvInputCallback-vts.profiler_genc++_headers"],
- shared_libs: [
- "libbase",
- "libhidlbase",
- "libhidltransport",
- "libvts_profiling",
- "libvts_multidevice_proto",
- "libprotobuf-cpp-full",
- "android.hardware.audio.common@2.0",
- "android.hidl.base@1.0",
- "android.hardware.tv.input@1.0",
- ],
-}
diff --git a/tv/input/1.0/default/Android.mk b/tv/input/1.0/default/Android.mk
index 9728015..be1775d 100644
--- a/tv/input/1.0/default/Android.mk
+++ b/tv/input/1.0/default/Android.mk
@@ -2,6 +2,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.tv.input@1.0-impl
+LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_SRC_FILES := \
TvInput.cpp \
@@ -21,6 +22,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE_RELATIVE_PATH := hw
+LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE := android.hardware.tv.input@1.0-service
LOCAL_INIT_RC := android.hardware.tv.input@1.0-service.rc
LOCAL_SRC_FILES := \
diff --git a/tv/input/1.0/default/TvInput.cpp b/tv/input/1.0/default/TvInput.cpp
index 4cd1d40..6fcb2e5 100644
--- a/tv/input/1.0/default/TvInput.cpp
+++ b/tv/input/1.0/default/TvInput.cpp
@@ -98,6 +98,8 @@
++pos;
}
}
+ } else if (ret == -EINVAL) {
+ res = Result::INVALID_ARGUMENTS;
}
cb(res, tvStreamConfigs);
return Void();
diff --git a/tv/input/1.0/default/android.hardware.tv.input@1.0-service.rc b/tv/input/1.0/default/android.hardware.tv.input@1.0-service.rc
index c5bc0b7..9edeba6 100644
--- a/tv/input/1.0/default/android.hardware.tv.input@1.0-service.rc
+++ b/tv/input/1.0/default/android.hardware.tv.input@1.0-service.rc
@@ -1,4 +1,4 @@
-service tv-input-1-0 /system/bin/hw/android.hardware.tv.input@1.0-service
+service tv-input-1-0 /vendor/bin/hw/android.hardware.tv.input@1.0-service
class hal
user system
group system readproc
diff --git a/tv/input/1.0/vts/Android.mk b/tv/input/1.0/vts/Android.mk
deleted file mode 100644
index e0ad01e..0000000
--- a/tv/input/1.0/vts/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(LOCAL_PATH)/functional/vts/testcases/hal/tv_input/hidl/Android.mk
diff --git a/tv/input/1.0/vts/TvInput.vts b/tv/input/1.0/vts/TvInput.vts
index 73b322a..f049fc1 100644
--- a/tv/input/1.0/vts/TvInput.vts
+++ b/tv/input/1.0/vts/TvInput.vts
@@ -4,16 +4,17 @@
package: "android.hardware.tv.input"
+import: "android.hardware.audio.common@2.0::types"
import: "android.hardware.tv.input@1.0::ITvInputCallback"
import: "android.hardware.tv.input@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
api: {
name: "setCallback"
arg: {
type: TYPE_HIDL_CALLBACK
- predefined_type: "ITvInputCallback"
- is_callback: true
+ predefined_type: "::android::hardware::tv::input::V1_0::ITvInputCallback"
}
callflow: {
entry: true
diff --git a/tv/input/1.0/vts/TvInputCallback.vts b/tv/input/1.0/vts/TvInputCallback.vts
index b1738a8..8082b9f 100644
--- a/tv/input/1.0/vts/TvInputCallback.vts
+++ b/tv/input/1.0/vts/TvInputCallback.vts
@@ -4,7 +4,9 @@
package: "android.hardware.tv.input"
+import: "android.hardware.audio.common@2.0::types"
import: "android.hardware.tv.input@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
api: {
diff --git a/tv/input/1.0/vts/functional/Android.bp b/tv/input/1.0/vts/functional/Android.bp
index 979eb99..c327733 100644
--- a/tv/input/1.0/vts/functional/Android.bp
+++ b/tv/input/1.0/vts/functional/Android.bp
@@ -31,13 +31,8 @@
],
static_libs: ["libgtest"],
cflags: [
-// TODO: add --coverage when the segfault issue is fixed.
-// "--coverage",
"-O0",
"-g",
- ],
-// ldflags: [
-// "--coverage"
-// ]
+ ]
}
diff --git a/tv/input/1.0/vts/functional/tv_input_hidl_hal_test.cpp b/tv/input/1.0/vts/functional/tv_input_hidl_hal_test.cpp
index 1279ecd..3747dc5 100644
--- a/tv/input/1.0/vts/functional/tv_input_hidl_hal_test.cpp
+++ b/tv/input/1.0/vts/functional/tv_input_hidl_hal_test.cpp
@@ -22,6 +22,9 @@
#include <android/hardware/tv/input/1.0/ITvInputCallback.h>
#include <gtest/gtest.h>
+#include <utils/KeyedVector.h>
+#include <mutex>
+#include <vector>
using ::android::hardware::tv::input::V1_0::ITvInput;
using ::android::hardware::tv::input::V1_0::ITvInputCallback;
@@ -33,44 +36,158 @@
using ::android::hardware::tv::input::V1_0::TvStreamConfig;
using ::android::hardware::Return;
using ::android::hardware::Void;
+using ::android::hardware::hidl_vec;
using ::android::sp;
+#define WAIT_FOR_EVENT_TIMEOUT 5
+#define DEFAULT_ID INT32_MIN
-// Simple ITvInputCallback used as part of testing.
-class TvInputCallback : public ITvInputCallback {
- public:
- TvInputCallback() {};
-
- virtual ~TvInputCallback() = default;
-
- // notify callback function - currently no-op.
- // TODO: modify it later.
- Return<void> notify(const TvInputEvent& event) override {
- return Void();
- };
-};
-
-
-// The main test class for TV Input HIDL HAL.
+/* The main test class for TV Input HIDL HAL. */
class TvInputHidlTest : public ::testing::Test {
public:
virtual void SetUp() override {
- // currently test passthrough mode only
- tv_input = ITvInput::getService();
- ASSERT_NE(tv_input, nullptr);
-
- tv_input_callback = new TvInputCallback();
- ASSERT_NE(tv_input_callback, nullptr);
+ tv_input_ = ITvInput::getService();
+ ASSERT_NE(tv_input_, nullptr);
+ tv_input_callback_ = new TvInputCallback(*this);
+ ASSERT_NE(tv_input_callback_, nullptr);
+ tv_input_->setCallback(tv_input_callback_);
+ // All events received within the timeout should be handled.
+ sleep(WAIT_FOR_EVENT_TIMEOUT);
}
virtual void TearDown() override {}
- sp<ITvInput> tv_input;
- sp<ITvInputCallback> tv_input_callback;
+ /* Called when a DEVICE_AVAILABLE event is received. */
+ void onDeviceAvailable(const TvInputDeviceInfo& deviceInfo) {
+ device_info_.add(deviceInfo.deviceId, deviceInfo);
+ }
+
+ /* Called when a DEVICE_UNAVAILABLE event is received. */
+ void onDeviceUnavailable(int32_t deviceId) {
+ device_info_.removeItem(deviceId);
+ }
+
+ /* Called when a DEVICE_CONFIGURATIONS_CHANGED event is received. */
+ Result onStreamConfigurationsChanged(int32_t deviceId) {
+ return updateStreamConfigurations(deviceId);
+ }
+
+ /* Gets and updates the stream configurations for a device. */
+ Result updateStreamConfigurations(int32_t deviceId) {
+ stream_config_.removeItem(deviceId);
+ Result result = Result::UNKNOWN;
+ hidl_vec<TvStreamConfig> list;
+ tv_input_->getStreamConfigurations(deviceId,
+ [&result, &list](Result res, hidl_vec<TvStreamConfig> configs) {
+ result = res;
+ if (res == Result::OK) {
+ list = configs;
+ }
+ });
+ if (result == Result::OK) {
+ stream_config_.add(deviceId, list);
+ }
+ return result;
+ }
+
+ /* Gets and updates the stream configurations for all existing devices. */
+ void updateAllStreamConfigurations() {
+ for (size_t i = 0; i < device_info_.size(); i++) {
+ int32_t device_id = device_info_.keyAt(i);
+ updateStreamConfigurations(device_id);
+ }
+ }
+
+ /* Returns a list of indices of stream_config_ whose corresponding values are not empty. */
+ std::vector<size_t> getConfigIndices() {
+ std::vector<size_t> indices;
+ for (size_t i = 0; i < stream_config_.size(); i++) {
+ if (stream_config_.valueAt(i).size() != 0) {
+ indices.push_back(i);
+ }
+ }
+ return indices;
+ }
+
+ /*
+ * Returns DEFAULT_ID if there is no missing integer in the range [0, the size of nums).
+ * Otherwise, returns the smallest missing non-negative integer.
+ */
+ int32_t getNumNotIn(std::vector<int32_t>& nums) {
+ int32_t result = DEFAULT_ID;
+ int32_t size = static_cast<int32_t>(nums.size());
+ for (int32_t i = 0; i < size; i++) {
+ // Put every element to its target position, if possible.
+ int32_t target_pos = nums[i];
+ while (target_pos >= 0 && target_pos < size && i != target_pos && nums[i] != nums[target_pos]) {
+ std::swap(nums[i], nums[target_pos]);
+ target_pos = nums[i];
+ }
+ }
+
+ for (int32_t i = 0; i < size; i++) {
+ if (nums[i] != i) {
+ return i;
+ }
+ }
+ return result;
+ }
+
+ /* A simple test implementation of TvInputCallback for TV Input Events. */
+ class TvInputCallback : public ITvInputCallback {
+ public:
+ TvInputCallback(TvInputHidlTest& parent) : parent_(parent){};
+
+ virtual ~TvInputCallback() = default;
+
+ /*
+ * Notifies the client that an event has occured. For possible event types,
+ * check TvInputEventType.
+ */
+ Return<void> notify(const TvInputEvent& event) override {
+ std::unique_lock<std::mutex> lock(parent_.mutex_);
+ switch(event.type) {
+ case TvInputEventType::DEVICE_AVAILABLE:
+ parent_.onDeviceAvailable(event.deviceInfo);
+ break;
+ case TvInputEventType::DEVICE_UNAVAILABLE:
+ parent_.onDeviceUnavailable(event.deviceInfo.deviceId);
+ break;
+ case TvInputEventType::STREAM_CONFIGURATIONS_CHANGED:
+ parent_.onStreamConfigurationsChanged(event.deviceInfo.deviceId);
+ break;
+ }
+ return Void();
+ };
+ private:
+ /* The test contains this callback instance. */
+ TvInputHidlTest& parent_;
+ };
+
+ /* The TvInput used for the test. */
+ sp<ITvInput> tv_input_;
+
+ /* The TvInputCallback used for the test. */
+ sp<ITvInputCallback> tv_input_callback_;
+
+ /*
+ * A KeyedVector stores device information of every available device.
+ * A key is a device ID and the corresponding value is the TvInputDeviceInfo.
+ */
+ android::KeyedVector<int32_t, TvInputDeviceInfo> device_info_;
+
+ /*
+ * A KeyedVector stores a list of stream configurations of every available device.
+ * A key is a device ID and the corresponding value is the stream configuration list.
+ */
+ android::KeyedVector<int32_t, hidl_vec<TvStreamConfig>> stream_config_;
+
+ /* The mutex controls the access of shared data. */
+ std::mutex mutex_;
};
-// A class for test environment setup.
+/* A class for test environment setup. */
class TvInputHidlEnvironment : public ::testing::Environment {
public:
virtual void SetUp() {}
@@ -79,9 +196,161 @@
private:
};
-// TODO: remove this test and add meaningful tests.
-TEST_F(TvInputHidlTest, DummyTest) {
- EXPECT_NE(tv_input, nullptr);
+/*
+ * GetStreamConfigTest:
+ * Calls updateStreamConfigurations() for each existing device
+ * Checks returned results
+ */
+TEST_F(TvInputHidlTest, GetStreamConfigTest) {
+ std::unique_lock<std::mutex> lock(mutex_);
+ for (size_t i = 0; i < device_info_.size(); i++) {
+ int32_t device_id = device_info_.keyAt(i);
+ Result result = updateStreamConfigurations(device_id);
+ EXPECT_EQ(Result::OK, result);
+ }
+}
+
+/*
+ * OpenAndCloseStreamTest:
+ * Calls openStream() and then closeStream() for each existing stream
+ * Checks returned results
+ */
+TEST_F(TvInputHidlTest, OpenAndCloseStreamTest) {
+ std::unique_lock<std::mutex> lock(mutex_);
+ updateAllStreamConfigurations();
+ for (size_t j = 0; j < stream_config_.size(); j++) {
+ int32_t device_id = stream_config_.keyAt(j);
+ hidl_vec<TvStreamConfig> config = stream_config_.valueAt(j);
+ for (size_t i = 0; i < config.size(); i++) {
+ Result result = Result::UNKNOWN;
+ int32_t stream_id = config[i].streamId;
+ tv_input_->openStream(device_id, stream_id,
+ [&result](Result res, const native_handle_t*) {
+ result = res;
+ });
+ EXPECT_EQ(Result::OK, result);
+
+ result = Result::UNKNOWN;
+ result = tv_input_->closeStream(device_id, stream_id);
+ EXPECT_EQ(Result::OK, result);
+ }
+ }
+}
+
+/*
+ * InvalidDeviceIdTest:
+ * Calls updateStreamConfigurations(), openStream(), and closeStream()
+ * for a non-existing device
+ * Checks returned results
+ * The results should be Result::INVALID_ARGUMENTS
+ */
+TEST_F(TvInputHidlTest, InvalidDeviceIdTest) {
+ std::unique_lock<std::mutex> lock(mutex_);
+
+ std::vector<int32_t> device_ids;
+ for (size_t i = 0; i < device_info_.size(); i++) {
+ device_ids.push_back(device_info_.keyAt(i));
+ }
+ // Get a non-existing device ID.
+ int32_t id = getNumNotIn(device_ids);
+ EXPECT_EQ(Result::INVALID_ARGUMENTS, updateStreamConfigurations(id));
+
+ Result result = Result::UNKNOWN;
+ int32_t stream_id = 0;
+ tv_input_->openStream(id, stream_id,
+ [&result](Result res, const native_handle_t*) {
+ result = res;
+ });
+ EXPECT_EQ(Result::INVALID_ARGUMENTS, result);
+
+ result = Result::UNKNOWN;
+ result = tv_input_->closeStream(id, stream_id);
+ EXPECT_EQ(Result::INVALID_ARGUMENTS, result);
+}
+
+/*
+ * InvalidStreamIdTest:
+ * Calls openStream(), and closeStream() for a non-existing stream
+ * Checks returned results
+ * The results should be Result::INVALID_ARGUMENTS
+ */
+TEST_F(TvInputHidlTest, InvalidStreamIdTest) {
+ std::unique_lock<std::mutex> lock(mutex_);
+ if (device_info_.isEmpty()) {
+ return;
+ }
+ updateAllStreamConfigurations();
+
+ int32_t device_id = device_info_.keyAt(0);
+ // Get a non-existing stream ID.
+ int32_t id = DEFAULT_ID;
+ if (stream_config_.indexOfKey(device_id) >= 0) {
+ std::vector<int32_t> stream_ids;
+ hidl_vec<TvStreamConfig> config = stream_config_.valueFor(device_id);
+ for (size_t i = 0; i < config.size(); i++) {
+ stream_ids.push_back(config[i].streamId);
+ }
+ id = getNumNotIn(stream_ids);
+ }
+
+ Result result = Result::UNKNOWN;
+ tv_input_->openStream(device_id, id,
+ [&result](Result res, const native_handle_t*) {
+ result = res;
+ });
+ EXPECT_EQ(Result::INVALID_ARGUMENTS, result);
+
+ result = Result::UNKNOWN;
+ result = tv_input_->closeStream(device_id, id);
+ EXPECT_EQ(Result::INVALID_ARGUMENTS, result);
+}
+
+/*
+ * OpenAnOpenedStreamsTest:
+ * Calls openStream() twice for a stream (if any)
+ * Checks returned results
+ * The result of the second call should be Result::INVALID_STATE
+ */
+TEST_F(TvInputHidlTest, OpenAnOpenedStreamsTest) {
+ std::unique_lock<std::mutex> lock(mutex_);
+ updateAllStreamConfigurations();
+ std::vector<size_t> indices = getConfigIndices();
+ if (indices.empty()) {
+ return;
+ }
+ int32_t device_id = stream_config_.keyAt(indices[0]);
+ int32_t stream_id = stream_config_.valueAt(indices[0])[0].streamId;
+
+ Result result = Result::UNKNOWN;
+ tv_input_->openStream(device_id, stream_id,
+ [&result](Result res, const native_handle_t*) {
+ result = res;
+ });
+ EXPECT_EQ(Result::OK, result);
+
+ tv_input_->openStream(device_id, stream_id,
+ [&result](Result res, const native_handle_t*) {
+ result = res;
+ });
+ EXPECT_EQ(Result::INVALID_STATE, result);
+}
+
+/*
+ * CloseStreamBeforeOpenTest:
+ * Calls closeStream() without calling openStream() for a stream (if any)
+ * Checks the returned result
+ * The result should be Result::INVALID_STATE
+ */
+TEST_F(TvInputHidlTest, CloseStreamBeforeOpenTest) {
+ std::unique_lock<std::mutex> lock(mutex_);
+ updateAllStreamConfigurations();
+ std::vector<size_t> indices = getConfigIndices();
+ if (indices.empty()) {
+ return;
+ }
+ int32_t device_id = stream_config_.keyAt(indices[0]);
+ int32_t stream_id = stream_config_.valueAt(indices[0])[0].streamId;
+ EXPECT_EQ(Result::INVALID_STATE, tv_input_->closeStream(device_id, stream_id));
}
int main(int argc, char **argv) {
diff --git a/tv/input/1.0/vts/functional/vts/testcases/hal/tv_input/__init__.py b/tv/input/1.0/vts/functional/vts/testcases/hal/tv_input/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/tv/input/1.0/vts/functional/vts/testcases/hal/tv_input/__init__.py
+++ /dev/null
diff --git a/tv/input/1.0/vts/functional/vts/testcases/hal/tv_input/hidl/Android.mk b/tv/input/1.0/vts/functional/vts/testcases/hal/tv_input/hidl/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/tv/input/1.0/vts/functional/vts/testcases/hal/tv_input/hidl/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/tv/input/1.0/vts/functional/vts/testcases/hal/tv_input/hidl/__init__.py b/tv/input/1.0/vts/functional/vts/testcases/hal/tv_input/hidl/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/tv/input/1.0/vts/functional/vts/testcases/hal/tv_input/hidl/__init__.py
+++ /dev/null
diff --git a/tv/input/1.0/vts/functional/vts/testcases/hal/tv_input/hidl/host/Android.mk b/tv/input/1.0/vts/functional/vts/testcases/hal/tv_input/hidl/host/Android.mk
deleted file mode 100644
index 1757bfe..0000000
--- a/tv/input/1.0/vts/functional/vts/testcases/hal/tv_input/hidl/host/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := TvInputHidlTest
-VTS_CONFIG_SRC_DIR := testcases/hal/tv_input/hidl/host
-include test/vts/tools/build/Android.host_config.mk
diff --git a/tv/input/1.0/vts/functional/vts/testcases/hal/tv_input/hidl/host/AndroidTest.xml b/tv/input/1.0/vts/functional/vts/testcases/hal/tv_input/hidl/host/AndroidTest.xml
deleted file mode 100644
index 8fdd72d..0000000
--- a/tv/input/1.0/vts/functional/vts/testcases/hal/tv_input/hidl/host/AndroidTest.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<configuration description="Config for VTS Tv Input HIDL HAL's host-side test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- <option name="push" value="spec/hardware/interfaces/tv/input/1.0/vts/TvInput.vts->/data/local/tmp/spec/TvInput.vts" />
- <option name="push" value="spec/hardware/interfaces/tv/input/1.0/vts/TvInputCallback.vts->/data/local/tmp/spec/TvInputCallback.vts" />
- <option name="push" value="spec/hardware/interfaces/tv/input/1.0/vts/types.vts->/data/local/tmp/spec/types.vts" />
- <option name="cleanup" value="true" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer">
- </target_preparer>
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="TvInputHidlTest" />
- <option name="test-case-path" value="vts/testcases/hal/tv_input/hidl/host/TvInputHidlTest" />
- </test>
-</configuration>
diff --git a/tv/input/1.0/vts/functional/vts/testcases/hal/tv_input/hidl/host/TvInputHidlTest.py b/tv/input/1.0/vts/functional/vts/testcases/hal/tv_input/hidl/host/TvInputHidlTest.py
deleted file mode 100644
index 828b9dd..0000000
--- a/tv/input/1.0/vts/functional/vts/testcases/hal/tv_input/hidl/host/TvInputHidlTest.py
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright (C) 2016 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.
-#
-
-import logging
-
-from vts.runners.host import asserts
-from vts.runners.host import base_test_with_webdb
-from vts.runners.host import const
-from vts.runners.host import keys
-from vts.runners.host import test_runner
-from vts.utils.python.controllers import android_device
-from vts.utils.python.coverage import coverage_utils
-
-
-class TvInputHidlTest(base_test_with_webdb.BaseTestWithWebDbClass):
- """Two hello world test cases which use the shell driver."""
-
- def setUpClass(self):
- """Creates a mirror and init tv input hal."""
- self.dut = self.registerController(android_device)[0]
-
- self.dut.shell.InvokeTerminal("one")
- self.dut.shell.one.Execute("setenforce 0") # SELinux permissive mode
-
- if getattr(self, keys.ConfigKeys.IKEY_ENABLE_COVERAGE, False):
- coverage_utils.InitializeDeviceCoverage(self.dut)
-
- self.dut.hal.InitHidlHal(target_type="tv_input",
- target_basepaths=["/system/lib64"],
- target_version=1.0,
- target_package="android.hardware.tv.input",
- target_component_name="ITvInput",
- bits=64 if self.dut.is64Bit else 32)
-
- self.dut.shell.InvokeTerminal("one")
-
- def tearDownClass(self):
- """To be executed when all test cases are finished."""
- if getattr(self, keys.ConfigKeys.IKEY_ENABLE_COVERAGE, False):
- self.SetCoverageData(coverage_utils.GetGcdaDict(self.dut))
-
- def testGetStreamConfigurations(self):
- configs = self.dut.hal.tv_input.getStreamConfigurations(0)
- logging.info('return value of getStreamConfigurations(0): %s', configs)
-
-
-if __name__ == "__main__":
- test_runner.main()
diff --git a/tv/input/1.0/vts/functional/vts/testcases/hal/tv_input/hidl/host/__init__.py b/tv/input/1.0/vts/functional/vts/testcases/hal/tv_input/hidl/host/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/tv/input/1.0/vts/functional/vts/testcases/hal/tv_input/hidl/host/__init__.py
+++ /dev/null
diff --git a/tv/input/1.0/vts/functional/vts/testcases/hal/tv_input/hidl/host_profiling/Android.mk b/tv/input/1.0/vts/functional/vts/testcases/hal/tv_input/hidl/host_profiling/Android.mk
deleted file mode 100644
index 514df20..0000000
--- a/tv/input/1.0/vts/functional/vts/testcases/hal/tv_input/hidl/host_profiling/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2017 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := TvInputHidlProfilingTest
-VTS_CONFIG_SRC_DIR := testcases/hal/tv_input/hidl/host_profiling
-include test/vts/tools/build/Android.host_config.mk
diff --git a/tv/input/1.0/vts/functional/vts/testcases/hal/tv_input/hidl/host_profiling/AndroidTest.xml b/tv/input/1.0/vts/functional/vts/testcases/hal/tv_input/hidl/host_profiling/AndroidTest.xml
deleted file mode 100644
index 5b8e6f9..0000000
--- a/tv/input/1.0/vts/functional/vts/testcases/hal/tv_input/hidl/host_profiling/AndroidTest.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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.
--->
-<configuration description="Config for VTS Tv Input HIDL HAL's host-side test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- <option name="push" value="spec/hardware/interfaces/tv/input/1.0/vts/TvInput.vts->/data/local/tmp/spec/TvInput.vts" />
- <option name="push" value="spec/hardware/interfaces/tv/input/1.0/vts/TvInputCallback.vts->/data/local/tmp/spec/TvInputCallback.vts" />
- <option name="push" value="spec/hardware/interfaces/tv/input/1.0/vts/types.vts->/data/local/tmp/spec/types.vts" />
- <option name="cleanup" value="true" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer">
- </target_preparer>
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="TvInputHidlProfilingTest" />
- <option name="test-case-path" value="vts/testcases/hal/tv_input/hidl/host/TvInputHidlTest" />
- <option name="enable-profiling" value="true" />
- </test>
-</configuration>
diff --git a/tv/input/1.0/vts/functional/vts/testcases/hal/tv_input/hidl/host_profiling/__init__.py b/tv/input/1.0/vts/functional/vts/testcases/hal/tv_input/hidl/host_profiling/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/tv/input/1.0/vts/functional/vts/testcases/hal/tv_input/hidl/host_profiling/__init__.py
+++ /dev/null
diff --git a/tv/input/1.0/vts/functional/vts/testcases/hal/tv_input/hidl/target/Android.mk b/tv/input/1.0/vts/functional/vts/testcases/hal/tv_input/hidl/target/Android.mk
deleted file mode 100644
index 153da0b..0000000
--- a/tv/input/1.0/vts/functional/vts/testcases/hal/tv_input/hidl/target/Android.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Copyright (C) 2017 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := HalTvInputHidlTargetTest
-VTS_CONFIG_SRC_DIR := testcases/hal/tv_input/hidl/target
-include test/vts/tools/build/Android.host_config.mk
-
diff --git a/tv/input/1.0/vts/functional/vts/testcases/hal/tv_input/hidl/target/AndroidTest.xml b/tv/input/1.0/vts/functional/vts/testcases/hal/tv_input/hidl/target/AndroidTest.xml
deleted file mode 100644
index 4f98940..0000000
--- a/tv/input/1.0/vts/functional/vts/testcases/hal/tv_input/hidl/target/AndroidTest.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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.
--->
-<configuration description="Config for VTS TV Input HIDL HAL's target-side test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="HalTvInputHidlTargetTest"/>
- <option name="binary-test-sources" value="
- _32bit::DATA/nativetest/tv_input_hidl_hal_test/tv_input_hidl_hal_test,
- "/>
- <option name="binary-test-type" value="gtest" />
- <option name="test-timeout" value="1m" />
- </test>
-</configuration>
-
diff --git a/tv/input/1.0/vts/types.vts b/tv/input/1.0/vts/types.vts
index d03e065..cb1d472 100644
--- a/tv/input/1.0/vts/types.vts
+++ b/tv/input/1.0/vts/types.vts
@@ -7,1926 +7,6 @@
import: "android.hardware.audio.common@2.0::types"
attribute: {
- name: "::android::hardware::audio::common::V2_0::AudioHandleConsts"
- type: TYPE_ENUM
- enum_value: {
- scalar_type: "int32_t"
-
- enumerator: "AUDIO_IO_HANDLE_NONE"
- scalar_value: {
- int32_t: 0
- }
- enumerator: "AUDIO_MODULE_HANDLE_NONE"
- scalar_value: {
- int32_t: 0
- }
- enumerator: "AUDIO_PORT_HANDLE_NONE"
- scalar_value: {
- int32_t: 0
- }
- enumerator: "AUDIO_PATCH_HANDLE_NONE"
- scalar_value: {
- int32_t: 0
- }
- }
-}
-
-attribute: {
- name: "::android::hardware::audio::common::V2_0::Uuid"
- type: TYPE_STRUCT
- struct_value: {
- name: "timeLow"
- type: TYPE_SCALAR
- scalar_type: "uint32_t"
- }
- struct_value: {
- name: "timeMid"
- type: TYPE_SCALAR
- scalar_type: "uint16_t"
- }
- struct_value: {
- name: "versionAndTimeHigh"
- type: TYPE_SCALAR
- scalar_type: "uint16_t"
- }
- struct_value: {
- name: "variantAndClockSeqHigh"
- type: TYPE_SCALAR
- scalar_type: "uint16_t"
- }
- struct_value: {
- name: "node"
- type: TYPE_ARRAY
- vector_value: {
- vector_size: 6
- type: TYPE_SCALAR
- scalar_type: "uint8_t"
- }
- }
-}
-
-attribute: {
- name: "::android::hardware::audio::common::V2_0::AudioStreamType"
- type: TYPE_ENUM
- enum_value: {
- scalar_type: "int32_t"
-
- enumerator: "DEFAULT"
- scalar_value: {
- int32_t: -1
- }
- enumerator: "MIN"
- scalar_value: {
- int32_t: 0
- }
- enumerator: "VOICE_CALL"
- scalar_value: {
- int32_t: 0
- }
- enumerator: "SYSTEM"
- scalar_value: {
- int32_t: 1
- }
- enumerator: "RING"
- scalar_value: {
- int32_t: 2
- }
- enumerator: "MUSIC"
- scalar_value: {
- int32_t: 3
- }
- enumerator: "ALARM"
- scalar_value: {
- int32_t: 4
- }
- enumerator: "NOTIFICATION"
- scalar_value: {
- int32_t: 5
- }
- enumerator: "BLUETOOTH_SCO"
- scalar_value: {
- int32_t: 6
- }
- enumerator: "ENFORCED_AUDIBLE"
- scalar_value: {
- int32_t: 7
- }
- enumerator: "DTMF"
- scalar_value: {
- int32_t: 8
- }
- enumerator: "TTS"
- scalar_value: {
- int32_t: 9
- }
- enumerator: "ACCESSIBILITY"
- scalar_value: {
- int32_t: 10
- }
- enumerator: "REROUTING"
- scalar_value: {
- int32_t: 11
- }
- enumerator: "PATCH"
- scalar_value: {
- int32_t: 12
- }
- enumerator: "PUBLIC_CNT"
- scalar_value: {
- int32_t: 11
- }
- enumerator: "FOR_POLICY_CNT"
- scalar_value: {
- int32_t: 12
- }
- enumerator: "CNT"
- scalar_value: {
- int32_t: 13
- }
- }
-}
-
-attribute: {
- name: "::android::hardware::audio::common::V2_0::AudioSource"
- type: TYPE_ENUM
- enum_value: {
- scalar_type: "int32_t"
-
- enumerator: "DEFAULT"
- scalar_value: {
- int32_t: 0
- }
- enumerator: "MIC"
- scalar_value: {
- int32_t: 1
- }
- enumerator: "VOICE_UPLINK"
- scalar_value: {
- int32_t: 2
- }
- enumerator: "VOICE_DOWNLINK"
- scalar_value: {
- int32_t: 3
- }
- enumerator: "VOICE_CALL"
- scalar_value: {
- int32_t: 4
- }
- enumerator: "CAMCORDER"
- scalar_value: {
- int32_t: 5
- }
- enumerator: "VOICE_RECOGNITION"
- scalar_value: {
- int32_t: 6
- }
- enumerator: "VOICE_COMMUNICATION"
- scalar_value: {
- int32_t: 7
- }
- enumerator: "REMOTE_SUBMIX"
- scalar_value: {
- int32_t: 8
- }
- enumerator: "UNPROCESSED"
- scalar_value: {
- int32_t: 9
- }
- enumerator: "CNT"
- scalar_value: {
- int32_t: 10
- }
- enumerator: "MAX"
- scalar_value: {
- int32_t: 9
- }
- enumerator: "FM_TUNER"
- scalar_value: {
- int32_t: 1998
- }
- enumerator: "HOTWORD"
- scalar_value: {
- int32_t: 1999
- }
- }
-}
-
-attribute: {
- name: "::android::hardware::audio::common::V2_0::AudioSessionConsts"
- type: TYPE_ENUM
- enum_value: {
- scalar_type: "int32_t"
-
- enumerator: "OUTPUT_STAGE"
- scalar_value: {
- int32_t: -1
- }
- enumerator: "OUTPUT_MIX"
- scalar_value: {
- int32_t: 0
- }
- enumerator: "ALLOCATE"
- scalar_value: {
- int32_t: 0
- }
- enumerator: "NONE"
- scalar_value: {
- int32_t: 0
- }
- }
-}
-
-attribute: {
- name: "::android::hardware::audio::common::V2_0::AudioFormat"
- type: TYPE_ENUM
- enum_value: {
- scalar_type: "uint32_t"
-
- enumerator: "INVALID"
- scalar_value: {
- uint32_t: 4294967295
- }
- enumerator: "DEFAULT"
- scalar_value: {
- uint32_t: 0
- }
- enumerator: "PCM"
- scalar_value: {
- uint32_t: 0
- }
- enumerator: "MP3"
- scalar_value: {
- uint32_t: 16777216
- }
- enumerator: "AMR_NB"
- scalar_value: {
- uint32_t: 33554432
- }
- enumerator: "AMR_WB"
- scalar_value: {
- uint32_t: 50331648
- }
- enumerator: "AAC"
- scalar_value: {
- uint32_t: 67108864
- }
- enumerator: "HE_AAC_V1"
- scalar_value: {
- uint32_t: 83886080
- }
- enumerator: "HE_AAC_V2"
- scalar_value: {
- uint32_t: 100663296
- }
- enumerator: "VORBIS"
- scalar_value: {
- uint32_t: 117440512
- }
- enumerator: "OPUS"
- scalar_value: {
- uint32_t: 134217728
- }
- enumerator: "AC3"
- scalar_value: {
- uint32_t: 150994944
- }
- enumerator: "E_AC3"
- scalar_value: {
- uint32_t: 167772160
- }
- enumerator: "DTS"
- scalar_value: {
- uint32_t: 184549376
- }
- enumerator: "DTS_HD"
- scalar_value: {
- uint32_t: 201326592
- }
- enumerator: "IEC61937"
- scalar_value: {
- uint32_t: 218103808
- }
- enumerator: "DOLBY_TRUEHD"
- scalar_value: {
- uint32_t: 234881024
- }
- enumerator: "EVRC"
- scalar_value: {
- uint32_t: 268435456
- }
- enumerator: "EVRCB"
- scalar_value: {
- uint32_t: 285212672
- }
- enumerator: "EVRCWB"
- scalar_value: {
- uint32_t: 301989888
- }
- enumerator: "EVRCNW"
- scalar_value: {
- uint32_t: 318767104
- }
- enumerator: "AAC_ADIF"
- scalar_value: {
- uint32_t: 335544320
- }
- enumerator: "WMA"
- scalar_value: {
- uint32_t: 352321536
- }
- enumerator: "WMA_PRO"
- scalar_value: {
- uint32_t: 369098752
- }
- enumerator: "AMR_WB_PLUS"
- scalar_value: {
- uint32_t: 385875968
- }
- enumerator: "MP2"
- scalar_value: {
- uint32_t: 402653184
- }
- enumerator: "QCELP"
- scalar_value: {
- uint32_t: 419430400
- }
- enumerator: "DSD"
- scalar_value: {
- uint32_t: 436207616
- }
- enumerator: "FLAC"
- scalar_value: {
- uint32_t: 452984832
- }
- enumerator: "ALAC"
- scalar_value: {
- uint32_t: 469762048
- }
- enumerator: "APE"
- scalar_value: {
- uint32_t: 486539264
- }
- enumerator: "AAC_ADTS"
- scalar_value: {
- uint32_t: 503316480
- }
- enumerator: "SBC"
- scalar_value: {
- uint32_t: 520093696
- }
- enumerator: "APTX"
- scalar_value: {
- uint32_t: 536870912
- }
- enumerator: "APTX_HD"
- scalar_value: {
- uint32_t: 553648128
- }
- enumerator: "LDAC"
- scalar_value: {
- uint32_t: 570425344
- }
- enumerator: "MAIN_MASK"
- scalar_value: {
- uint32_t: 4278190080
- }
- enumerator: "SUB_MASK"
- scalar_value: {
- uint32_t: 16777215
- }
- enumerator: "PCM_SUB_16_BIT"
- scalar_value: {
- uint32_t: 1
- }
- enumerator: "PCM_SUB_8_BIT"
- scalar_value: {
- uint32_t: 2
- }
- enumerator: "PCM_SUB_32_BIT"
- scalar_value: {
- uint32_t: 3
- }
- enumerator: "PCM_SUB_8_24_BIT"
- scalar_value: {
- uint32_t: 4
- }
- enumerator: "PCM_SUB_FLOAT"
- scalar_value: {
- uint32_t: 5
- }
- enumerator: "PCM_SUB_24_BIT_PACKED"
- scalar_value: {
- uint32_t: 6
- }
- enumerator: "MP3_SUB_NONE"
- scalar_value: {
- uint32_t: 0
- }
- enumerator: "AMR_SUB_NONE"
- scalar_value: {
- uint32_t: 0
- }
- enumerator: "AAC_SUB_MAIN"
- scalar_value: {
- uint32_t: 1
- }
- enumerator: "AAC_SUB_LC"
- scalar_value: {
- uint32_t: 2
- }
- enumerator: "AAC_SUB_SSR"
- scalar_value: {
- uint32_t: 4
- }
- enumerator: "AAC_SUB_LTP"
- scalar_value: {
- uint32_t: 8
- }
- enumerator: "AAC_SUB_HE_V1"
- scalar_value: {
- uint32_t: 16
- }
- enumerator: "AAC_SUB_SCALABLE"
- scalar_value: {
- uint32_t: 32
- }
- enumerator: "AAC_SUB_ERLC"
- scalar_value: {
- uint32_t: 64
- }
- enumerator: "AAC_SUB_LD"
- scalar_value: {
- uint32_t: 128
- }
- enumerator: "AAC_SUB_HE_V2"
- scalar_value: {
- uint32_t: 256
- }
- enumerator: "AAC_SUB_ELD"
- scalar_value: {
- uint32_t: 512
- }
- enumerator: "VORBIS_SUB_NONE"
- scalar_value: {
- uint32_t: 0
- }
- enumerator: "PCM_16_BIT"
- scalar_value: {
- uint32_t: 1
- }
- enumerator: "PCM_8_BIT"
- scalar_value: {
- uint32_t: 2
- }
- enumerator: "PCM_32_BIT"
- scalar_value: {
- uint32_t: 3
- }
- enumerator: "PCM_8_24_BIT"
- scalar_value: {
- uint32_t: 4
- }
- enumerator: "PCM_FLOAT"
- scalar_value: {
- uint32_t: 5
- }
- enumerator: "PCM_24_BIT_PACKED"
- scalar_value: {
- uint32_t: 6
- }
- enumerator: "AAC_MAIN"
- scalar_value: {
- uint32_t: 67108865
- }
- enumerator: "AAC_LC"
- scalar_value: {
- uint32_t: 67108866
- }
- enumerator: "AAC_SSR"
- scalar_value: {
- uint32_t: 67108868
- }
- enumerator: "AAC_LTP"
- scalar_value: {
- uint32_t: 67108872
- }
- enumerator: "AAC_HE_V1"
- scalar_value: {
- uint32_t: 67108880
- }
- enumerator: "AAC_SCALABLE"
- scalar_value: {
- uint32_t: 67108896
- }
- enumerator: "AAC_ERLC"
- scalar_value: {
- uint32_t: 67108928
- }
- enumerator: "AAC_LD"
- scalar_value: {
- uint32_t: 67108992
- }
- enumerator: "AAC_HE_V2"
- scalar_value: {
- uint32_t: 67109120
- }
- enumerator: "AAC_ELD"
- scalar_value: {
- uint32_t: 67109376
- }
- enumerator: "AAC_ADTS_MAIN"
- scalar_value: {
- uint32_t: 503316481
- }
- enumerator: "AAC_ADTS_LC"
- scalar_value: {
- uint32_t: 503316482
- }
- enumerator: "AAC_ADTS_SSR"
- scalar_value: {
- uint32_t: 503316484
- }
- enumerator: "AAC_ADTS_LTP"
- scalar_value: {
- uint32_t: 503316488
- }
- enumerator: "AAC_ADTS_HE_V1"
- scalar_value: {
- uint32_t: 503316496
- }
- enumerator: "AAC_ADTS_SCALABLE"
- scalar_value: {
- uint32_t: 503316512
- }
- enumerator: "AAC_ADTS_ERLC"
- scalar_value: {
- uint32_t: 503316544
- }
- enumerator: "AAC_ADTS_LD"
- scalar_value: {
- uint32_t: 503316608
- }
- enumerator: "AAC_ADTS_HE_V2"
- scalar_value: {
- uint32_t: 503316736
- }
- enumerator: "AAC_ADTS_ELD"
- scalar_value: {
- uint32_t: 503316992
- }
- }
-}
-
-attribute: {
- name: "::android::hardware::audio::common::V2_0::FixedChannelCount"
- type: TYPE_ENUM
- enum_value: {
- scalar_type: "int32_t"
-
- enumerator: "FCC_2"
- scalar_value: {
- int32_t: 2
- }
- enumerator: "FCC_8"
- scalar_value: {
- int32_t: 8
- }
- }
-}
-
-attribute: {
- name: "::android::hardware::audio::common::V2_0::AudioChannelMask"
- type: TYPE_ENUM
- enum_value: {
- scalar_type: "uint32_t"
-
- enumerator: "REPRESENTATION_POSITION"
- scalar_value: {
- uint32_t: 0
- }
- enumerator: "REPRESENTATION_INDEX"
- scalar_value: {
- uint32_t: 2
- }
- enumerator: "NONE"
- scalar_value: {
- uint32_t: 0
- }
- enumerator: "INVALID"
- scalar_value: {
- uint32_t: 3221225472
- }
- enumerator: "OUT_FRONT_LEFT"
- scalar_value: {
- uint32_t: 1
- }
- enumerator: "OUT_FRONT_RIGHT"
- scalar_value: {
- uint32_t: 2
- }
- enumerator: "OUT_FRONT_CENTER"
- scalar_value: {
- uint32_t: 4
- }
- enumerator: "OUT_LOW_FREQUENCY"
- scalar_value: {
- uint32_t: 8
- }
- enumerator: "OUT_BACK_LEFT"
- scalar_value: {
- uint32_t: 16
- }
- enumerator: "OUT_BACK_RIGHT"
- scalar_value: {
- uint32_t: 32
- }
- enumerator: "OUT_FRONT_LEFT_OF_CENTER"
- scalar_value: {
- uint32_t: 64
- }
- enumerator: "OUT_FRONT_RIGHT_OF_CENTER"
- scalar_value: {
- uint32_t: 128
- }
- enumerator: "OUT_BACK_CENTER"
- scalar_value: {
- uint32_t: 256
- }
- enumerator: "OUT_SIDE_LEFT"
- scalar_value: {
- uint32_t: 512
- }
- enumerator: "OUT_SIDE_RIGHT"
- scalar_value: {
- uint32_t: 1024
- }
- enumerator: "OUT_TOP_CENTER"
- scalar_value: {
- uint32_t: 2048
- }
- enumerator: "OUT_TOP_FRONT_LEFT"
- scalar_value: {
- uint32_t: 4096
- }
- enumerator: "OUT_TOP_FRONT_CENTER"
- scalar_value: {
- uint32_t: 8192
- }
- enumerator: "OUT_TOP_FRONT_RIGHT"
- scalar_value: {
- uint32_t: 16384
- }
- enumerator: "OUT_TOP_BACK_LEFT"
- scalar_value: {
- uint32_t: 32768
- }
- enumerator: "OUT_TOP_BACK_CENTER"
- scalar_value: {
- uint32_t: 65536
- }
- enumerator: "OUT_TOP_BACK_RIGHT"
- scalar_value: {
- uint32_t: 131072
- }
- enumerator: "OUT_MONO"
- scalar_value: {
- uint32_t: 1
- }
- enumerator: "OUT_STEREO"
- scalar_value: {
- uint32_t: 3
- }
- enumerator: "OUT_2POINT1"
- scalar_value: {
- uint32_t: 11
- }
- enumerator: "OUT_QUAD"
- scalar_value: {
- uint32_t: 51
- }
- enumerator: "OUT_QUAD_BACK"
- scalar_value: {
- uint32_t: 51
- }
- enumerator: "OUT_QUAD_SIDE"
- scalar_value: {
- uint32_t: 1539
- }
- enumerator: "OUT_SURROUND"
- scalar_value: {
- uint32_t: 263
- }
- enumerator: "OUT_PENTA"
- scalar_value: {
- uint32_t: 55
- }
- enumerator: "OUT_5POINT1"
- scalar_value: {
- uint32_t: 63
- }
- enumerator: "OUT_5POINT1_BACK"
- scalar_value: {
- uint32_t: 63
- }
- enumerator: "OUT_5POINT1_SIDE"
- scalar_value: {
- uint32_t: 1551
- }
- enumerator: "OUT_6POINT1"
- scalar_value: {
- uint32_t: 319
- }
- enumerator: "OUT_7POINT1"
- scalar_value: {
- uint32_t: 1599
- }
- enumerator: "OUT_ALL"
- scalar_value: {
- uint32_t: 262143
- }
- enumerator: "IN_LEFT"
- scalar_value: {
- uint32_t: 4
- }
- enumerator: "IN_RIGHT"
- scalar_value: {
- uint32_t: 8
- }
- enumerator: "IN_FRONT"
- scalar_value: {
- uint32_t: 16
- }
- enumerator: "IN_BACK"
- scalar_value: {
- uint32_t: 32
- }
- enumerator: "IN_LEFT_PROCESSED"
- scalar_value: {
- uint32_t: 64
- }
- enumerator: "IN_RIGHT_PROCESSED"
- scalar_value: {
- uint32_t: 128
- }
- enumerator: "IN_FRONT_PROCESSED"
- scalar_value: {
- uint32_t: 256
- }
- enumerator: "IN_BACK_PROCESSED"
- scalar_value: {
- uint32_t: 512
- }
- enumerator: "IN_PRESSURE"
- scalar_value: {
- uint32_t: 1024
- }
- enumerator: "IN_X_AXIS"
- scalar_value: {
- uint32_t: 2048
- }
- enumerator: "IN_Y_AXIS"
- scalar_value: {
- uint32_t: 4096
- }
- enumerator: "IN_Z_AXIS"
- scalar_value: {
- uint32_t: 8192
- }
- enumerator: "IN_VOICE_UPLINK"
- scalar_value: {
- uint32_t: 16384
- }
- enumerator: "IN_VOICE_DNLINK"
- scalar_value: {
- uint32_t: 32768
- }
- enumerator: "IN_MONO"
- scalar_value: {
- uint32_t: 16
- }
- enumerator: "IN_STEREO"
- scalar_value: {
- uint32_t: 12
- }
- enumerator: "IN_FRONT_BACK"
- scalar_value: {
- uint32_t: 48
- }
- enumerator: "IN_VOICE_UPLINK_MONO"
- scalar_value: {
- uint32_t: 16400
- }
- enumerator: "IN_VOICE_DNLINK_MONO"
- scalar_value: {
- uint32_t: 32784
- }
- enumerator: "IN_VOICE_CALL_MONO"
- scalar_value: {
- uint32_t: 49168
- }
- enumerator: "IN_ALL"
- scalar_value: {
- uint32_t: 65532
- }
- enumerator: "COUNT_MAX"
- scalar_value: {
- uint32_t: 30
- }
- enumerator: "INDEX_HDR"
- scalar_value: {
- uint32_t: 2147483648
- }
- enumerator: "INDEX_MASK_1"
- scalar_value: {
- uint32_t: 2147483649
- }
- enumerator: "INDEX_MASK_2"
- scalar_value: {
- uint32_t: 2147483651
- }
- enumerator: "INDEX_MASK_3"
- scalar_value: {
- uint32_t: 2147483655
- }
- enumerator: "INDEX_MASK_4"
- scalar_value: {
- uint32_t: 2147483663
- }
- enumerator: "INDEX_MASK_5"
- scalar_value: {
- uint32_t: 2147483679
- }
- enumerator: "INDEX_MASK_6"
- scalar_value: {
- uint32_t: 2147483711
- }
- enumerator: "INDEX_MASK_7"
- scalar_value: {
- uint32_t: 2147483775
- }
- enumerator: "INDEX_MASK_8"
- scalar_value: {
- uint32_t: 2147483903
- }
- }
-}
-
-attribute: {
- name: "::android::hardware::audio::common::V2_0::AudioInterleave"
- type: TYPE_ENUM
- enum_value: {
- scalar_type: "int32_t"
-
- enumerator: "LEFT"
- scalar_value: {
- int32_t: 0
- }
- enumerator: "RIGHT"
- scalar_value: {
- int32_t: 1
- }
- }
-}
-
-attribute: {
- name: "::android::hardware::audio::common::V2_0::AudioMode"
- type: TYPE_ENUM
- enum_value: {
- scalar_type: "int32_t"
-
- enumerator: "INVALID"
- scalar_value: {
- int32_t: -2
- }
- enumerator: "CURRENT"
- scalar_value: {
- int32_t: -1
- }
- enumerator: "NORMAL"
- scalar_value: {
- int32_t: 0
- }
- enumerator: "RINGTONE"
- scalar_value: {
- int32_t: 1
- }
- enumerator: "IN_CALL"
- scalar_value: {
- int32_t: 2
- }
- enumerator: "IN_COMMUNICATION"
- scalar_value: {
- int32_t: 3
- }
- enumerator: "CNT"
- scalar_value: {
- int32_t: 4
- }
- enumerator: "MAX"
- scalar_value: {
- int32_t: 3
- }
- }
-}
-
-attribute: {
- name: "::android::hardware::audio::common::V2_0::AudioDevice"
- type: TYPE_ENUM
- enum_value: {
- scalar_type: "uint32_t"
-
- enumerator: "NONE"
- scalar_value: {
- uint32_t: 0
- }
- enumerator: "BIT_IN"
- scalar_value: {
- uint32_t: 2147483648
- }
- enumerator: "BIT_DEFAULT"
- scalar_value: {
- uint32_t: 1073741824
- }
- enumerator: "OUT_EARPIECE"
- scalar_value: {
- uint32_t: 1
- }
- enumerator: "OUT_SPEAKER"
- scalar_value: {
- uint32_t: 2
- }
- enumerator: "OUT_WIRED_HEADSET"
- scalar_value: {
- uint32_t: 4
- }
- enumerator: "OUT_WIRED_HEADPHONE"
- scalar_value: {
- uint32_t: 8
- }
- enumerator: "OUT_BLUETOOTH_SCO"
- scalar_value: {
- uint32_t: 16
- }
- enumerator: "OUT_BLUETOOTH_SCO_HEADSET"
- scalar_value: {
- uint32_t: 32
- }
- enumerator: "OUT_BLUETOOTH_SCO_CARKIT"
- scalar_value: {
- uint32_t: 64
- }
- enumerator: "OUT_BLUETOOTH_A2DP"
- scalar_value: {
- uint32_t: 128
- }
- enumerator: "OUT_BLUETOOTH_A2DP_HEADPHONES"
- scalar_value: {
- uint32_t: 256
- }
- enumerator: "OUT_BLUETOOTH_A2DP_SPEAKER"
- scalar_value: {
- uint32_t: 512
- }
- enumerator: "OUT_AUX_DIGITAL"
- scalar_value: {
- uint32_t: 1024
- }
- enumerator: "OUT_HDMI"
- scalar_value: {
- uint32_t: 1024
- }
- enumerator: "OUT_ANLG_DOCK_HEADSET"
- scalar_value: {
- uint32_t: 2048
- }
- enumerator: "OUT_DGTL_DOCK_HEADSET"
- scalar_value: {
- uint32_t: 4096
- }
- enumerator: "OUT_USB_ACCESSORY"
- scalar_value: {
- uint32_t: 8192
- }
- enumerator: "OUT_USB_DEVICE"
- scalar_value: {
- uint32_t: 16384
- }
- enumerator: "OUT_REMOTE_SUBMIX"
- scalar_value: {
- uint32_t: 32768
- }
- enumerator: "OUT_TELEPHONY_TX"
- scalar_value: {
- uint32_t: 65536
- }
- enumerator: "OUT_LINE"
- scalar_value: {
- uint32_t: 131072
- }
- enumerator: "OUT_HDMI_ARC"
- scalar_value: {
- uint32_t: 262144
- }
- enumerator: "OUT_SPDIF"
- scalar_value: {
- uint32_t: 524288
- }
- enumerator: "OUT_FM"
- scalar_value: {
- uint32_t: 1048576
- }
- enumerator: "OUT_AUX_LINE"
- scalar_value: {
- uint32_t: 2097152
- }
- enumerator: "OUT_SPEAKER_SAFE"
- scalar_value: {
- uint32_t: 4194304
- }
- enumerator: "OUT_IP"
- scalar_value: {
- uint32_t: 8388608
- }
- enumerator: "OUT_BUS"
- scalar_value: {
- uint32_t: 16777216
- }
- enumerator: "OUT_PROXY"
- scalar_value: {
- uint32_t: 33554432
- }
- enumerator: "OUT_DEFAULT"
- scalar_value: {
- uint32_t: 1073741824
- }
- enumerator: "OUT_ALL"
- scalar_value: {
- uint32_t: 1140850687
- }
- enumerator: "OUT_ALL_A2DP"
- scalar_value: {
- uint32_t: 896
- }
- enumerator: "OUT_ALL_SCO"
- scalar_value: {
- uint32_t: 112
- }
- enumerator: "OUT_ALL_USB"
- scalar_value: {
- uint32_t: 24576
- }
- enumerator: "IN_COMMUNICATION"
- scalar_value: {
- uint32_t: 2147483649
- }
- enumerator: "IN_AMBIENT"
- scalar_value: {
- uint32_t: 2147483650
- }
- enumerator: "IN_BUILTIN_MIC"
- scalar_value: {
- uint32_t: 2147483652
- }
- enumerator: "IN_BLUETOOTH_SCO_HEADSET"
- scalar_value: {
- uint32_t: 2147483656
- }
- enumerator: "IN_WIRED_HEADSET"
- scalar_value: {
- uint32_t: 2147483664
- }
- enumerator: "IN_AUX_DIGITAL"
- scalar_value: {
- uint32_t: 2147483680
- }
- enumerator: "IN_HDMI"
- scalar_value: {
- uint32_t: 2147483680
- }
- enumerator: "IN_VOICE_CALL"
- scalar_value: {
- uint32_t: 2147483712
- }
- enumerator: "IN_TELEPHONY_RX"
- scalar_value: {
- uint32_t: 2147483712
- }
- enumerator: "IN_BACK_MIC"
- scalar_value: {
- uint32_t: 2147483776
- }
- enumerator: "IN_REMOTE_SUBMIX"
- scalar_value: {
- uint32_t: 2147483904
- }
- enumerator: "IN_ANLG_DOCK_HEADSET"
- scalar_value: {
- uint32_t: 2147484160
- }
- enumerator: "IN_DGTL_DOCK_HEADSET"
- scalar_value: {
- uint32_t: 2147484672
- }
- enumerator: "IN_USB_ACCESSORY"
- scalar_value: {
- uint32_t: 2147485696
- }
- enumerator: "IN_USB_DEVICE"
- scalar_value: {
- uint32_t: 2147487744
- }
- enumerator: "IN_FM_TUNER"
- scalar_value: {
- uint32_t: 2147491840
- }
- enumerator: "IN_TV_TUNER"
- scalar_value: {
- uint32_t: 2147500032
- }
- enumerator: "IN_LINE"
- scalar_value: {
- uint32_t: 2147516416
- }
- enumerator: "IN_SPDIF"
- scalar_value: {
- uint32_t: 2147549184
- }
- enumerator: "IN_BLUETOOTH_A2DP"
- scalar_value: {
- uint32_t: 2147614720
- }
- enumerator: "IN_LOOPBACK"
- scalar_value: {
- uint32_t: 2147745792
- }
- enumerator: "IN_IP"
- scalar_value: {
- uint32_t: 2148007936
- }
- enumerator: "IN_BUS"
- scalar_value: {
- uint32_t: 2148532224
- }
- enumerator: "IN_PROXY"
- scalar_value: {
- uint32_t: 2164260864
- }
- enumerator: "IN_DEFAULT"
- scalar_value: {
- uint32_t: 3221225472
- }
- enumerator: "IN_ALL"
- scalar_value: {
- uint32_t: 3240099839
- }
- enumerator: "IN_ALL_SCO"
- scalar_value: {
- uint32_t: 2147483656
- }
- enumerator: "IN_ALL_USB"
- scalar_value: {
- uint32_t: 2147489792
- }
- }
-}
-
-attribute: {
- name: "::android::hardware::audio::common::V2_0::AudioOutputFlag"
- type: TYPE_ENUM
- enum_value: {
- scalar_type: "int32_t"
-
- enumerator: "NONE"
- scalar_value: {
- int32_t: 0
- }
- enumerator: "DIRECT"
- scalar_value: {
- int32_t: 1
- }
- enumerator: "PRIMARY"
- scalar_value: {
- int32_t: 2
- }
- enumerator: "FAST"
- scalar_value: {
- int32_t: 4
- }
- enumerator: "DEEP_BUFFER"
- scalar_value: {
- int32_t: 8
- }
- enumerator: "COMPRESS_OFFLOAD"
- scalar_value: {
- int32_t: 16
- }
- enumerator: "NON_BLOCKING"
- scalar_value: {
- int32_t: 32
- }
- enumerator: "HW_AV_SYNC"
- scalar_value: {
- int32_t: 64
- }
- enumerator: "TTS"
- scalar_value: {
- int32_t: 128
- }
- enumerator: "RAW"
- scalar_value: {
- int32_t: 256
- }
- enumerator: "SYNC"
- scalar_value: {
- int32_t: 512
- }
- enumerator: "IEC958_NONAUDIO"
- scalar_value: {
- int32_t: 1024
- }
- enumerator: "DIRECT_PCM"
- scalar_value: {
- int32_t: 8192
- }
- enumerator: "MMAP_NOIRQ"
- scalar_value: {
- int32_t: 16384
- }
- }
-}
-
-attribute: {
- name: "::android::hardware::audio::common::V2_0::AudioInputFlag"
- type: TYPE_ENUM
- enum_value: {
- scalar_type: "int32_t"
-
- enumerator: "NONE"
- scalar_value: {
- int32_t: 0
- }
- enumerator: "FAST"
- scalar_value: {
- int32_t: 1
- }
- enumerator: "HW_HOTWORD"
- scalar_value: {
- int32_t: 2
- }
- enumerator: "RAW"
- scalar_value: {
- int32_t: 4
- }
- enumerator: "SYNC"
- scalar_value: {
- int32_t: 8
- }
- enumerator: "MMAP_NOIRQ"
- scalar_value: {
- int32_t: 16
- }
- }
-}
-
-attribute: {
- name: "::android::hardware::audio::common::V2_0::AudioUsage"
- type: TYPE_ENUM
- enum_value: {
- scalar_type: "int32_t"
-
- enumerator: "UNKNOWN"
- scalar_value: {
- int32_t: 0
- }
- enumerator: "MEDIA"
- scalar_value: {
- int32_t: 1
- }
- enumerator: "VOICE_COMMUNICATION"
- scalar_value: {
- int32_t: 2
- }
- enumerator: "VOICE_COMMUNICATION_SIGNALLING"
- scalar_value: {
- int32_t: 3
- }
- enumerator: "ALARM"
- scalar_value: {
- int32_t: 4
- }
- enumerator: "NOTIFICATION"
- scalar_value: {
- int32_t: 5
- }
- enumerator: "NOTIFICATION_TELEPHONY_RINGTONE"
- scalar_value: {
- int32_t: 6
- }
- enumerator: "NOTIFICATION_COMMUNICATION_REQUEST"
- scalar_value: {
- int32_t: 7
- }
- enumerator: "NOTIFICATION_COMMUNICATION_INSTANT"
- scalar_value: {
- int32_t: 8
- }
- enumerator: "NOTIFICATION_COMMUNICATION_DELAYED"
- scalar_value: {
- int32_t: 9
- }
- enumerator: "NOTIFICATION_EVENT"
- scalar_value: {
- int32_t: 10
- }
- enumerator: "ASSISTANCE_ACCESSIBILITY"
- scalar_value: {
- int32_t: 11
- }
- enumerator: "ASSISTANCE_NAVIGATION_GUIDANCE"
- scalar_value: {
- int32_t: 12
- }
- enumerator: "ASSISTANCE_SONIFICATION"
- scalar_value: {
- int32_t: 13
- }
- enumerator: "GAME"
- scalar_value: {
- int32_t: 14
- }
- enumerator: "VIRTUAL_SOURCE"
- scalar_value: {
- int32_t: 15
- }
- enumerator: "CNT"
- scalar_value: {
- int32_t: 16
- }
- enumerator: "MAX"
- scalar_value: {
- int32_t: 15
- }
- }
-}
-
-attribute: {
- name: "::android::hardware::audio::common::V2_0::AudioOffloadInfo"
- type: TYPE_STRUCT
- struct_value: {
- name: "sampleRateHz"
- type: TYPE_SCALAR
- scalar_type: "uint32_t"
- }
- struct_value: {
- name: "channelMask"
- type: TYPE_ENUM
- predefined_type: "::android::hardware::audio::common::V2_0::AudioChannelMask"
- }
- struct_value: {
- name: "format"
- type: TYPE_ENUM
- predefined_type: "::android::hardware::audio::common::V2_0::AudioFormat"
- }
- struct_value: {
- name: "streamType"
- type: TYPE_ENUM
- predefined_type: "::android::hardware::audio::common::V2_0::AudioStreamType"
- }
- struct_value: {
- name: "bitRatePerSecond"
- type: TYPE_SCALAR
- scalar_type: "uint32_t"
- }
- struct_value: {
- name: "durationMicroseconds"
- type: TYPE_SCALAR
- scalar_type: "int64_t"
- }
- struct_value: {
- name: "hasVideo"
- type: TYPE_SCALAR
- scalar_type: "bool_t"
- }
- struct_value: {
- name: "isStreaming"
- type: TYPE_SCALAR
- scalar_type: "bool_t"
- }
- struct_value: {
- name: "bitWidth"
- type: TYPE_SCALAR
- scalar_type: "uint32_t"
- }
- struct_value: {
- name: "bufferSize"
- type: TYPE_SCALAR
- scalar_type: "uint32_t"
- }
- struct_value: {
- name: "usage"
- type: TYPE_ENUM
- predefined_type: "::android::hardware::audio::common::V2_0::AudioUsage"
- }
-}
-
-attribute: {
- name: "::android::hardware::audio::common::V2_0::AudioConfig"
- type: TYPE_STRUCT
- struct_value: {
- name: "sampleRateHz"
- type: TYPE_SCALAR
- scalar_type: "uint32_t"
- }
- struct_value: {
- name: "channelMask"
- type: TYPE_ENUM
- predefined_type: "::android::hardware::audio::common::V2_0::AudioChannelMask"
- }
- struct_value: {
- name: "format"
- type: TYPE_ENUM
- predefined_type: "::android::hardware::audio::common::V2_0::AudioFormat"
- }
- struct_value: {
- name: "offloadInfo"
- type: TYPE_STRUCT
- predefined_type: "::android::hardware::audio::common::V2_0::AudioOffloadInfo"
- }
- struct_value: {
- name: "frameCount"
- type: TYPE_SCALAR
- scalar_type: "uint64_t"
- }
-}
-
-attribute: {
- name: "::android::hardware::audio::common::V2_0::AudioGainMode"
- type: TYPE_ENUM
- enum_value: {
- scalar_type: "uint32_t"
-
- enumerator: "JOINT"
- scalar_value: {
- uint32_t: 1
- }
- enumerator: "CHANNELS"
- scalar_value: {
- uint32_t: 2
- }
- enumerator: "RAMP"
- scalar_value: {
- uint32_t: 4
- }
- }
-}
-
-attribute: {
- name: "::android::hardware::audio::common::V2_0::AudioGain"
- type: TYPE_STRUCT
- struct_value: {
- name: "mode"
- type: TYPE_ENUM
- predefined_type: "::android::hardware::audio::common::V2_0::AudioGainMode"
- }
- struct_value: {
- name: "channelMask"
- type: TYPE_ENUM
- predefined_type: "::android::hardware::audio::common::V2_0::AudioChannelMask"
- }
- struct_value: {
- name: "minValue"
- type: TYPE_SCALAR
- scalar_type: "int32_t"
- }
- struct_value: {
- name: "maxValue"
- type: TYPE_SCALAR
- scalar_type: "int32_t"
- }
- struct_value: {
- name: "defaultValue"
- type: TYPE_SCALAR
- scalar_type: "int32_t"
- }
- struct_value: {
- name: "stepValue"
- type: TYPE_SCALAR
- scalar_type: "uint32_t"
- }
- struct_value: {
- name: "minRampMs"
- type: TYPE_SCALAR
- scalar_type: "uint32_t"
- }
- struct_value: {
- name: "maxRampMs"
- type: TYPE_SCALAR
- scalar_type: "uint32_t"
- }
-}
-
-attribute: {
- name: "::android::hardware::audio::common::V2_0::AudioGainConfig"
- type: TYPE_STRUCT
- struct_value: {
- name: "index"
- type: TYPE_SCALAR
- scalar_type: "int32_t"
- }
- struct_value: {
- name: "mode"
- type: TYPE_ENUM
- predefined_type: "::android::hardware::audio::common::V2_0::AudioGainMode"
- }
- struct_value: {
- name: "channelMask"
- type: TYPE_ENUM
- predefined_type: "::android::hardware::audio::common::V2_0::AudioChannelMask"
- }
- struct_value: {
- name: "values"
- type: TYPE_ARRAY
- vector_value: {
- vector_size: 32
- type: TYPE_SCALAR
- scalar_type: "int32_t"
- }
- }
- struct_value: {
- name: "rampDurationMs"
- type: TYPE_SCALAR
- scalar_type: "uint32_t"
- }
-}
-
-attribute: {
- name: "::android::hardware::audio::common::V2_0::AudioPortRole"
- type: TYPE_ENUM
- enum_value: {
- scalar_type: "int32_t"
-
- enumerator: "NONE"
- scalar_value: {
- int32_t: 0
- }
- enumerator: "SOURCE"
- scalar_value: {
- int32_t: 1
- }
- enumerator: "SINK"
- scalar_value: {
- int32_t: 2
- }
- }
-}
-
-attribute: {
- name: "::android::hardware::audio::common::V2_0::AudioPortType"
- type: TYPE_ENUM
- enum_value: {
- scalar_type: "int32_t"
-
- enumerator: "NONE"
- scalar_value: {
- int32_t: 0
- }
- enumerator: "DEVICE"
- scalar_value: {
- int32_t: 1
- }
- enumerator: "MIX"
- scalar_value: {
- int32_t: 2
- }
- enumerator: "SESSION"
- scalar_value: {
- int32_t: 3
- }
- }
-}
-
-attribute: {
- name: "::android::hardware::audio::common::V2_0::AudioPortConfigDeviceExt"
- type: TYPE_STRUCT
- struct_value: {
- name: "hwModule"
- type: TYPE_SCALAR
- scalar_type: "int32_t"
- }
- struct_value: {
- name: "type"
- type: TYPE_ENUM
- predefined_type: "::android::hardware::audio::common::V2_0::AudioDevice"
- }
- struct_value: {
- name: "address"
- type: TYPE_ARRAY
- vector_value: {
- vector_size: 32
- type: TYPE_SCALAR
- scalar_type: "uint8_t"
- }
- }
-}
-
-attribute: {
- name: "::android::hardware::audio::common::V2_0::AudioPortConfigSessionExt"
- type: TYPE_STRUCT
- struct_value: {
- name: "session"
- type: TYPE_SCALAR
- scalar_type: "int32_t"
- }
-}
-
-attribute: {
- name: "::android::hardware::audio::common::V2_0::AudioPortConfigMask"
- type: TYPE_ENUM
- enum_value: {
- scalar_type: "uint32_t"
-
- enumerator: "SAMPLE_RATE"
- scalar_value: {
- uint32_t: 1
- }
- enumerator: "CHANNEL_MASK"
- scalar_value: {
- uint32_t: 2
- }
- enumerator: "FORMAT"
- scalar_value: {
- uint32_t: 4
- }
- enumerator: "GAIN"
- scalar_value: {
- uint32_t: 8
- }
- enumerator: "ALL"
- scalar_value: {
- uint32_t: 15
- }
- }
-}
-
-attribute: {
- name: "::android::hardware::audio::common::V2_0::AudioPortConfig"
- type: TYPE_STRUCT
- sub_struct: {
- name: "::android::hardware::audio::common::V2_0::AudioPortConfig::Ext"
- type: TYPE_UNION
- sub_union: {
- name: "::android::hardware::audio::common::V2_0::AudioPortConfig::Ext::AudioPortConfigMixExt"
- type: TYPE_STRUCT
- sub_struct: {
- name: "::android::hardware::audio::common::V2_0::AudioPortConfig::Ext::AudioPortConfigMixExt::UseCase"
- type: TYPE_UNION
- union_value: {
- name: "stream"
- type: TYPE_ENUM
- predefined_type: "::android::hardware::audio::common::V2_0::AudioStreamType"
- }
- union_value: {
- name: "source"
- type: TYPE_ENUM
- predefined_type: "::android::hardware::audio::common::V2_0::AudioSource"
- }
- }
- struct_value: {
- name: "hwModule"
- type: TYPE_SCALAR
- scalar_type: "int32_t"
- }
- struct_value: {
- name: "ioHandle"
- type: TYPE_SCALAR
- scalar_type: "int32_t"
- }
- struct_value: {
- name: "useCase"
- type: TYPE_UNION
- predefined_type: "::android::hardware::audio::common::V2_0::AudioPortConfig::Ext::AudioPortConfigMixExt::UseCase"
- }
- }
- union_value: {
- name: "device"
- type: TYPE_STRUCT
- predefined_type: "::android::hardware::audio::common::V2_0::AudioPortConfigDeviceExt"
- }
- union_value: {
- name: "mix"
- type: TYPE_STRUCT
- predefined_type: "::android::hardware::audio::common::V2_0::AudioPortConfig::Ext::AudioPortConfigMixExt"
- }
- union_value: {
- name: "session"
- type: TYPE_STRUCT
- predefined_type: "::android::hardware::audio::common::V2_0::AudioPortConfigSessionExt"
- }
- }
- struct_value: {
- name: "id"
- type: TYPE_SCALAR
- scalar_type: "int32_t"
- }
- struct_value: {
- name: "configMask"
- type: TYPE_ENUM
- predefined_type: "::android::hardware::audio::common::V2_0::AudioPortConfigMask"
- }
- struct_value: {
- name: "sampleRateHz"
- type: TYPE_SCALAR
- scalar_type: "uint32_t"
- }
- struct_value: {
- name: "channelMask"
- type: TYPE_ENUM
- predefined_type: "::android::hardware::audio::common::V2_0::AudioChannelMask"
- }
- struct_value: {
- name: "format"
- type: TYPE_ENUM
- predefined_type: "::android::hardware::audio::common::V2_0::AudioFormat"
- }
- struct_value: {
- name: "gain"
- type: TYPE_STRUCT
- predefined_type: "::android::hardware::audio::common::V2_0::AudioGainConfig"
- }
- struct_value: {
- name: "type"
- type: TYPE_ENUM
- predefined_type: "::android::hardware::audio::common::V2_0::AudioPortType"
- }
- struct_value: {
- name: "role"
- type: TYPE_ENUM
- predefined_type: "::android::hardware::audio::common::V2_0::AudioPortRole"
- }
- struct_value: {
- name: "ext"
- type: TYPE_UNION
- predefined_type: "::android::hardware::audio::common::V2_0::AudioPortConfig::Ext"
- }
-}
-
-attribute: {
- name: "::android::hardware::audio::common::V2_0::AudioPortDeviceExt"
- type: TYPE_STRUCT
- struct_value: {
- name: "hwModule"
- type: TYPE_SCALAR
- scalar_type: "int32_t"
- }
- struct_value: {
- name: "type"
- type: TYPE_ENUM
- predefined_type: "::android::hardware::audio::common::V2_0::AudioDevice"
- }
- struct_value: {
- name: "address"
- type: TYPE_ARRAY
- vector_value: {
- vector_size: 32
- type: TYPE_SCALAR
- scalar_type: "uint8_t"
- }
- }
-}
-
-attribute: {
- name: "::android::hardware::audio::common::V2_0::AudioMixLatencyClass"
- type: TYPE_ENUM
- enum_value: {
- scalar_type: "int32_t"
-
- enumerator: "LOW"
- scalar_value: {
- int32_t: 0
- }
- enumerator: "NORMAL"
- scalar_value: {
- int32_t: 1
- }
- }
-}
-
-attribute: {
- name: "::android::hardware::audio::common::V2_0::AudioPortMixExt"
- type: TYPE_STRUCT
- struct_value: {
- name: "hwModule"
- type: TYPE_SCALAR
- scalar_type: "int32_t"
- }
- struct_value: {
- name: "ioHandle"
- type: TYPE_SCALAR
- scalar_type: "int32_t"
- }
- struct_value: {
- name: "latencyClass"
- type: TYPE_ENUM
- predefined_type: "::android::hardware::audio::common::V2_0::AudioMixLatencyClass"
- }
-}
-
-attribute: {
- name: "::android::hardware::audio::common::V2_0::AudioPortSessionExt"
- type: TYPE_STRUCT
- struct_value: {
- name: "session"
- type: TYPE_SCALAR
- scalar_type: "int32_t"
- }
-}
-
-attribute: {
- name: "::android::hardware::audio::common::V2_0::AudioPort"
- type: TYPE_STRUCT
- sub_struct: {
- name: "::android::hardware::audio::common::V2_0::AudioPort::Ext"
- type: TYPE_UNION
- union_value: {
- name: "device"
- type: TYPE_STRUCT
- predefined_type: "::android::hardware::audio::common::V2_0::AudioPortDeviceExt"
- }
- union_value: {
- name: "mix"
- type: TYPE_STRUCT
- predefined_type: "::android::hardware::audio::common::V2_0::AudioPortMixExt"
- }
- union_value: {
- name: "session"
- type: TYPE_STRUCT
- predefined_type: "::android::hardware::audio::common::V2_0::AudioPortSessionExt"
- }
- }
- struct_value: {
- name: "id"
- type: TYPE_SCALAR
- scalar_type: "int32_t"
- }
- struct_value: {
- name: "role"
- type: TYPE_ENUM
- predefined_type: "::android::hardware::audio::common::V2_0::AudioPortRole"
- }
- struct_value: {
- name: "name"
- type: TYPE_STRING
- }
- struct_value: {
- name: "sampleRates"
- type: TYPE_VECTOR
- vector_value: {
- type: TYPE_SCALAR
- scalar_type: "uint32_t"
- }
- }
- struct_value: {
- name: "channelMasks"
- type: TYPE_VECTOR
- vector_value: {
- type: TYPE_ENUM
- predefined_type: "::android::hardware::audio::common::V2_0::AudioChannelMask"
- }
- }
- struct_value: {
- name: "formats"
- type: TYPE_VECTOR
- vector_value: {
- type: TYPE_ENUM
- predefined_type: "::android::hardware::audio::common::V2_0::AudioFormat"
- }
- }
- struct_value: {
- name: "gains"
- type: TYPE_VECTOR
- vector_value: {
- type: TYPE_STRUCT
- predefined_type: "::android::hardware::audio::common::V2_0::AudioGain"
- }
- }
- struct_value: {
- name: "activeConfig"
- type: TYPE_STRUCT
- predefined_type: "::android::hardware::audio::common::V2_0::AudioPortConfig"
- }
- struct_value: {
- name: "type"
- type: TYPE_ENUM
- predefined_type: "::android::hardware::audio::common::V2_0::AudioPortType"
- }
- struct_value: {
- name: "ext"
- type: TYPE_UNION
- predefined_type: "::android::hardware::audio::common::V2_0::AudioPort::Ext"
- }
-}
-
-attribute: {
name: "::android::hardware::tv::input::V1_0::Result"
type: TYPE_ENUM
enum_value: {
@@ -2030,8 +110,8 @@
struct_value: {
name: "audioAddress"
type: TYPE_ARRAY
+ vector_size: 32
vector_value: {
- vector_size: 32
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
diff --git a/usb/1.0/Android.bp b/usb/1.0/Android.bp
index 8b84a4a..0b641f1 100644
--- a/usb/1.0/Android.bp
+++ b/usb/1.0/Android.bp
@@ -1,13 +1,20 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
+filegroup {
+ name: "android.hardware.usb@1.0_hal",
+ srcs: [
+ "types.hal",
+ "IUsb.hal",
+ "IUsbCallback.hal",
+ ],
+}
+
genrule {
name: "android.hardware.usb@1.0_genc++",
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.usb@1.0",
srcs: [
- "types.hal",
- "IUsb.hal",
- "IUsbCallback.hal",
+ ":android.hardware.usb@1.0_hal",
],
out: [
"android/hardware/usb/1.0/types.cpp",
@@ -21,9 +28,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.usb@1.0",
srcs: [
- "types.hal",
- "IUsb.hal",
- "IUsbCallback.hal",
+ ":android.hardware.usb@1.0_hal",
],
out: [
"android/hardware/usb/1.0/types.h",
diff --git a/usb/1.0/Android.mk b/usb/1.0/Android.mk
index 0eded5b..7be7147 100644
--- a/usb/1.0/Android.mk
+++ b/usb/1.0/Android.mk
@@ -8,7 +8,7 @@
LOCAL_MODULE := android.hardware.usb@1.0-java
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -201,7 +201,7 @@
LOCAL_MODULE := android.hardware.usb@1.0-java-static
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -394,7 +394,7 @@
LOCAL_MODULE := android.hardware.usb@1.0-java-constants
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
#
diff --git a/usb/1.0/default/Android.mk b/usb/1.0/default/Android.mk
index 09d7ce7..489293c 100644
--- a/usb/1.0/default/Android.mk
+++ b/usb/1.0/default/Android.mk
@@ -2,6 +2,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE_RELATIVE_PATH := hw
+LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE := android.hardware.usb@1.0-service
LOCAL_INIT_RC := android.hardware.usb@1.0-service.rc
LOCAL_SRC_FILES := \
diff --git a/usb/1.0/default/android.hardware.usb@1.0-service.rc b/usb/1.0/default/android.hardware.usb@1.0-service.rc
index 77dfc93..6ea0720 100644
--- a/usb/1.0/default/android.hardware.usb@1.0-service.rc
+++ b/usb/1.0/default/android.hardware.usb@1.0-service.rc
@@ -1,4 +1,4 @@
-service usb-hal-1-0 /system/bin/hw/android.hardware.usb@1.0-service
+service usb-hal-1-0 /vendor/bin/hw/android.hardware.usb@1.0-service
class hal
user system
group system
diff --git a/vehicle/2.0/Android.bp b/vehicle/2.0/Android.bp
deleted file mode 100644
index 986fb74..0000000
--- a/vehicle/2.0/Android.bp
+++ /dev/null
@@ -1,216 +0,0 @@
-// This file is autogenerated by hidl-gen. Do not edit manually.
-
-genrule {
- name: "android.hardware.vehicle@2.0_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vehicle@2.0",
- srcs: [
- "types.hal",
- "IVehicle.hal",
- "IVehicleCallback.hal",
- ],
- out: [
- "android/hardware/vehicle/2.0/types.cpp",
- "android/hardware/vehicle/2.0/VehicleAll.cpp",
- "android/hardware/vehicle/2.0/VehicleCallbackAll.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.vehicle@2.0_genc++_headers",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vehicle@2.0",
- srcs: [
- "types.hal",
- "IVehicle.hal",
- "IVehicleCallback.hal",
- ],
- out: [
- "android/hardware/vehicle/2.0/types.h",
- "android/hardware/vehicle/2.0/IVehicle.h",
- "android/hardware/vehicle/2.0/IHwVehicle.h",
- "android/hardware/vehicle/2.0/BnHwVehicle.h",
- "android/hardware/vehicle/2.0/BpHwVehicle.h",
- "android/hardware/vehicle/2.0/BsVehicle.h",
- "android/hardware/vehicle/2.0/IVehicleCallback.h",
- "android/hardware/vehicle/2.0/IHwVehicleCallback.h",
- "android/hardware/vehicle/2.0/BnHwVehicleCallback.h",
- "android/hardware/vehicle/2.0/BpHwVehicleCallback.h",
- "android/hardware/vehicle/2.0/BsVehicleCallback.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.vehicle@2.0",
- generated_sources: ["android.hardware.vehicle@2.0_genc++"],
- generated_headers: ["android.hardware.vehicle@2.0_genc++_headers"],
- export_generated_headers: ["android.hardware.vehicle@2.0_genc++_headers"],
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "android.hidl.base@1.0",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "android.hidl.base@1.0",
- ],
-}
-
-genrule {
- name: "android.hardware.vehicle.vts.driver@2.0_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vehicle@2.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/vehicle/2.0/ $(genDir)/android/hardware/vehicle/2.0/",
- srcs: [
- "types.hal",
- "IVehicle.hal",
- "IVehicleCallback.hal",
- ],
- out: [
- "android/hardware/vehicle/2.0/types.vts.cpp",
- "android/hardware/vehicle/2.0/Vehicle.vts.cpp",
- "android/hardware/vehicle/2.0/VehicleCallback.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.vehicle.vts.driver@2.0_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vehicle@2.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/vehicle/2.0/ $(genDir)/android/hardware/vehicle/2.0/",
- srcs: [
- "types.hal",
- "IVehicle.hal",
- "IVehicleCallback.hal",
- ],
- out: [
- "android/hardware/vehicle/2.0/types.vts.h",
- "android/hardware/vehicle/2.0/Vehicle.vts.h",
- "android/hardware/vehicle/2.0/VehicleCallback.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.vehicle.vts.driver@2.0",
- generated_sources: ["android.hardware.vehicle.vts.driver@2.0_genc++"],
- generated_headers: ["android.hardware.vehicle.vts.driver@2.0_genc++_headers"],
- export_generated_headers: ["android.hardware.vehicle.vts.driver@2.0_genc++_headers"],
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libvts_common",
- "libvts_datatype",
- "libvts_measurement",
- "libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
- "android.hidl.base@1.0",
- "android.hardware.vehicle@2.0",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "android.hidl.base@1.0",
- ],
-}
-
-genrule {
- name: "android.hardware.vehicle@2.0-IVehicle-vts.profiler_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vehicle@2.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/vehicle/2.0/ $(genDir)/android/hardware/vehicle/2.0/",
- srcs: [
- "IVehicle.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/vehicle/2.0/Vehicle.vts.cpp",
- "android/hardware/vehicle/2.0/types.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.vehicle@2.0-IVehicle-vts.profiler_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vehicle@2.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/vehicle/2.0/ $(genDir)/android/hardware/vehicle/2.0/",
- srcs: [
- "IVehicle.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/vehicle/2.0/Vehicle.vts.h",
- "android/hardware/vehicle/2.0/types.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.vehicle@2.0-IVehicle-vts.profiler",
- generated_sources: ["android.hardware.vehicle@2.0-IVehicle-vts.profiler_genc++"],
- generated_headers: ["android.hardware.vehicle@2.0-IVehicle-vts.profiler_genc++_headers"],
- export_generated_headers: ["android.hardware.vehicle@2.0-IVehicle-vts.profiler_genc++_headers"],
- shared_libs: [
- "libbase",
- "libhidlbase",
- "libhidltransport",
- "libvts_profiling",
- "libvts_multidevice_proto",
- "libprotobuf-cpp-full",
- "android.hidl.base@1.0",
- "android.hardware.vehicle@2.0",
- ],
-}
-
-genrule {
- name: "android.hardware.vehicle@2.0-IVehicleCallback-vts.profiler_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vehicle@2.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/vehicle/2.0/ $(genDir)/android/hardware/vehicle/2.0/",
- srcs: [
- "IVehicleCallback.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/vehicle/2.0/VehicleCallback.vts.cpp",
- "android/hardware/vehicle/2.0/types.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.vehicle@2.0-IVehicleCallback-vts.profiler_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vehicle@2.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/vehicle/2.0/ $(genDir)/android/hardware/vehicle/2.0/",
- srcs: [
- "IVehicleCallback.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/vehicle/2.0/VehicleCallback.vts.h",
- "android/hardware/vehicle/2.0/types.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.vehicle@2.0-IVehicleCallback-vts.profiler",
- generated_sources: ["android.hardware.vehicle@2.0-IVehicleCallback-vts.profiler_genc++"],
- generated_headers: ["android.hardware.vehicle@2.0-IVehicleCallback-vts.profiler_genc++_headers"],
- export_generated_headers: ["android.hardware.vehicle@2.0-IVehicleCallback-vts.profiler_genc++_headers"],
- shared_libs: [
- "libbase",
- "libhidlbase",
- "libhidltransport",
- "libvts_profiling",
- "libvts_multidevice_proto",
- "libprotobuf-cpp-full",
- "android.hidl.base@1.0",
- "android.hardware.vehicle@2.0",
- ],
-}
diff --git a/vehicle/2.0/default/Android.mk b/vehicle/2.0/default/Android.mk
deleted file mode 100644
index 4a27eeb..0000000
--- a/vehicle/2.0/default/Android.mk
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright (C) 2016 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.
-
-LOCAL_PATH := $(call my-dir)
-
-module_prefix = android.hardware.vehicle@2.0
-
-###############################################################################
-# Vehicle reference implementation lib
-###############################################################################
-include $(CLEAR_VARS)
-LOCAL_MODULE := $(module_prefix)-manager-lib
-LOCAL_SRC_FILES := \
- vehicle_hal_manager/AccessControlConfigParser.cpp \
- vehicle_hal_manager/SubscriptionManager.cpp \
- vehicle_hal_manager/VehicleHalManager.cpp \
- vehicle_hal_manager/VehicleObjectPool.cpp \
- vehicle_hal_manager/VehicleUtils.cpp \
-
-LOCAL_SHARED_LIBRARIES := \
- libbinder \
- libhidlbase \
- libhidltransport \
- libhwbinder \
- liblog \
- libutils \
- $(module_prefix) \
-
-include $(BUILD_STATIC_LIBRARY)
-
-###############################################################################
-# Vehicle default VehicleHAL implementation
-###############################################################################
-include $(CLEAR_VARS)
-
-LOCAL_MODULE:= $(module_prefix)-default-impl-lib
-LOCAL_SRC_FILES:= \
- impl/DefaultVehicleHal.cpp \
-
-LOCAL_SHARED_LIBRARIES := \
- libbinder \
- libhidlbase \
- libhidltransport \
- libhwbinder \
- liblog \
- libutils \
- $(module_prefix) \
-
-include $(BUILD_STATIC_LIBRARY)
-
-
-###############################################################################
-# Vehicle reference implementation unit tests
-###############################################################################
-include $(CLEAR_VARS)
-
-LOCAL_MODULE:= $(module_prefix)-manager-unit-tests
-
-LOCAL_WHOLE_STATIC_LIBRARIES := $(module_prefix)-manager-lib
-
-LOCAL_SRC_FILES:= \
- tests/AccessControlConfigParser_test.cpp \
- tests/SubscriptionManager_test.cpp \
- tests/VehicleHalManager_test.cpp \
- tests/VehicleObjectPool_test.cpp \
- tests/VehiclePropConfigIndex_test.cpp \
-
-LOCAL_SHARED_LIBRARIES := \
- libbinder \
- libhidlbase \
- libhidltransport \
- libhwbinder \
- liblog \
- libutils \
- $(module_prefix) \
-
-LOCAL_CFLAGS += -Wall -Wextra
-LOCAL_MODULE_TAGS := tests
-
-include $(BUILD_NATIVE_TEST)
-
-
-###############################################################################
-# Vehicle HAL service
-###############################################################################
-include $(CLEAR_VARS)
-LOCAL_MODULE := $(module_prefix)-service
-LOCAL_INIT_RC := $(module_prefix)-service.rc
-LOCAL_MODULE_RELATIVE_PATH := hw
-
-LOCAL_SRC_FILES := \
- VehicleService.cpp
-
-LOCAL_WHOLE_STATIC_LIBRARIES := \
- $(module_prefix)-manager-lib \
- $(module_prefix)-default-impl-lib \
-
-LOCAL_SHARED_LIBRARIES := \
- libbinder \
- libhidlbase \
- libhidltransport \
- libhwbinder \
- liblog \
- libutils \
- android.hardware.vehicle@2.0
-
-include $(BUILD_EXECUTABLE)
diff --git a/vehicle/2.0/default/android.hardware.vehicle@2.0-service.rc b/vehicle/2.0/default/android.hardware.vehicle@2.0-service.rc
deleted file mode 100644
index 622cb1e..0000000
--- a/vehicle/2.0/default/android.hardware.vehicle@2.0-service.rc
+++ /dev/null
@@ -1,4 +0,0 @@
-service vehicle-hal-2.0 /system/bin/hw/android.hardware.vehicle@2.0-service
- class hal
- user vehicle_network
- group system
diff --git a/vehicle/2.0/default/impl/DefaultVehicleHal.cpp b/vehicle/2.0/default/impl/DefaultVehicleHal.cpp
deleted file mode 100644
index 4541168..0000000
--- a/vehicle/2.0/default/impl/DefaultVehicleHal.cpp
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
- * Copyright (C) 2016 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.
- */
-
-#include "DefaultVehicleHal.h"
-
-#define LOG_TAG "default_vehicle"
-#include <android/log.h>
-
-namespace android {
-namespace hardware {
-namespace vehicle {
-namespace V2_0 {
-
-namespace impl {
-
-VehicleHal::VehiclePropValuePtr DefaultVehicleHal::get(
- const VehiclePropValue& requestedPropValue, StatusCode* outStatus) {
- *outStatus = StatusCode::OK;
-
- VehiclePropValuePtr v;
- VehicleProperty property = requestedPropValue.prop;
- int32_t areaId = requestedPropValue.areaId;
- auto& pool = *getValuePool();
-
- switch (property) {
- case VehicleProperty::INFO_MAKE:
- v = pool.obtainString("Default Car");
- break;
- case VehicleProperty::HVAC_FAN_SPEED:
- v = pool.obtainInt32(mFanSpeed);
- break;
- case VehicleProperty::HVAC_POWER_ON:
- v = pool.obtainBoolean(mHvacPowerOn);
- break;
- case VehicleProperty::HVAC_RECIRC_ON:
- v = pool.obtainBoolean(mHvacRecircOn);
- break;
- case VehicleProperty::HVAC_AC_ON:
- v = pool.obtainBoolean(mHvacAcOn);
- break;
- case VehicleProperty::HVAC_AUTO_ON:
- v = pool.obtainBoolean(mHvacAutoOn);
- break;
- case VehicleProperty::HVAC_FAN_DIRECTION:
- v = pool.obtainInt32(toInt(mFanDirection));
- break;
- case VehicleProperty::HVAC_DEFROSTER:
- bool defroster;
- *outStatus = getHvacDefroster(areaId, &defroster);
- if (StatusCode::OK == *outStatus) {
- v = pool.obtainBoolean(defroster);
- }
- break;
- case VehicleProperty::HVAC_TEMPERATURE_SET:
- float value;
- *outStatus = getHvacTemperature(requestedPropValue.areaId,
- &value);
- if (StatusCode::OK == *outStatus) {
- v = pool.obtainFloat(value);
- }
- break;
- case VehicleProperty::INFO_FUEL_CAPACITY:
- v = pool.obtainFloat(0.75f);
- break;
- case VehicleProperty::DISPLAY_BRIGHTNESS:
- v = pool.obtainInt32(mBrightness);
- break;
- case VehicleProperty::NIGHT_MODE:
- v = pool.obtainBoolean(false);
- break;
- case VehicleProperty::GEAR_SELECTION:
- v = pool.obtainInt32(toInt(VehicleGear::GEAR_PARK));
- break;
- case VehicleProperty::DRIVING_STATUS:
- v = pool.obtainInt32(toInt(VehicleDrivingStatus::UNRESTRICTED));
- break;
- case VehicleProperty::IGNITION_STATE:
- v = pool.obtainInt32(toInt(VehicleIgnitionState::ACC));
- break;
- case VehicleProperty::OBD2_LIVE_FRAME:
- v = pool.obtainComplex();
- *outStatus = fillObd2LiveFrame(&v);
- break;
- case VehicleProperty::OBD2_FREEZE_FRAME:
- v = pool.obtainComplex();
- *outStatus = fillObd2FreezeFrame(&v);
- break;
- default:
- *outStatus = StatusCode::INVALID_ARG;
- }
-
- if (StatusCode::OK == *outStatus && v.get() != nullptr) {
- v->prop = property;
- v->areaId = areaId;
- v->timestamp = elapsedRealtimeNano();
- }
-
- return v;
-}
-
-StatusCode DefaultVehicleHal::set(const VehiclePropValue& propValue) {
- auto property = propValue.prop;
- const auto& v = propValue.value;
-
- StatusCode status = StatusCode::OK;
-
- switch (property) {
- case VehicleProperty::HVAC_POWER_ON:
- mHvacPowerOn = v.int32Values[0] == 1;
- break;
- case VehicleProperty::HVAC_RECIRC_ON:
- mHvacRecircOn = v.int32Values[0] == 1;
- break;
- case VehicleProperty::HVAC_AC_ON:
- mHvacAcOn = v.int32Values[0] == 1;
- break;
- case VehicleProperty::HVAC_AUTO_ON:
- mHvacAutoOn = v.int32Values[0] == 1;
- break;
- case VehicleProperty::HVAC_DEFROSTER:
- status = setHvacDefroster(propValue.areaId, v.int32Values[0] == 1);
- break;
- case VehicleProperty::HVAC_FAN_DIRECTION:
- mFanDirection =
- static_cast<VehicleHvacFanDirection>(v.int32Values[0]);
- break;
- case VehicleProperty::HVAC_FAN_SPEED:
- mFanSpeed = v.int32Values[0];
- break;
- case VehicleProperty::HVAC_TEMPERATURE_SET:
- status = setHvacTemperature(propValue.areaId, v.floatValues[0]);
- break;
- case VehicleProperty::DISPLAY_BRIGHTNESS:
- mBrightness = v.int32Values[0];
- break;
- default:
- status = StatusCode::INVALID_ARG;
- }
-
- return status;
-}
-
-StatusCode DefaultVehicleHal::getHvacTemperature(int32_t areaId,
- float* outValue) {
- if (areaId == toInt(VehicleAreaZone::ROW_1_LEFT)) {
- *outValue = mRow1LeftHvacTemperatureSet;
- } else if (areaId == toInt(VehicleAreaZone::ROW_1_RIGHT)) {
- *outValue = mRow1RightHvacTemperatureSet;
- } else {
- return StatusCode::INVALID_ARG;
- }
- return StatusCode::OK;
-}
-
-StatusCode DefaultVehicleHal::setHvacTemperature(
- int32_t areaId, float value) {
- if (areaId == toInt(VehicleAreaZone::ROW_1_LEFT)) {
- mRow1LeftHvacTemperatureSet = value;
- } else if (areaId == toInt(VehicleAreaZone::ROW_1_RIGHT)) {
- mRow1RightHvacTemperatureSet = value;
- } else {
- return StatusCode::INVALID_ARG;
- }
- return StatusCode::OK;
-}
-
-StatusCode DefaultVehicleHal::getHvacDefroster(int32_t areaId,
- bool* outValue) {
- ALOGI("Getting Hvac defroster for area: 0x%x", areaId);
-
- if (areaId == toInt(VehicleAreaWindow::FRONT_WINDSHIELD)) {
- *outValue = mFrontDefroster;
- } else if (areaId == toInt(VehicleAreaWindow::REAR_WINDSHIELD)) {
- *outValue = mRearDefroster;
- } else {
- ALOGE("Unable to get hvac defroster for area: 0x%x", areaId);
- return StatusCode::INVALID_ARG;
- }
-
- ALOGI("Getting Hvac defroster for area: 0x%x, OK", areaId);
- return StatusCode::OK;
-}
-
-StatusCode DefaultVehicleHal::setHvacDefroster(int32_t areaId, bool value) {
- if (areaId == toInt(VehicleAreaWindow::FRONT_WINDSHIELD)) {
- mFrontDefroster = value;
- } else if (areaId == toInt(VehicleAreaWindow::REAR_WINDSHIELD)) {
- mRearDefroster = value;
- } else {
- return StatusCode::INVALID_ARG;
- }
- return StatusCode::OK;
-}
-
-static std::vector<int32_t> fillObd2IntValues() {
- std::vector<int32_t> intValues(toInt(Obd2IntegerSensorIndex::LAST_SYSTEM_INDEX));
-#define SENSOR(name) toInt(Obd2IntegerSensorIndex:: name)
- intValues[SENSOR(FUEL_SYSTEM_STATUS)] = toInt(FuelSystemStatus::CLOSED_LOOP);
- intValues[SENSOR(MALFUNCTION_INDICATOR_LIGHT_ON)] = 0;
- intValues[SENSOR(IGNITION_MONITORS_SUPPORTED)] = toInt(IgnitionMonitorKind::SPARK);
- intValues[SENSOR(IGNITION_SPECIFIC_MONITORS)] =
- CommonIgnitionMonitors::COMPONENTS_AVAILABLE |
- CommonIgnitionMonitors::MISFIRE_AVAILABLE |
- SparkIgnitionMonitors::AC_REFRIGERANT_AVAILABLE |
- SparkIgnitionMonitors::EVAPORATIVE_SYSTEM_AVAILABLE;
- intValues[SENSOR(INTAKE_AIR_TEMPERATURE)] = 35;
- intValues[SENSOR(COMMANDED_SECONDARY_AIR_STATUS)] =
- toInt(SecondaryAirStatus::FROM_OUTSIDE_OR_OFF);
- intValues[SENSOR(NUM_OXYGEN_SENSORS_PRESENT)] = 1;
- intValues[SENSOR(RUNTIME_SINCE_ENGINE_START)] = 500;
- intValues[SENSOR(DISTANCE_TRAVELED_WITH_MALFUNCTION_INDICATOR_LIGHT_ON)] = 0;
- intValues[SENSOR(WARMUPS_SINCE_CODES_CLEARED)] = 51;
- intValues[SENSOR(DISTANCE_TRAVELED_SINCE_CODES_CLEARED)] = 365;
- intValues[SENSOR(ABSOLUTE_BAROMETRIC_PRESSURE)] = 30;
- intValues[SENSOR(CONTROL_MODULE_VOLTAGE)] = 12;
- intValues[SENSOR(AMBIENT_AIR_TEMPERATURE)] = 18;
- intValues[SENSOR(MAX_FUEL_AIR_EQUIVALENCE_RATIO)] = 1;
- intValues[SENSOR(FUEL_TYPE)] = toInt(FuelType::GASOLINE);
-#undef SENSOR
- return intValues;
-}
-
-static std::vector<float> fillObd2FloatValues() {
- std::vector<float> floatValues(toInt(Obd2FloatSensorIndex::LAST_SYSTEM_INDEX));
-#define SENSOR(name) toInt(Obd2FloatSensorIndex:: name)
- floatValues[SENSOR(CALCULATED_ENGINE_LOAD)] = 0.153;
- floatValues[SENSOR(SHORT_TERM_FUEL_TRIM_BANK1)] = -0.16;
- floatValues[SENSOR(LONG_TERM_FUEL_TRIM_BANK1)] = -0.16;
- floatValues[SENSOR(SHORT_TERM_FUEL_TRIM_BANK2)] = -0.16;
- floatValues[SENSOR(LONG_TERM_FUEL_TRIM_BANK2)] = -0.16;
- floatValues[SENSOR(INTAKE_MANIFOLD_ABSOLUTE_PRESSURE)] = 7.5;
- floatValues[SENSOR(ENGINE_RPM)] = 1250.;
- floatValues[SENSOR(VEHICLE_SPEED)] = 40.;
- floatValues[SENSOR(TIMING_ADVANCE)] = 2.5;
- floatValues[SENSOR(THROTTLE_POSITION)] = 19.75;
- floatValues[SENSOR(OXYGEN_SENSOR1_VOLTAGE)] = 0.265;
- floatValues[SENSOR(FUEL_TANK_LEVEL_INPUT)] = 0.824;
- floatValues[SENSOR(EVAPORATION_SYSTEM_VAPOR_PRESSURE)] = -0.373;
- floatValues[SENSOR(CATALYST_TEMPERATURE_BANK1_SENSOR1)] = 190.;
- floatValues[SENSOR(RELATIVE_THROTTLE_POSITION)] = 3.;
- floatValues[SENSOR(ABSOLUTE_THROTTLE_POSITION_B)] = 0.306;
- floatValues[SENSOR(ACCELERATOR_PEDAL_POSITION_D)] = 0.188;
- floatValues[SENSOR(ACCELERATOR_PEDAL_POSITION_E)] = 0.094;
- floatValues[SENSOR(COMMANDED_THROTTLE_ACTUATOR)] = 0.024;
-#undef SENSOR
- return floatValues;
-}
-
-StatusCode DefaultVehicleHal::fillObd2LiveFrame(VehiclePropValuePtr* v) {
- static std::vector<int32_t> intValues(fillObd2IntValues());
- static std::vector<float> floatValues(fillObd2FloatValues());
- (*v)->value.int32Values = intValues;
- (*v)->value.floatValues = floatValues;
- return StatusCode::OK;
-}
-
-StatusCode DefaultVehicleHal::fillObd2FreezeFrame(VehiclePropValuePtr* v) {
- static std::vector<int32_t> intValues(fillObd2IntValues());
- static std::vector<float> floatValues(fillObd2FloatValues());
- (*v)->value.int32Values = intValues;
- (*v)->value.floatValues = floatValues;
- (*v)->value.stringValue = "P0010";
- return StatusCode::OK;
-}
-
-
-} // impl
-
-} // namespace V2_0
-} // namespace vehicle
-} // namespace hardware
-} // namespace android
diff --git a/vehicle/2.0/default/impl/DefaultVehicleHal.h b/vehicle/2.0/default/impl/DefaultVehicleHal.h
deleted file mode 100644
index 15a4789..0000000
--- a/vehicle/2.0/default/impl/DefaultVehicleHal.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2016 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.
- */
-
-#ifndef android_hardware_vehicle_V2_0_impl_DefaultVehicleHal_H_
-#define android_hardware_vehicle_V2_0_impl_DefaultVehicleHal_H_
-
-#include <VehicleHal.h>
-#include <impl/DefaultConfig.h>
-#include <utils/SystemClock.h>
-
-namespace android {
-namespace hardware {
-namespace vehicle {
-namespace V2_0 {
-
-namespace impl {
-
-class DefaultVehicleHal : public VehicleHal {
-public:
- std::vector<VehiclePropConfig> listProperties() override {
- return std::vector<VehiclePropConfig>(std::begin(kVehicleProperties),
- std::end(kVehicleProperties));
- }
-
- VehiclePropValuePtr get(const VehiclePropValue& requestedPropValue,
- StatusCode* outStatus) override;
-
- StatusCode set(const VehiclePropValue& propValue) override;
-
- StatusCode subscribe(VehicleProperty property,
- int32_t areas,
- float sampleRate) {
- // TODO(pavelm): implement
- return StatusCode::OK;
- }
-
- StatusCode unsubscribe(VehicleProperty property) {
- // TODO(pavelm): implement
- return StatusCode::OK;
- }
-
-private:
- StatusCode getHvacTemperature(int32_t areaId, float* outValue);
- StatusCode setHvacTemperature(int32_t areaId, float value);
- StatusCode getHvacDefroster(int32_t areaId, bool* outValue);
- StatusCode setHvacDefroster(int32_t areaId, bool value);
- StatusCode fillObd2LiveFrame (VehiclePropValuePtr* v);
- StatusCode fillObd2FreezeFrame (VehiclePropValuePtr* v);
-private:
- int32_t mFanSpeed = 3;
- int32_t mBrightness = 7;
- float mRow1LeftHvacTemperatureSet = 16;
- float mRow1RightHvacTemperatureSet = 22;
- bool mFrontDefroster = false;
- bool mRearDefroster = false;
- bool mHvacPowerOn = true;
- bool mHvacRecircOn = true;
- bool mHvacAcOn = true;
- bool mHvacAutoOn = true;
- VehicleHvacFanDirection mFanDirection = VehicleHvacFanDirection::FACE;
-};
-
-} // impl
-
-} // namespace V2_0
-} // namespace vehicle
-} // namespace hardware
-} // namespace android
-
-
-#endif // android_hardware_vehicle_V2_0_impl_DefaultVehicleHal_H_
diff --git a/vehicle/2.0/vts/Android.mk b/vehicle/2.0/vts/Android.mk
deleted file mode 100644
index 31fa999..0000000
--- a/vehicle/2.0/vts/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(LOCAL_PATH)/functional/vts/testcases/hal/vehicle/hidl/Android.mk
\ No newline at end of file
diff --git a/vehicle/2.0/vts/Vehicle.vts b/vehicle/2.0/vts/Vehicle.vts
deleted file mode 100644
index 7fecfa9..0000000
--- a/vehicle/2.0/vts/Vehicle.vts
+++ /dev/null
@@ -1,116 +0,0 @@
-component_class: HAL_HIDL
-component_type_version: 2.0
-component_name: "IVehicle"
-
-package: "android.hardware.vehicle"
-
-import: "android.hardware.vehicle@2.0::IVehicleCallback"
-import: "android.hardware.vehicle@2.0::types"
-
-interface: {
- api: {
- name: "getAllPropConfigs"
- return_type_hidl: {
- type: TYPE_VECTOR
- vector_value: {
- type: TYPE_STRUCT
- predefined_type: "::android::hardware::vehicle::V2_0::VehiclePropConfig"
- }
- }
- }
-
- api: {
- name: "getPropConfigs"
- return_type_hidl: {
- type: TYPE_ENUM
- predefined_type: "::android::hardware::vehicle::V2_0::StatusCode"
- }
- return_type_hidl: {
- type: TYPE_VECTOR
- vector_value: {
- type: TYPE_STRUCT
- predefined_type: "::android::hardware::vehicle::V2_0::VehiclePropConfig"
- }
- }
- arg: {
- type: TYPE_VECTOR
- vector_value: {
- type: TYPE_ENUM
- predefined_type: "::android::hardware::vehicle::V2_0::VehicleProperty"
- }
- }
- }
-
- api: {
- name: "get"
- return_type_hidl: {
- type: TYPE_ENUM
- predefined_type: "::android::hardware::vehicle::V2_0::StatusCode"
- }
- return_type_hidl: {
- type: TYPE_STRUCT
- predefined_type: "::android::hardware::vehicle::V2_0::VehiclePropValue"
- }
- arg: {
- type: TYPE_STRUCT
- predefined_type: "::android::hardware::vehicle::V2_0::VehiclePropValue"
- }
- }
-
- api: {
- name: "set"
- return_type_hidl: {
- type: TYPE_ENUM
- predefined_type: "::android::hardware::vehicle::V2_0::StatusCode"
- }
- arg: {
- type: TYPE_STRUCT
- predefined_type: "::android::hardware::vehicle::V2_0::VehiclePropValue"
- }
- }
-
- api: {
- name: "subscribe"
- return_type_hidl: {
- type: TYPE_ENUM
- predefined_type: "::android::hardware::vehicle::V2_0::StatusCode"
- }
- arg: {
- type: TYPE_HIDL_CALLBACK
- predefined_type: "IVehicleCallback"
- is_callback: true
- }
- arg: {
- type: TYPE_VECTOR
- vector_value: {
- type: TYPE_STRUCT
- predefined_type: "::android::hardware::vehicle::V2_0::SubscribeOptions"
- }
- }
- }
-
- api: {
- name: "unsubscribe"
- return_type_hidl: {
- type: TYPE_ENUM
- predefined_type: "::android::hardware::vehicle::V2_0::StatusCode"
- }
- arg: {
- type: TYPE_HIDL_CALLBACK
- predefined_type: "IVehicleCallback"
- is_callback: true
- }
- arg: {
- type: TYPE_ENUM
- predefined_type: "::android::hardware::vehicle::V2_0::VehicleProperty"
- }
- }
-
- api: {
- name: "debugDump"
- return_type_hidl: {
- type: TYPE_STRING
- }
- }
-
-}
diff --git a/vehicle/2.0/vts/VehicleCallback.vts b/vehicle/2.0/vts/VehicleCallback.vts
deleted file mode 100644
index b5ee152..0000000
--- a/vehicle/2.0/vts/VehicleCallback.vts
+++ /dev/null
@@ -1,45 +0,0 @@
-component_class: HAL_HIDL
-component_type_version: 2.0
-component_name: "IVehicleCallback"
-
-package: "android.hardware.vehicle"
-
-import: "android.hardware.vehicle@2.0::types"
-
-interface: {
- api: {
- name: "onPropertyEvent"
- arg: {
- type: TYPE_VECTOR
- vector_value: {
- type: TYPE_STRUCT
- predefined_type: "::android::hardware::vehicle::V2_0::VehiclePropValue"
- }
- }
- }
-
- api: {
- name: "onPropertySet"
- arg: {
- type: TYPE_STRUCT
- predefined_type: "::android::hardware::vehicle::V2_0::VehiclePropValue"
- }
- }
-
- api: {
- name: "onPropertySetError"
- arg: {
- type: TYPE_ENUM
- predefined_type: "::android::hardware::vehicle::V2_0::StatusCode"
- }
- arg: {
- type: TYPE_ENUM
- predefined_type: "::android::hardware::vehicle::V2_0::VehicleProperty"
- }
- arg: {
- type: TYPE_SCALAR
- scalar_type: "int32_t"
- }
- }
-
-}
diff --git a/vehicle/2.0/vts/functional/vts/testcases/hal/vehicle/__init__.py b/vehicle/2.0/vts/functional/vts/testcases/hal/vehicle/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/vehicle/2.0/vts/functional/vts/testcases/hal/vehicle/__init__.py
+++ /dev/null
diff --git a/vehicle/2.0/vts/functional/vts/testcases/hal/vehicle/hidl/Android.mk b/vehicle/2.0/vts/functional/vts/testcases/hal/vehicle/hidl/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/vehicle/2.0/vts/functional/vts/testcases/hal/vehicle/hidl/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/vehicle/2.0/vts/functional/vts/testcases/hal/vehicle/hidl/__init__.py b/vehicle/2.0/vts/functional/vts/testcases/hal/vehicle/hidl/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/vehicle/2.0/vts/functional/vts/testcases/hal/vehicle/hidl/__init__.py
+++ /dev/null
diff --git a/vehicle/2.0/vts/functional/vts/testcases/hal/vehicle/hidl/host/Android.mk b/vehicle/2.0/vts/functional/vts/testcases/hal/vehicle/hidl/host/Android.mk
deleted file mode 100644
index 716a41c..0000000
--- a/vehicle/2.0/vts/functional/vts/testcases/hal/vehicle/hidl/host/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := VehicleHidlTest
-VTS_CONFIG_SRC_DIR := testcases/hal/vehicle/hidl/host
-include test/vts/tools/build/Android.host_config.mk
\ No newline at end of file
diff --git a/vehicle/2.0/vts/functional/vts/testcases/hal/vehicle/hidl/host/AndroidTest.xml b/vehicle/2.0/vts/functional/vts/testcases/hal/vehicle/hidl/host/AndroidTest.xml
deleted file mode 100644
index 16b7c29..0000000
--- a/vehicle/2.0/vts/functional/vts/testcases/hal/vehicle/hidl/host/AndroidTest.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<configuration description="Config for VTS HAL Vehicle test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- <option name="cleanup" value="true" />
- <option name="push" value="spec/hardware/interfaces/vehicle/2.0/vts/Vehicle.vts->/data/local/tmp/spec/Vehicle.vts" />
- <option name="push" value="spec/hardware/interfaces/vehicle/2.0/vts/VehicleCallback.vts->/data/local/tmp/spec/VehicleCallBack.vts" />
- <option name="push" value="spec/hardware/interfaces/vehicle/2.0/vts/types.vts->/data/local/tmp/spec/types.vts" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VehicleHidlTest" />
- <option name="test-case-path" value="vts/testcases/hal/vehicle/hidl/host/VehicleHidlTest" />
- </test>
-</configuration>
diff --git a/vehicle/2.0/vts/functional/vts/testcases/hal/vehicle/hidl/host/VehicleHidlTest.py b/vehicle/2.0/vts/functional/vts/testcases/hal/vehicle/hidl/host/VehicleHidlTest.py
deleted file mode 100644
index 2c32836..0000000
--- a/vehicle/2.0/vts/functional/vts/testcases/hal/vehicle/hidl/host/VehicleHidlTest.py
+++ /dev/null
@@ -1,246 +0,0 @@
-#!/usr/bin/env python3.4
-#
-# Copyright (C) 2016 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.
-#
-
-import logging
-import time
-
-from vts.runners.host import asserts
-from vts.runners.host import base_test_with_webdb
-from vts.runners.host import const
-from vts.runners.host import keys
-from vts.runners.host import test_runner
-from vts.utils.python.controllers import android_device
-from vts.utils.python.profiling import profiling_utils
-from vts.utils.python.coverage import coverage_utils
-
-
-class VehicleHidlTest(base_test_with_webdb.BaseTestWithWebDbClass):
- """A simple testcase for the VEHICLE HIDL HAL."""
-
- def setUpClass(self):
- """Creates a mirror and init vehicle hal."""
- self.dut = self.registerController(android_device)[0]
-
- self.dut.shell.InvokeTerminal("one")
- self.dut.shell.one.Execute("setenforce 0") # SELinux permissive mode
-
- results = self.dut.shell.one.Execute("id -u system")
- system_uid = results[const.STDOUT][0].strip()
- logging.info("system_uid: %s", system_uid)
-
- if getattr(self, keys.ConfigKeys.IKEY_ENABLE_COVERAGE, False):
- coverage_utils.InitializeDeviceCoverage(self.dut)
-
- self.dut.hal.InitHidlHal(
- target_type="vehicle",
- target_basepaths=self.dut.libPaths,
- target_version=2.0,
- target_package="android.hardware.vehicle",
- target_component_name="IVehicle",
- hw_binder_service_name="Vehicle",
- bits=64 if self.dut.is64Bit else 32)
-
- self.vehicle = self.dut.hal.vehicle # shortcut
- self.vehicle.SetCallerUid(system_uid)
- self.vtypes = self.dut.hal.vehicle.GetHidlTypeInterface("types")
- logging.info("vehicle types: %s", self.vtypes)
-
- def tearDownClass(self):
- """Disables the profiling.
-
- If profiling is enabled for the test, collect the profiling data
- and disable profiling after the test is done.
- """
- if self.enable_profiling:
- self.ProcessAndUploadTraceData()
-
- if getattr(self, keys.ConfigKeys.IKEY_ENABLE_COVERAGE, False):
- self.SetCoverageData(coverage_utils.GetGcdaDict(self.dut))
-
- def setUpTest(self):
- if self.enable_profiling:
- profiling_utils.EnableVTSProfiling(self.dut.shell.one)
-
- def tearDownTest(self):
- if self.enable_profiling:
- profiling_trace_path = getattr(
- self, self.VTS_PROFILING_TRACING_PATH, "")
- self.ProcessTraceDataForTestCase(self.dut, profiling_trace_path)
- profiling_utils.DisableVTSProfiling(self.dut.shell.one)
-
- def testListProperties(self):
- """Checks whether some PropConfigs are returned.
-
- Verifies that call to getAllPropConfigs is not failing and
- it returns at least 1 vehicle property config.
- """
- allConfigs = self.vehicle.getAllPropConfigs()
- logging.info("all supported properties: %s", allConfigs)
- asserts.assertLess(0, len(allConfigs))
-
- def testMandatoryProperties(self):
- """Verifies that all mandatory properties are supported."""
- mandatoryProps = set([self.vtypes.DRIVING_STATUS]) # 1 property so far
- logging.info(self.vtypes.DRIVING_STATUS)
- allConfigs = self.dut.hal.vehicle.getAllPropConfigs()
-
- for config in allConfigs:
- mandatoryProps.discard(config['prop'])
-
- asserts.assertEqual(0, len(mandatoryProps))
-
- def getSupportInfo(self):
- """Check whether OBD2_{LIVE|FREEZE}_FRAME is supported."""
- isLiveSupported, isFreezeSupported = False, False
- allConfigs = self.vehicle.getAllPropConfigs()
- for config in allConfigs:
- if config['prop'] == self.vtypes.OBD2_LIVE_FRAME:
- isLiveSupported = True
- elif config['prop'] == self.vtypes.OBD2_FREEZE_FRAME:
- isFreezeSupported = True
- if isLiveSupported and isFreezeSupported:
- break
- return isLiveSupported, isFreezeSupported
-
- def readVhalProperty(self, propertyId, areaId=0):
- """Reads a specified property from Vehicle HAL.
-
- Args:
- propertyId: the numeric identifier of the property to be read.
- areaId: the numeric identifier of the vehicle area to retrieve the
- property for. 0, or omitted, for global.
-
- Returns:
- the value of the property as read from Vehicle HAL, or None
- if it could not read successfully.
- """
- vp_dict = {
- 'prop' : propertyId,
- 'timestamp' : 0,
- 'areaId' : areaId,
- 'value' : {
- 'int32Values' : [],
- 'floatValues' : [],
- 'int64Values' : [],
- 'bytes' : [],
- 'stringValue' : ""
- }
- }
- vp = self.vtypes.Py2Pb("VehiclePropValue", vp_dict)
- status, value = self.vehicle.get(vp)
- if self.vtypes.OK == status:
- return value
- else:
- logging.warning("attempt to read property %s returned error %d",
- propertyId, status)
-
- def testObd2SensorProperties(self):
- """Test reading the live and freeze OBD2 frame properties.
-
- OBD2 (On-Board Diagnostics 2) is the industry standard protocol
- for retrieving diagnostic sensor information from vehicles.
- """
- class CheckRead(object):
- """This class wraps the logic of an actual property read.
-
- Attributes:
- testobject: the test case this object is used on behalf of.
- propertyId: the identifier of the Vehiche HAL property to read.
- name: the engineer-readable name of this test operation.
- """
-
- def __init__(self, testobject, propertyId, name):
- self.testobject = testobject
- self.propertyId = propertyId
- self.name = name
-
- def onReadSuccess(self, propValue):
- """Override this to perform any post-read validation.
-
- Args:
- propValue: the property value obtained from Vehicle HAL.
- """
- pass
-
- def __call__(self):
- """Reads the specified property and validates the result."""
- propValue = self.testobject.readVhalProperty(self.propertyId)
- asserts.assertNotEqual(propValue, None,
- msg="reading %s should not return None" %
- self.name)
- logging.info("%s = %s", self.name, propValue)
- self.onReadSuccess(propValue)
- logging.info("%s pass" % self.name)
-
- def checkLiveFrameRead():
- """Validates reading the OBD2_LIVE_FRAME (if available)."""
- checker = CheckRead(self,
- self.vtypes.OBD2_LIVE_FRAME,
- "OBD2_LIVE_FRAME")
- checker()
-
- def checkFreezeFrameRead():
- """Validates reading the OBD2_FREEZE_FRAME (if available)."""
- checker = CheckRead(self,
- self.vtypes.OBD2_FREEZE_FRAME,
- "OBD2_FREEZE_FRAME")
- checker()
-
- isLiveSupported, isFreezeSupported = self.getSupportInfo()
- logging.info("isLiveSupported = %s, isFreezeSupported = %s",
- isLiveSupported, isFreezeSupported)
- if isLiveSupported:
- checkLiveFrameRead()
- if isFreezeSupported:
- checkFreezeFrameRead()
-
- def createVehiclePropValue(self, propId):
- value = {
- "int32Values" : [],
- "floatValues" : [],
- "int64Values" : [],
- "bytes": [],
- "stringValue": ""
- }
- propValue = {
- "prop": propId,
- "timestamp": 0,
- "areaId": 0,
- "value": value
- }
- return self.vtypes.Py2Pb("VehiclePropValue", propValue)
-
- def testDrivingStatus(self):
- """Checks that DRIVING_STATUS property returns correct result."""
- request = self.createVehiclePropValue(self.vtypes.DRIVING_STATUS)
- logging.info("Driving status request: %s", request)
- response = self.vehicle.get(request)
- logging.info("Driving status response: %s", response)
- status = response[0]
- asserts.assertEqual(self.vtypes.OK, status)
- propValue = response[1]
- assertEqual(1, len(propValue.value.int32Values))
- drivingStatus = propValue.value.int32Values[0]
-
- allStatuses = (self.vtypes.UNRESTRICTED | self.vtypes.NO_VIDEO
- | self.vtypes.NO_KEYBOARD_INPUT | self.vtypes.NO_VOICE_INPUT
- | self.vtypes.NO_CONFIG | self.vtypes.LIMIT_MESSAGE_LEN)
-
- assertEqual(allStatuses, allStatuses | drivingStatus)
-
-if __name__ == "__main__":
- test_runner.main()
diff --git a/vehicle/2.0/vts/functional/vts/testcases/hal/vehicle/hidl/host/__init__.py b/vehicle/2.0/vts/functional/vts/testcases/hal/vehicle/hidl/host/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/vehicle/2.0/vts/functional/vts/testcases/hal/vehicle/hidl/host/__init__.py
+++ /dev/null
diff --git a/vibrator/1.0/Android.bp b/vibrator/1.0/Android.bp
index 497274b..d6813ea 100644
--- a/vibrator/1.0/Android.bp
+++ b/vibrator/1.0/Android.bp
@@ -1,12 +1,19 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
+filegroup {
+ name: "android.hardware.vibrator@1.0_hal",
+ srcs: [
+ "types.hal",
+ "IVibrator.hal",
+ ],
+}
+
genrule {
name: "android.hardware.vibrator@1.0_genc++",
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vibrator@1.0",
srcs: [
- "types.hal",
- "IVibrator.hal",
+ ":android.hardware.vibrator@1.0_hal",
],
out: [
"android/hardware/vibrator/1.0/types.cpp",
@@ -19,8 +26,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vibrator@1.0",
srcs: [
- "types.hal",
- "IVibrator.hal",
+ ":android.hardware.vibrator@1.0_hal",
],
out: [
"android/hardware/vibrator/1.0/types.h",
@@ -54,106 +60,3 @@
"android.hidl.base@1.0",
],
}
-
-genrule {
- name: "android.hardware.vibrator.vts.driver@1.0_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vibrator@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/vibrator/1.0/ $(genDir)/android/hardware/vibrator/1.0/",
- srcs: [
- "types.hal",
- "IVibrator.hal",
- ],
- out: [
- "android/hardware/vibrator/1.0/types.vts.cpp",
- "android/hardware/vibrator/1.0/Vibrator.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.vibrator.vts.driver@1.0_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vibrator@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/vibrator/1.0/ $(genDir)/android/hardware/vibrator/1.0/",
- srcs: [
- "types.hal",
- "IVibrator.hal",
- ],
- out: [
- "android/hardware/vibrator/1.0/types.vts.h",
- "android/hardware/vibrator/1.0/Vibrator.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.vibrator.vts.driver@1.0",
- generated_sources: ["android.hardware.vibrator.vts.driver@1.0_genc++"],
- generated_headers: ["android.hardware.vibrator.vts.driver@1.0_genc++_headers"],
- export_generated_headers: ["android.hardware.vibrator.vts.driver@1.0_genc++_headers"],
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libvts_common",
- "libvts_datatype",
- "libvts_measurement",
- "libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
- "android.hidl.base@1.0",
- "android.hardware.vibrator@1.0",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "android.hidl.base@1.0",
- ],
-}
-
-genrule {
- name: "android.hardware.vibrator@1.0-IVibrator-vts.profiler_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vibrator@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/vibrator/1.0/ $(genDir)/android/hardware/vibrator/1.0/",
- srcs: [
- "IVibrator.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/vibrator/1.0/Vibrator.vts.cpp",
- "android/hardware/vibrator/1.0/types.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.vibrator@1.0-IVibrator-vts.profiler_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vibrator@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/vibrator/1.0/ $(genDir)/android/hardware/vibrator/1.0/",
- srcs: [
- "IVibrator.hal",
- "types.hal",
- ],
- out: [
- "android/hardware/vibrator/1.0/Vibrator.vts.h",
- "android/hardware/vibrator/1.0/types.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.vibrator@1.0-IVibrator-vts.profiler",
- generated_sources: ["android.hardware.vibrator@1.0-IVibrator-vts.profiler_genc++"],
- generated_headers: ["android.hardware.vibrator@1.0-IVibrator-vts.profiler_genc++_headers"],
- export_generated_headers: ["android.hardware.vibrator@1.0-IVibrator-vts.profiler_genc++_headers"],
- shared_libs: [
- "libbase",
- "libhidlbase",
- "libhidltransport",
- "libvts_profiling",
- "libvts_multidevice_proto",
- "libprotobuf-cpp-full",
- "android.hidl.base@1.0",
- "android.hardware.vibrator@1.0",
- ],
-}
diff --git a/vibrator/1.0/Android.mk b/vibrator/1.0/Android.mk
index 1437d44..4e1ba6a 100644
--- a/vibrator/1.0/Android.mk
+++ b/vibrator/1.0/Android.mk
@@ -8,7 +8,7 @@
LOCAL_MODULE := android.hardware.vibrator@1.0-java
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -64,7 +64,7 @@
LOCAL_MODULE := android.hardware.vibrator@1.0-java-static
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
diff --git a/vibrator/1.0/default/Android.bp b/vibrator/1.0/default/Android.bp
index 5e488e6..6cb9802 100644
--- a/vibrator/1.0/default/Android.bp
+++ b/vibrator/1.0/default/Android.bp
@@ -12,8 +12,10 @@
// 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.
+
cc_library_shared {
name: "android.hardware.vibrator@1.0-impl",
+ proprietary: true,
relative_install_path: "hw",
srcs: ["Vibrator.cpp"],
shared_libs: [
diff --git a/vibrator/1.0/default/Android.mk b/vibrator/1.0/default/Android.mk
index 5ba334b..091d615 100644
--- a/vibrator/1.0/default/Android.mk
+++ b/vibrator/1.0/default/Android.mk
@@ -19,6 +19,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.vibrator@1.0-service
LOCAL_INIT_RC := android.hardware.vibrator@1.0-service.rc
+LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_SRC_FILES := \
service.cpp \
diff --git a/vibrator/1.0/default/android.hardware.vibrator@1.0-service.rc b/vibrator/1.0/default/android.hardware.vibrator@1.0-service.rc
index a7836b3..4153c44 100644
--- a/vibrator/1.0/default/android.hardware.vibrator@1.0-service.rc
+++ b/vibrator/1.0/default/android.hardware.vibrator@1.0-service.rc
@@ -1,4 +1,4 @@
-service vibrator-1-0 /system/bin/hw/android.hardware.vibrator@1.0-service
+service vibrator-1-0 /vendor/bin/hw/android.hardware.vibrator@1.0-service
class hal
user system
group system readproc
diff --git a/vibrator/1.0/vts/Vibrator.vts b/vibrator/1.0/vts/Vibrator.vts
index e0de3fb..07ec30e 100644
--- a/vibrator/1.0/vts/Vibrator.vts
+++ b/vibrator/1.0/vts/Vibrator.vts
@@ -5,6 +5,7 @@
package: "android.hardware.vibrator"
import: "android.hardware.vibrator@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
api: {
diff --git a/vibrator/1.0/vts/functional/Android.mk b/vibrator/1.0/vts/functional/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/vibrator/1.0/vts/functional/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/vibrator/1.0/vts/functional/vts/Android.mk b/vibrator/1.0/vts/functional/vts/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/vibrator/1.0/vts/functional/vts/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/vibrator/1.0/vts/functional/vts/testcases/Android.mk b/vibrator/1.0/vts/functional/vts/testcases/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/vibrator/1.0/vts/functional/vts/testcases/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/vibrator/1.0/vts/functional/vts/testcases/hal/Android.mk b/vibrator/1.0/vts/functional/vts/testcases/hal/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/vibrator/1.0/vts/functional/vts/testcases/hal/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/Android.mk b/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/__init__.py b/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/__init__.py
+++ /dev/null
diff --git a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/Android.mk b/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/__init__.py b/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/__init__.py
+++ /dev/null
diff --git a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host/Android.mk b/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host/Android.mk
deleted file mode 100644
index d005450..0000000
--- a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := VibratorHidlTest
-VTS_CONFIG_SRC_DIR := testcases/hal/vibrator/hidl/host
-include test/vts/tools/build/Android.host_config.mk
\ No newline at end of file
diff --git a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host/AndroidTest.xml b/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host/AndroidTest.xml
deleted file mode 100644
index c5074ee..0000000
--- a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host/AndroidTest.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<configuration description="Config for VTS HAL vibrator test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- <option name="cleanup" value="true" />
- <option name="push" value="spec/hardware/interfaces/vibrator/1.0/vts/Vibrator.vts->/data/local/tmp/spec/Vibrator.vts" />
- <option name="push" value="spec/hardware/interfaces/vibrator/1.0/vts/types.vts->/data/local/tmp/spec/types.vts" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VibratorHidlTest" />
- <option name="test-case-path" value="vts/testcases/hal/vibrator/hidl/host/VibratorHidlTest" />
- </test>
-</configuration>
diff --git a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host/VibratorHidlTest.py b/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host/VibratorHidlTest.py
deleted file mode 100644
index 84f2907..0000000
--- a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host/VibratorHidlTest.py
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/usr/bin/env python3.4
-#
-# Copyright (C) 2016 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.
-#
-
-import logging
-import time
-
-from vts.runners.host import asserts
-from vts.runners.host import base_test_with_webdb
-from vts.runners.host import test_runner
-from vts.utils.python.controllers import android_device
-from vts.utils.python.profiling import profiling_utils
-
-
-class VibratorHidlTest(base_test_with_webdb.BaseTestWithWebDbClass):
- """A simple testcase for the VIBRATOR HIDL HAL."""
-
- def setUpClass(self):
- """Creates a mirror and turns on the framework-layer VIBRATOR service."""
- self.dut = self.registerController(android_device)[0]
-
- self.dut.shell.InvokeTerminal("one")
- self.dut.shell.one.Execute("setenforce 0") # SELinux permissive mode
-
- # Test using the binderized mode
- self.dut.shell.one.Execute(
- "setprop vts.hal.vts.hidl.get_stub true")
-
- self.dut.hal.InitHidlHal(
- target_type="vibrator",
- target_basepaths=self.dut.libPaths,
- target_version=1.0,
- target_package="android.hardware.vibrator",
- target_component_name="IVibrator",
- bits=64 if self.dut.is64Bit else 32)
-
- def tearDownClass(self):
- """ If profiling is enabled for the test, collect the profiling data
- and disable profiling after the test is done.
- """
- if self.enable_profiling:
- self.ProcessAndUploadTraceData()
-
- def setUpTest(self):
- if self.enable_profiling:
- profiling_utils.EnableVTSProfiling(self.dut.shell.one)
-
- def tearDownTest(self):
- if self.enable_profiling:
- profiling_trace_path = getattr(
- self, self.VTS_PROFILING_TRACING_PATH, "")
- self.ProcessTraceDataForTestCase(self.dut, profiling_trace_path)
- profiling_utils.DisableVTSProfiling(self.dut.shell.one)
-
- def testVibratorBasic(self):
- """A simple test case which just calls each registered function."""
- vibrator_types = self.dut.hal.vibrator.GetHidlTypeInterface("types")
- logging.info("vibrator_types: %s", vibrator_types)
- logging.info("OK: %s", vibrator_types.OK)
- logging.info("ERR: %s", vibrator_types.ERR)
-
- result = self.dut.hal.vibrator.on(10000)
- logging.info("on result: %s", result)
- asserts.assertEqual(vibrator_types.OK, result)
-
- time.sleep(1)
-
- result = self.dut.hal.vibrator.off()
- logging.info("off result: %s", result)
- asserts.assertEqual(vibrator_types.OK, result)
-
-if __name__ == "__main__":
- test_runner.main()
diff --git a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host/__init__.py b/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host/__init__.py
+++ /dev/null
diff --git a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host_profiling/Android.mk b/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host_profiling/Android.mk
deleted file mode 100644
index ec73e06..0000000
--- a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host_profiling/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := VibratorHidlProfilingTest
-VTS_CONFIG_SRC_DIR := testcases/hal/vibrator/hidl/host_profiling
-include test/vts/tools/build/Android.host_config.mk
diff --git a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host_profiling/AndroidTest.xml b/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host_profiling/AndroidTest.xml
deleted file mode 100644
index 54830f0..0000000
--- a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host_profiling/AndroidTest.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<configuration description="Config for VTS HAL vibrator test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- <option name="cleanup" value="true" />
- <option name="push" value="spec/hardware/interfaces/vibrator/1.0/vts/Vibrator.vts->/data/local/tmp/spec/Vibrator.vts" />
- <option name="push" value="spec/hardware/interfaces/vibrator/1.0/vts/types.vts->/data/local/tmp/spec/types.vts" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VibratorHidlProfilingTest" />
- <option name="test-case-path" value="vts/testcases/hal/vibrator/hidl/host/VibratorHidlTest" />
- <option name="enable-profiling" value="true" />
- </test>
-</configuration>
diff --git a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/target/Android.mk b/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/target/Android.mk
deleted file mode 100644
index 704d985..0000000
--- a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/target/Android.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := VibratorHidlTargetTest
-VTS_CONFIG_SRC_DIR := testcases/hal/vibrator/hidl/target
-include test/vts/tools/build/Android.host_config.mk
diff --git a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/target/AndroidTest.xml b/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/target/AndroidTest.xml
deleted file mode 100644
index 7948c86..0000000
--- a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/target/AndroidTest.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<configuration description="Config for VTS VIBRATOR HIDL HAL's target-side test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VibratorHidlTargetTest" />
- <option name="binary-test-sources" value="
- _32bit::DATA/nativetest/vibrator_hidl_hal_test/vibrator_hidl_hal_test,
- _64bit::DATA/nativetest64/vibrator_hidl_hal_test/vibrator_hidl_hal_test,
- "/>
- <option name="binary-test-type" value="gtest" />
- <option name="test-timeout" value="1m" />
- </test>
-</configuration>
-
diff --git a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/target_profiling/Android.mk b/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/target_profiling/Android.mk
deleted file mode 100644
index a1f43e4..0000000
--- a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/target_profiling/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := VibratorHidlTargetProfilingTest
-VTS_CONFIG_SRC_DIR := testcases/hal/vibrator/hidl/target_profiling
-include test/vts/tools/build/Android.host_config.mk
diff --git a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/target_profiling/AndroidTest.xml b/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/target_profiling/AndroidTest.xml
deleted file mode 100644
index 4643e23..0000000
--- a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/target_profiling/AndroidTest.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<configuration description="Config for VTS VIBRATOR HIDL HAL's target-side test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VibratorHidlTargetProfilingTest" />
- <option name="binary-test-sources" value="
- _32bit::DATA/nativetest/vibrator_hidl_hal_test/vibrator_hidl_hal_test,
- _64bit::DATA/nativetest64/vibrator_hidl_hal_test/vibrator_hidl_hal_test,
- "/>
- <option name="binary-test-type" value="gtest" />
- <option name="test-timeout" value="1m" />
- <option name="enable-profiling" value="true" />
- </test>
-</configuration>
-
diff --git a/vr/1.0/Android.bp b/vr/1.0/Android.bp
index f175610..b48d010 100644
--- a/vr/1.0/Android.bp
+++ b/vr/1.0/Android.bp
@@ -1,11 +1,18 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
+filegroup {
+ name: "android.hardware.vr@1.0_hal",
+ srcs: [
+ "IVr.hal",
+ ],
+}
+
genrule {
name: "android.hardware.vr@1.0_genc++",
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vr@1.0",
srcs: [
- "IVr.hal",
+ ":android.hardware.vr@1.0_hal",
],
out: [
"android/hardware/vr/1.0/VrAll.cpp",
@@ -17,7 +24,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vr@1.0",
srcs: [
- "IVr.hal",
+ ":android.hardware.vr@1.0_hal",
],
out: [
"android/hardware/vr/1.0/IVr.h",
@@ -50,98 +57,3 @@
"android.hidl.base@1.0",
],
}
-
-genrule {
- name: "android.hardware.vr.vts.driver@1.0_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vr@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/vr/1.0/ $(genDir)/android/hardware/vr/1.0/",
- srcs: [
- "IVr.hal",
- ],
- out: [
- "android/hardware/vr/1.0/Vr.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.vr.vts.driver@1.0_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vr@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/vr/1.0/ $(genDir)/android/hardware/vr/1.0/",
- srcs: [
- "IVr.hal",
- ],
- out: [
- "android/hardware/vr/1.0/Vr.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.vr.vts.driver@1.0",
- generated_sources: ["android.hardware.vr.vts.driver@1.0_genc++"],
- generated_headers: ["android.hardware.vr.vts.driver@1.0_genc++_headers"],
- export_generated_headers: ["android.hardware.vr.vts.driver@1.0_genc++_headers"],
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libvts_common",
- "libvts_datatype",
- "libvts_measurement",
- "libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
- "android.hidl.base@1.0",
- "android.hardware.vr@1.0",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "android.hidl.base@1.0",
- ],
-}
-
-genrule {
- name: "android.hardware.vr@1.0-IVr-vts.profiler_genc++",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vr@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/vr/1.0/ $(genDir)/android/hardware/vr/1.0/",
- srcs: [
- "IVr.hal",
- ],
- out: [
- "android/hardware/vr/1.0/Vr.vts.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.vr@1.0-IVr-vts.profiler_genc++_headers",
- tools: ["hidl-gen", "vtsc"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vr@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/vr/1.0/ $(genDir)/android/hardware/vr/1.0/",
- srcs: [
- "IVr.hal",
- ],
- out: [
- "android/hardware/vr/1.0/Vr.vts.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.vr@1.0-IVr-vts.profiler",
- generated_sources: ["android.hardware.vr@1.0-IVr-vts.profiler_genc++"],
- generated_headers: ["android.hardware.vr@1.0-IVr-vts.profiler_genc++_headers"],
- export_generated_headers: ["android.hardware.vr@1.0-IVr-vts.profiler_genc++_headers"],
- shared_libs: [
- "libbase",
- "libhidlbase",
- "libhidltransport",
- "libvts_profiling",
- "libvts_multidevice_proto",
- "libprotobuf-cpp-full",
- "android.hidl.base@1.0",
- "android.hardware.vr@1.0",
- ],
-}
diff --git a/vr/1.0/Android.mk b/vr/1.0/Android.mk
index 1b8e8c7..0fbdaf7 100644
--- a/vr/1.0/Android.mk
+++ b/vr/1.0/Android.mk
@@ -8,7 +8,7 @@
LOCAL_MODULE := android.hardware.vr@1.0-java
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -43,7 +43,7 @@
LOCAL_MODULE := android.hardware.vr@1.0-java-static
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
diff --git a/vr/1.0/default/Android.bp b/vr/1.0/default/Android.bp
index da8a754..0d374d3 100644
--- a/vr/1.0/default/Android.bp
+++ b/vr/1.0/default/Android.bp
@@ -1,5 +1,6 @@
cc_library_shared {
name: "android.hardware.vr@1.0-impl",
+ proprietary: true,
relative_install_path: "hw",
srcs: ["Vr.cpp"],
shared_libs: [
@@ -18,6 +19,7 @@
cc_binary {
relative_install_path: "hw",
+ proprietary: true,
name: "android.hardware.vr@1.0-service",
init_rc: ["android.hardware.vr@1.0-service.rc"],
srcs: ["service.cpp"],
diff --git a/vr/1.0/default/android.hardware.vr@1.0-service.rc b/vr/1.0/default/android.hardware.vr@1.0-service.rc
index 6177089..ba43302 100644
--- a/vr/1.0/default/android.hardware.vr@1.0-service.rc
+++ b/vr/1.0/default/android.hardware.vr@1.0-service.rc
@@ -1,4 +1,4 @@
-service vr-1-0 /system/bin/hw/android.hardware.vr@1.0-service
+service vr-1-0 /vendor/bin/hw/android.hardware.vr@1.0-service
class hal
user system
group system readproc
diff --git a/vr/1.0/vts/Android.mk b/vr/1.0/vts/Android.mk
deleted file mode 100644
index e8afa86..0000000
--- a/vr/1.0/vts/Android.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-# include hidl test makefiles
-include $(LOCAL_PATH)/functional/vts/testcases/hal/vr/hidl/Android.mk
diff --git a/vr/1.0/vts/Vr.vts b/vr/1.0/vts/Vr.vts
index 36ec11f..fdc4a5c 100644
--- a/vr/1.0/vts/Vr.vts
+++ b/vr/1.0/vts/Vr.vts
@@ -4,6 +4,7 @@
package: "android.hardware.vr"
+import: "android.hidl.base@1.0::types"
interface: {
api: {
diff --git a/vr/1.0/vts/functional/Android.bp b/vr/1.0/vts/functional/Android.bp
index 551f27c..529f92d 100644
--- a/vr/1.0/vts/functional/Android.bp
+++ b/vr/1.0/vts/functional/Android.bp
@@ -26,11 +26,7 @@
],
static_libs: ["libgtest"],
cflags: [
- "--coverage",
"-O0",
"-g",
- ],
- ldflags: [
- "--coverage"
]
}
diff --git a/vr/1.0/vts/functional/vr_hidl_hal_test.cpp b/vr/1.0/vts/functional/vr_hidl_hal_test.cpp
index 7e85337..29888fd 100644
--- a/vr/1.0/vts/functional/vr_hidl_hal_test.cpp
+++ b/vr/1.0/vts/functional/vr_hidl_hal_test.cpp
@@ -34,7 +34,6 @@
void SetUp() override {
vr = IVr::getService(VR_SERVICE_NAME);
ASSERT_NE(vr, nullptr);
- ASSERT_TRUE(!vr->isRemote());
}
void TearDown() override {}
diff --git a/vr/1.0/vts/functional/vts/Android.mk b/vr/1.0/vts/functional/vts/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/vr/1.0/vts/functional/vts/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/vr/1.0/vts/functional/vts/testcases/Android.mk b/vr/1.0/vts/functional/vts/testcases/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/vr/1.0/vts/functional/vts/testcases/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/vr/1.0/vts/functional/vts/testcases/hal/Android.mk b/vr/1.0/vts/functional/vts/testcases/hal/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/vr/1.0/vts/functional/vts/testcases/hal/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/vr/1.0/vts/functional/vts/testcases/hal/vr/Android.mk b/vr/1.0/vts/functional/vts/testcases/hal/vr/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/vr/1.0/vts/functional/vts/testcases/hal/vr/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/vr/1.0/vts/functional/vts/testcases/hal/vr/__init__.py b/vr/1.0/vts/functional/vts/testcases/hal/vr/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/vr/1.0/vts/functional/vts/testcases/hal/vr/__init__.py
+++ /dev/null
diff --git a/vr/1.0/vts/functional/vts/testcases/hal/vr/hidl/Android.mk b/vr/1.0/vts/functional/vts/testcases/hal/vr/hidl/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/vr/1.0/vts/functional/vts/testcases/hal/vr/hidl/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/vr/1.0/vts/functional/vts/testcases/hal/vr/hidl/__init__.py b/vr/1.0/vts/functional/vts/testcases/hal/vr/hidl/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/vr/1.0/vts/functional/vts/testcases/hal/vr/hidl/__init__.py
+++ /dev/null
diff --git a/vr/1.0/vts/functional/vts/testcases/hal/vr/hidl/host/Android.mk b/vr/1.0/vts/functional/vts/testcases/hal/vr/hidl/host/Android.mk
deleted file mode 100644
index 9388b8d..0000000
--- a/vr/1.0/vts/functional/vts/testcases/hal/vr/hidl/host/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := VrHidlTest
-VTS_CONFIG_SRC_DIR := testcases/hal/vr/hidl/host
-include test/vts/tools/build/Android.host_config.mk
diff --git a/vr/1.0/vts/functional/vts/testcases/hal/vr/hidl/host/AndroidTest.xml b/vr/1.0/vts/functional/vts/testcases/hal/vr/hidl/host/AndroidTest.xml
deleted file mode 100644
index 1cd2a80..0000000
--- a/vr/1.0/vts/functional/vts/testcases/hal/vr/hidl/host/AndroidTest.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<configuration description="Config for VTS HAL VR test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- <option name="cleanup" value="true" />
- <option name="push" value="spec/hardware/interfaces/vr/1.0/vts/Vr.vts->/data/local/tmp/spec/Vr.vts" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VrHidlTest" />
- <option name="test-case-path" value="vts/testcases/hal/vr/hidl/host/VrHidlTest" />
- </test>
-</configuration>
diff --git a/vr/1.0/vts/functional/vts/testcases/hal/vr/hidl/host/VrHidlTest.py b/vr/1.0/vts/functional/vts/testcases/hal/vr/hidl/host/VrHidlTest.py
deleted file mode 100644
index d20e9ce..0000000
--- a/vr/1.0/vts/functional/vts/testcases/hal/vr/hidl/host/VrHidlTest.py
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/usr/bin/env python3.4
-#
-# Copyright (C) 2016 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.
-#
-
-import logging
-import time
-
-from vts.runners.host import asserts
-from vts.runners.host import base_test_with_webdb
-from vts.runners.host import test_runner
-from vts.utils.python.controllers import android_device
-from vts.utils.python.profiling import profiling_utils
-
-
-class VrHidlTest(base_test_with_webdb.BaseTestWithWebDbClass):
- """A simple testcase for the VR HIDL HAL."""
-
- def setUpClass(self):
- """Creates a mirror and turns on the framework-layer VR service."""
- self.dut = self.registerController(android_device)[0]
-
- self.dut.shell.InvokeTerminal("one")
- self.dut.shell.one.Execute("setenforce 0") # SELinux permissive mode
-
- # Test using the binderized mode
- self.dut.shell.one.Execute(
- "setprop vts.hal.vts.hidl.get_stub true")
-
- self.dut.hal.InitHidlHal(
- target_type="vr",
- target_basepaths=["/system/lib64"],
- target_version=1.0,
- target_package="android.hardware.vr",
- target_component_name="IVr",
- hw_binder_service_name=None,
- bits=64)
-
- def tearDownClass(self):
- """ If profiling is enabled for the test, collect the profiling data
- and disable profiling after the test is done.
- """
- if self.enable_profiling:
- self.ProcessAndUploadTraceData()
-
- def setUpTest(self):
- if self.enable_profiling:
- profiling_utils.EnableVTSProfiling(self.dut.shell.one)
-
- def tearDownTest(self):
- if self.enable_profiling:
- profiling_trace_path = getattr(
- self, self.VTS_PROFILING_TRACING_PATH, "")
- self.ProcessTraceDataForTestCase(self.dut, profiling_trace_path)
- profiling_utils.DisableVTSProfiling(self.dut.shell.one)
-
- def testVrBasic(self):
- """A simple test case which just calls each registered function."""
- result = self.dut.hal.vr.init()
- logging.info("init result: %s", result)
-
- time.sleep(1)
-
- result = self.dut.hal.vr.setVrMode(True)
- logging.info("setVrMode(true) result: %s", result)
-
- time.sleep(1)
-
- result = self.dut.hal.vr.setVrMode(False)
- logging.info("setVrMode(false) result: %s", result)
-
-
-if __name__ == "__main__":
- test_runner.main()
diff --git a/vr/1.0/vts/functional/vts/testcases/hal/vr/hidl/host/__init__.py b/vr/1.0/vts/functional/vts/testcases/hal/vr/hidl/host/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/vr/1.0/vts/functional/vts/testcases/hal/vr/hidl/host/__init__.py
+++ /dev/null
diff --git a/vr/1.0/vts/functional/vts/testcases/hal/vr/hidl/target/Android.mk b/vr/1.0/vts/functional/vts/testcases/hal/vr/hidl/target/Android.mk
deleted file mode 100644
index 691d1a4..0000000
--- a/vr/1.0/vts/functional/vts/testcases/hal/vr/hidl/target/Android.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := VrHidlTargetTest
-VTS_CONFIG_SRC_DIR := testcases/hal/vr/hidl/target
-include test/vts/tools/build/Android.host_config.mk
diff --git a/vr/1.0/vts/functional/vts/testcases/hal/vr/hidl/target/AndroidTest.xml b/vr/1.0/vts/functional/vts/testcases/hal/vr/hidl/target/AndroidTest.xml
deleted file mode 100644
index 8c7a9b7..0000000
--- a/vr/1.0/vts/functional/vts/testcases/hal/vr/hidl/target/AndroidTest.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<configuration description="Config for VTS VR HIDL HAL's target-side test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VrHidlTargetTest" />
- <option name="binary-test-sources" value="
- _32bit::DATA/nativetest/vr_hidl_hal_test/vr_hidl_hal_test,
- _64bit::DATA/nativetest64/vr_hidl_hal_test/vr_hidl_hal_test,
- "/>
- <option name="binary-test-type" value="hal_hidl_gtest" />
- <!-- Uncomment this and comment 'precondition-feature' to run this test
- only on devices using binderized VR HALs.
- <option name="precondition-hwbinder-service" value="android.hardware.vr" /> -->
- <option name="precondition-feature" value="android.hardware.vr.high_performance" />
- <option name="test-timeout" value="1m" />
- <option name="test-config-path" value="vts/testcases/hal/vr/hidl/target/VrHidlTargetTest.config" />
-</test>
-</configuration>
diff --git a/vr/1.0/vts/functional/vts/testcases/hal/vr/hidl/target/VrHidlTargetTest.config b/vr/1.0/vts/functional/vts/testcases/hal/vr/hidl/target/VrHidlTargetTest.config
deleted file mode 100644
index ec01b5f..0000000
--- a/vr/1.0/vts/functional/vts/testcases/hal/vr/hidl/target/VrHidlTargetTest.config
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "use_gae_db": true,
- "coverage": true,
- "modules": [{
- "module_name": "system/lib64/hw/vr.marlin",
- "git_project": {
- "name": "device/google/marlin",
- "path": "device/google/marlin"
- }
- },
- {
- "module_name": "system/lib64/hw/vr.sailfish",
- "git_project": {
- "name": "device/google/marlin",
- "path": "device/google/marlin"
- }
- },
- {
- "module_name": "system/lib64/hw/android.hardware.vr@1.0-impl",
- "git_project": {
- "name": "platform/hardware/interfaces",
- "path": "hardware/interfaces"
- }
- }]
-}
diff --git a/vr/1.0/vts/functional/vts/testcases/hal/vr/hidl/target_profiling/Android.mk b/vr/1.0/vts/functional/vts/testcases/hal/vr/hidl/target_profiling/Android.mk
deleted file mode 100644
index 6f60af3..0000000
--- a/vr/1.0/vts/functional/vts/testcases/hal/vr/hidl/target_profiling/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := VrHidlTargetProfilingTest
-VTS_CONFIG_SRC_DIR := testcases/hal/vr/hidl/target_profiling
-include test/vts/tools/build/Android.host_config.mk
diff --git a/vr/1.0/vts/functional/vts/testcases/hal/vr/hidl/target_profiling/AndroidTest.xml b/vr/1.0/vts/functional/vts/testcases/hal/vr/hidl/target_profiling/AndroidTest.xml
deleted file mode 100644
index 3bc711a..0000000
--- a/vr/1.0/vts/functional/vts/testcases/hal/vr/hidl/target_profiling/AndroidTest.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<configuration description="Config for VTS VR HIDL HAL's target-side, profiling test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VrHidlTargetTest" />
- <option name="binary-test-sources" value="
- _32bit::DATA/nativetest/vr_hidl_hal_test/vr_hidl_hal_test,
- _64bit::DATA/nativetest64/vr_hidl_hal_test/vr_hidl_hal_test,
- "/>
- <option name="binary-test-type" value="gtest" />
- <option name="test-timeout" value="1m" />
- <option name="enable-profiling" value="true" />
- </test>
-</configuration>
-
diff --git a/wifi/.clang-format b/wifi/.clang-format
new file mode 100644
index 0000000..25ed932
--- /dev/null
+++ b/wifi/.clang-format
@@ -0,0 +1,2 @@
+BasedOnStyle: Google
+IndentWidth: 4
\ No newline at end of file
diff --git a/wifi/1.0/Android.bp b/wifi/1.0/Android.bp
index 049d5d7..2319999 100644
--- a/wifi/1.0/Android.bp
+++ b/wifi/1.0/Android.bp
@@ -1,9 +1,7 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
-genrule {
- name: "android.hardware.wifi@1.0_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.0",
+filegroup {
+ name: "android.hardware.wifi@1.0_hal",
srcs: [
"types.hal",
"IWifi.hal",
@@ -20,6 +18,15 @@
"IWifiStaIface.hal",
"IWifiStaIfaceEventCallback.hal",
],
+}
+
+genrule {
+ name: "android.hardware.wifi@1.0_genc++",
+ tools: ["hidl-gen"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.0",
+ srcs: [
+ ":android.hardware.wifi@1.0_hal",
+ ],
out: [
"android/hardware/wifi/1.0/types.cpp",
"android/hardware/wifi/1.0/WifiAll.cpp",
@@ -43,20 +50,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.0",
srcs: [
- "types.hal",
- "IWifi.hal",
- "IWifiApIface.hal",
- "IWifiChip.hal",
- "IWifiChipEventCallback.hal",
- "IWifiEventCallback.hal",
- "IWifiIface.hal",
- "IWifiNanIface.hal",
- "IWifiNanIfaceEventCallback.hal",
- "IWifiP2pIface.hal",
- "IWifiRttController.hal",
- "IWifiRttControllerEventCallback.hal",
- "IWifiStaIface.hal",
- "IWifiStaIfaceEventCallback.hal",
+ ":android.hardware.wifi@1.0_hal",
],
out: [
"android/hardware/wifi/1.0/types.h",
diff --git a/wifi/1.0/Android.mk b/wifi/1.0/Android.mk
index 708c14c..4476b14 100644
--- a/wifi/1.0/Android.mk
+++ b/wifi/1.0/Android.mk
@@ -8,7 +8,7 @@
LOCAL_MODULE := android.hardware.wifi@1.0-java
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -74,44 +74,6 @@
LOCAL_GENERATED_SOURCES += $(GEN)
#
-# Build types.hal (NanBeaconSdfPayloadInd)
-#
-GEN := $(intermediates)/android/hardware/wifi/V1_0/NanBeaconSdfPayloadInd.java
-$(GEN): $(HIDL)
-$(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
-$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
-$(GEN): PRIVATE_CUSTOM_TOOL = \
- $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Ljava \
- -randroid.hardware:hardware/interfaces \
- -randroid.hidl:system/libhidl/transport \
- android.hardware.wifi@1.0::types.NanBeaconSdfPayloadInd
-
-$(GEN): $(LOCAL_PATH)/types.hal
- $(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN)
-
-#
-# Build types.hal (NanBeaconSdfPayloadRequest)
-#
-GEN := $(intermediates)/android/hardware/wifi/V1_0/NanBeaconSdfPayloadRequest.java
-$(GEN): $(HIDL)
-$(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
-$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
-$(GEN): PRIVATE_CUSTOM_TOOL = \
- $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Ljava \
- -randroid.hardware:hardware/interfaces \
- -randroid.hidl:system/libhidl/transport \
- android.hardware.wifi@1.0::types.NanBeaconSdfPayloadRequest
-
-$(GEN): $(LOCAL_PATH)/types.hal
- $(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN)
-
-#
# Build types.hal (NanCapabilities)
#
GEN := $(intermediates)/android/hardware/wifi/V1_0/NanCapabilities.java
@@ -587,25 +549,6 @@
LOCAL_GENERATED_SOURCES += $(GEN)
#
-# Build types.hal (NanVsaRxFrameMask)
-#
-GEN := $(intermediates)/android/hardware/wifi/V1_0/NanVsaRxFrameMask.java
-$(GEN): $(HIDL)
-$(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
-$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
-$(GEN): PRIVATE_CUSTOM_TOOL = \
- $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Ljava \
- -randroid.hardware:hardware/interfaces \
- -randroid.hidl:system/libhidl/transport \
- android.hardware.wifi@1.0::types.NanVsaRxFrameMask
-
-$(GEN): $(LOCAL_PATH)/types.hal
- $(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN)
-
-#
# Build types.hal (RttBw)
#
GEN := $(intermediates)/android/hardware/wifi/V1_0/RttBw.java
@@ -1868,7 +1811,7 @@
LOCAL_MODULE := android.hardware.wifi@1.0-java-static
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -1934,44 +1877,6 @@
LOCAL_GENERATED_SOURCES += $(GEN)
#
-# Build types.hal (NanBeaconSdfPayloadInd)
-#
-GEN := $(intermediates)/android/hardware/wifi/V1_0/NanBeaconSdfPayloadInd.java
-$(GEN): $(HIDL)
-$(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
-$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
-$(GEN): PRIVATE_CUSTOM_TOOL = \
- $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Ljava \
- -randroid.hardware:hardware/interfaces \
- -randroid.hidl:system/libhidl/transport \
- android.hardware.wifi@1.0::types.NanBeaconSdfPayloadInd
-
-$(GEN): $(LOCAL_PATH)/types.hal
- $(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN)
-
-#
-# Build types.hal (NanBeaconSdfPayloadRequest)
-#
-GEN := $(intermediates)/android/hardware/wifi/V1_0/NanBeaconSdfPayloadRequest.java
-$(GEN): $(HIDL)
-$(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
-$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
-$(GEN): PRIVATE_CUSTOM_TOOL = \
- $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Ljava \
- -randroid.hardware:hardware/interfaces \
- -randroid.hidl:system/libhidl/transport \
- android.hardware.wifi@1.0::types.NanBeaconSdfPayloadRequest
-
-$(GEN): $(LOCAL_PATH)/types.hal
- $(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN)
-
-#
# Build types.hal (NanCapabilities)
#
GEN := $(intermediates)/android/hardware/wifi/V1_0/NanCapabilities.java
@@ -2447,25 +2352,6 @@
LOCAL_GENERATED_SOURCES += $(GEN)
#
-# Build types.hal (NanVsaRxFrameMask)
-#
-GEN := $(intermediates)/android/hardware/wifi/V1_0/NanVsaRxFrameMask.java
-$(GEN): $(HIDL)
-$(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
-$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
-$(GEN): PRIVATE_CUSTOM_TOOL = \
- $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Ljava \
- -randroid.hardware:hardware/interfaces \
- -randroid.hidl:system/libhidl/transport \
- android.hardware.wifi@1.0::types.NanVsaRxFrameMask
-
-$(GEN): $(LOCAL_PATH)/types.hal
- $(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN)
-
-#
# Build types.hal (RttBw)
#
GEN := $(intermediates)/android/hardware/wifi/V1_0/RttBw.java
diff --git a/wifi/1.0/IWifiNanIface.hal b/wifi/1.0/IWifiNanIface.hal
index 3362339..d1d4ca5 100644
--- a/wifi/1.0/IWifiNanIface.hal
+++ b/wifi/1.0/IWifiNanIface.hal
@@ -21,6 +21,9 @@
/**
* Interface used to represent a single NAN(Neighbour Aware Network) iface.
+ *
+ * References to "NAN Spec" are to the Wi-Fi Alliance "Wi-Fi Neighbor Awareness
+ * Networking (NAN) Technical Specification".
*/
interface IWifiNanIface extends IWifiIface {
/**
@@ -39,7 +42,8 @@
generates (WifiStatus status);
/**
- * Get NAN capabilities.
+ * Get NAN capabilities. Asynchronous response is with
+ * |IWifiNanIfaceEventCallback.notifyCapabilitiesResponse|.
*
* @param cmdId command Id to use for this invocation.
* @return status WifiStatus of the operation.
@@ -53,8 +57,9 @@
/**
* Enable NAN: configures and activates NAN clustering (does not start
* a discovery session or set up data-interfaces or data-paths). Use the
- * |configureRequest| method to change the configuration of an already enabled
+ * |IWifiNanIface.configureRequest| method to change the configuration of an already enabled
* NAN interface.
+ * Asynchronous response is with |IWifiNanIfaceEventCallback.notifyEnableResponse|.
*
* @param cmdId command Id to use for this invocation.
* @param msg Instance of |NanEnableRequest|.
@@ -70,7 +75,8 @@
/**
* Configure NAN: configures an existing NAN functionality (i.e. assumes
- * |enableRequest| already submitted and succeeded).
+ * |IWifiNanIface.enableRequest| already submitted and succeeded).
+ * Asynchronous response is with |IWifiNanIfaceEventCallback.notifyConfigResponse|.
*
* @param cmdId command Id to use for this invocation.
* @param msg Instance of |NanConfigRequest|.
@@ -86,6 +92,7 @@
/**
* Disable NAN functionality.
+ * Asynchronous response is with |IWifiNanIfaceEventCallback.notifyDisableResponse|.
*
* @param cmdId command Id to use for this invocation.
* @return status WifiStatus of the operation.
@@ -98,6 +105,7 @@
/**
* Publish request to start advertising a discovery service.
+ * Asynchronous response is with |IWifiNanIfaceEventCallback.notifyStartPublishResponse|.
*
* @param cmdId command Id to use for this invocation.
* @param msg Instance of |NanPublishRequest|.
@@ -113,6 +121,7 @@
/**
* Stop publishing a discovery service.
+ * Asynchronous response is with |IWifiNanIfaceEventCallback.notifyStopPublishResponse|.
*
* @param cmdId command Id to use for this invocation.
* @param sessionId ID of the publish discovery session to be stopped.
@@ -122,11 +131,12 @@
* |WifiStatusCode.ERROR_WIFI_IFACE_INVALID|,
* |WifiStatusCode.ERROR_UNKNOWN|
*/
- stopPublishRequest(CommandIdShort cmdId, uint16_t sessionId)
+ stopPublishRequest(CommandIdShort cmdId, uint8_t sessionId)
generates (WifiStatus status);
/**
* Subscribe request to start searching for a discovery service.
+ * Asynchronous response is with |IWifiNanIfaceEventCallback.notifyStartSubscribeResponse|.
*
* @param cmdId command Id to use for this invocation.
* @param msg Instance of |NanSubscribeRequest|.
@@ -142,6 +152,7 @@
/**
* Stop subscribing to a discovery service.
+ * Asynchronous response is with |IWifiNanIfaceEventCallback.notifyStopSubscribeResponse|.
*
* @param cmdId command Id to use for this invocation.
* @param sessionId ID of the subscribe discovery session to be stopped.
@@ -151,11 +162,12 @@
* |WifiStatusCode.ERROR_WIFI_IFACE_INVALID|,
* |WifiStatusCode.ERROR_UNKNOWN|
*/
- stopSubscribeRequest(CommandIdShort cmdId, uint16_t sessionId)
+ stopSubscribeRequest(CommandIdShort cmdId, uint8_t sessionId)
generates (WifiStatus status);
/**
* NAN transmit follow up message request.
+ * Asynchronous response is with |IWifiNanIfaceEventCallback.notifyTransmitFollowupResponse|.
*
* @param cmdId command Id to use for this invocation.
* @param msg Instance of |NanTransmitFollowupRequest|.
@@ -171,6 +183,7 @@
/**
* Create a NAN Data Interface.
+ * Asynchronous response is with |IWifiNanIfaceEventCallback.notifyCreateDataInterfaceResponse|.
*
* @param cmdId command Id to use for this invocation.
* @return status WifiStatus of the operation.
@@ -184,6 +197,7 @@
/**
* Delete a NAN Data Interface.
+ * Asynchronous response is with |IWifiNanIfaceEventCallback.notifyDeleteDataInterfaceResponse|.
*
* @param cmdId command Id to use for this invocation.
* @return status WifiStatus of the operation.
@@ -197,6 +211,7 @@
/**
* Initiate a data-path (NDP) setup operation: Initiator.
+ * Asynchronous response is with |IWifiNanIfaceEventCallback.notifyInitiateDataPathResponse|.
*
* @param cmdId command Id to use for this invocation.
* @param msg Instance of |NanInitiateDataPathRequest|.
@@ -213,6 +228,8 @@
/**
* Respond to a received data indication as part of a data-path (NDP) setup operation. An
* indication is received by the Responder from the Initiator.
+ * Asynchronous response is with
+ * |IWifiNanIfaceEventCallback.notifyRespondToDataPathIndicationResponse|.
*
* @param cmdId command Id to use for this invocation.
* @param msg Instance of |NanRespondToDataPathIndicationRequest|.
@@ -229,6 +246,7 @@
/**
* Data-path (NDP) termination request: executed by either Initiator or Responder.
+ * Asynchronous response is with |IWifiNanIfaceEventCallback.notifyTerminateDataPathResponse|.
*
* @param cmdId command Id to use for this invocation.
* @param ndpInstanceId Data-path instance ID to be terminated.
@@ -240,19 +258,4 @@
*/
terminateDataPathRequest(CommandIdShort cmdId, uint32_t ndpInstanceId)
generates (WifiStatus status);
-
- /**
- * Configure NAN Beacon or SDF payload to include vendor-specific payload.
- *
- * @param cmdId command Id to use for this invocation.
- * @param msg Instance of |NanBeaconSdfPayloadRequest|.
- * @return status WifiStatus of the operation.
- * Possible status codes:
- * |WifiStatusCode.SUCCESS|,
- * |WifiStatusCode.ERROR_WIFI_IFACE_INVALID|,
- * |WifiStatusCode.ERROR_INVALID_ARGS|,
- * |WifiStatusCode.ERROR_UNKNOWN|
- */
- beaconSdfPayloadRequest(CommandIdShort cmdId, NanBeaconSdfPayloadRequest msg)
- generates (WifiStatus status);
};
diff --git a/wifi/1.0/IWifiNanIfaceEventCallback.hal b/wifi/1.0/IWifiNanIfaceEventCallback.hal
index cb4b043..80d67ce 100644
--- a/wifi/1.0/IWifiNanIfaceEventCallback.hal
+++ b/wifi/1.0/IWifiNanIfaceEventCallback.hal
@@ -18,10 +18,19 @@
/**
* NAN Response and Asynchronous Event Callbacks.
+ *
+ * References to "NAN Spec" are to the Wi-Fi Alliance "Wi-Fi Neighbor Awareness
+ * Networking (NAN) Technical Specification".
*/
interface IWifiNanIfaceEventCallback {
/**
- * Callback invoked in response to a capability request |getCapabilitiesRequest|.
+ * Notify callbacks are asynchronous callbacks - but in response to |IWifiNanIface| method calls.
+ * Each method will receive a notify callback to return results (on success) or failure status.
+ */
+
+ /**
+ * Asynchronous callback invoked in response to a capability request
+ * |IWifiNanIface.getCapabilitiesRequest|.
*
* @param cmdId command Id corresponding to the original request.
* @param status WifiNanStatus of the operation. Possible status codes are:
@@ -32,7 +41,7 @@
NanCapabilities capabilities);
/**
- * Callback invoked in response to an enable request |enableRequest|.
+ * Asynchronous callback invoked in response to an enable request |IWifiNanIface.enableRequest|.
*
* @param cmdId command Id corresponding to the original request.
* @param status WifiNanStatus of the operation. Possible status codes are:
@@ -46,7 +55,7 @@
oneway notifyEnableResponse(CommandIdShort id, WifiNanStatus status);
/**
- * Callback invoked in response to a config request |configRequest|.
+ * Asynchronous callback invoked in response to a config request |IWifiNanIface.configRequest|.
*
* @param cmdId command Id corresponding to the original request.
* @param status WifiNanStatus of the operation. Possible status codes are:
@@ -58,7 +67,7 @@
oneway notifyConfigResponse(CommandIdShort id, WifiNanStatus status);
/**
- * Callback invoked in response to a disable request |disableRequest|.
+ * Asynchronous callback invoked in response to a disable request |IWifiNanIface.disableRequest|.
*
* @param cmdId command Id corresponding to the original request.
* @param status WifiNanStatus of the operation. Possible status codes are:
@@ -68,7 +77,8 @@
oneway notifyDisableResponse(CommandIdShort id, WifiNanStatus status);
/**
- * Callback invoked to notify the status of the start publish request |startPublishRequest|.
+ * Asynchronous callback invoked to notify the status of the start publish request
+ * |IWifiNanIface.startPublishRequest|.
*
* @param cmdId command Id corresponding to the original request.
* @param status WifiNanStatus of the operation. Possible status codes are:
@@ -79,10 +89,11 @@
* |NanStatusType.INVALID_SESSION_ID|
* @param sessionId ID of the new publish session (if successfully created).
*/
- oneway notifyStartPublishResponse(CommandIdShort id, WifiNanStatus status, uint16_t sessionId);
+ oneway notifyStartPublishResponse(CommandIdShort id, WifiNanStatus status, uint8_t sessionId);
/**
- * Callback invoked in response to a stop publish request |stopPublishRequest|.
+ * Asynchronous callback invoked in response to a stop publish request
+ * |IWifiNanIface.stopPublishRequest|.
*
* @param cmdId command Id corresponding to the original request.
* @param status WifiNanStatus of the operation. Possible status codes are:
@@ -93,7 +104,8 @@
oneway notifyStopPublishResponse(CommandIdShort id, WifiNanStatus status);
/**
- * Callback invoked to notify the status of the start subscribe request |startSubscribeRequest|.
+ * Asynchronous callback invoked to notify the status of the start subscribe request
+ * |IWifiNanIface.startSubscribeRequest|.
*
* @param cmdId command Id corresponding to the original request.
* @param status WifiNanStatus of the operation. Possible status codes are:
@@ -104,10 +116,11 @@
* |NanStatusType.INVALID_SESSION_ID|
* @param sessionId ID of the new subscribe session (if successfully created).
*/
- oneway notifyStartSubscribeResponse(CommandIdShort id, WifiNanStatus status, uint16_t sessionId);
+ oneway notifyStartSubscribeResponse(CommandIdShort id, WifiNanStatus status, uint8_t sessionId);
/**
- * Callback invoked in response to a stop subscribe request |stopSubscribeRequest|.
+ * Asynchronous callback invoked in response to a stop subscribe request
+ * |IWifiNanIface.stopSubscribeRequest|.
*
* @param cmdId command Id corresponding to the original request.
* @param status WifiNanStatus of the operation. Possible status codes are:
@@ -118,7 +131,8 @@
oneway notifyStopSubscribeResponse(CommandIdShort id, WifiNanStatus status);
/**
- * Callback invoked in response to a transmit followup request |transmitFollowupRequest|.
+ * Asynchronous callback invoked in response to a transmit followup request
+ * |IWifiNanIface.transmitFollowupRequest|.
*
* @param cmdId command Id corresponding to the original request.
* @param status WifiNanStatus of the operation. Possible status codes are:
@@ -131,7 +145,8 @@
oneway notifyTransmitFollowupResponse(CommandIdShort id, WifiNanStatus status);
/**
- * Callback invoked in response to a create data interface request |createDataInterfaceRequest|.
+ * Asynchronous callback invoked in response to a create data interface request
+ * |IWifiNanIface.createDataInterfaceRequest|.
*
* @param cmdId command Id corresponding to the original request.
* @param status WifiNanStatus of the operation. Possible status codes are:
@@ -142,7 +157,8 @@
oneway notifyCreateDataInterfaceResponse(CommandIdShort id, WifiNanStatus status);
/**
- * Callback invoked in response to a delete data interface request |deleteDataInterfaceRequest|.
+ * Asynchronous callback invoked in response to a delete data interface request
+ * |IWifiNanIface.deleteDataInterfaceRequest|.
*
* @param cmdId command Id corresponding to the original request.
* @param status WifiNanStatus of the operation. Possible status codes are:
@@ -153,7 +169,8 @@
oneway notifyDeleteDataInterfaceResponse(CommandIdShort id, WifiNanStatus status);
/**
- * Callback invoked in response to an initiate data path request |initiateDataPathRequest|.
+ * Asynchronous callback invoked in response to an initiate data path request
+ * |IWifiNanIface.initiateDataPathRequest|.
*
* @param cmdId command Id corresponding to the original request.
* @param status WifiNanStatus of the operation. Possible status codes are:
@@ -168,8 +185,8 @@
uint32_t ndpInstanceId );
/**
- * Callback invoked in response to a respond to data path indication request
- * |respondToDataPathIndicationRequest|.
+ * Asynchronous callback invoked in response to a respond to data path indication request
+ * |IWifiNanIface.respondToDataPathIndicationRequest|.
*
* @param cmdId command Id corresponding to the original request.
* @param status WifiNanStatus of the operation. Possible status codes are:
@@ -182,7 +199,8 @@
oneway notifyRespondToDataPathIndicationResponse(CommandIdShort id, WifiNanStatus status);
/**
- * Callback invoked in response to a terminate data path request |terminateDataPathRequest|.
+ * Asynchronous callback invoked in response to a terminate data path request
+ * |IWifiNanIface.terminateDataPathRequest|.
*
* @param cmdId command Id corresponding to the original request.
* @param status WifiNanStatus of the operation. Possible status codes are:
@@ -195,18 +213,6 @@
oneway notifyTerminateDataPathResponse(CommandIdShort id, WifiNanStatus status);
/**
- * Callback invoked in response to a request to include vendor-specific payload in beacon or SDF
- * frames |beaconSdfPayloadRequest|.
- *
- * @param cmdId command Id corresponding to the original request.
- * @param status WifiNanStatus of the operation. Possible status codes are:
- * |NanStatusType.SUCCESS|
- * |NanStatusType.INVALID_ARGS|
- * |NanStatusType.INTERNAL_FAILURE|
- */
- oneway notifyBeaconSdfPayloadResponse(CommandIdShort id, WifiNanStatus status);
-
- /**
* Callbacks for the various asynchornous NAN Events.
*/
@@ -235,7 +241,7 @@
* Possible status codes are:
* |NanStatusType.SUCCESS|
*/
- oneway eventPublishTerminated(uint16_t sessionId, WifiNanStatus status);
+ oneway eventPublishTerminated(uint8_t sessionId, WifiNanStatus status);
/**
* Asynchronous callback indicating that an active subscribe session has terminated.
@@ -245,7 +251,7 @@
* Possible status codes are:
* |NanStatusType.SUCCESS|
*/
- oneway eventSubscribeTerminated(uint16_t sessionId, WifiNanStatus status);
+ oneway eventSubscribeTerminated(uint8_t sessionId, WifiNanStatus status);
/**
* Asynchronous callback indicating that a match has occurred: i.e. a service has been
@@ -261,7 +267,7 @@
* @param discoverySessionId: The discovery session ID of the expired match.
* @param peerId: The peer ID of the expired match.
*/
- oneway eventMatchExpired(uint16_t discoverySessionId, uint32_t peerId);
+ oneway eventMatchExpired(uint8_t discoverySessionId, uint32_t peerId);
/**
* Asynchronous callback indicating that a followup message has been received from a peer.
@@ -303,11 +309,4 @@
* @param ndpInstanceId: data-path ID of the terminated data-path.
*/
oneway eventDataPathTerminated(uint32_t ndpInstanceId);
-
- /**
- * Asynchronous callback indicating vendor-specific payload received in NAN beacon or SDF frame.
- *
- * @param event: NanBeaconSdfPayloadInd containing event details.
- */
- oneway eventBeaconSdfPayload(NanBeaconSdfPayloadInd event);
};
diff --git a/wifi/1.0/IWifiStaIface.hal b/wifi/1.0/IWifiStaIface.hal
index 2c72ead..96dc54a 100644
--- a/wifi/1.0/IWifiStaIface.hal
+++ b/wifi/1.0/IWifiStaIface.hal
@@ -438,6 +438,19 @@
stopSendingKeepAlivePackets(CommandId cmdId) generates (WifiStatus status);
/**
+ * Set the MAC OUI during scanning.
+ * An OUI {Organizationally Unique Identifier} is a 24-bit number that
+ * uniquely identifies a vendor or manufacturer.
+ *
+ * @return status WifiStatus of the operation.
+ * Possible status codes:
+ * |WifiStatusCode.SUCCESS|,
+ * |WifiStatusCode.ERROR_WIFI_IFACE_INVALID|,
+ * |WifiStatusCode.ERROR_UNKNOWN|
+ */
+ setScanningMacOui(uint8_t[3] oui) generates (WifiStatus status);
+
+ /**
* API to start packet fate monitoring.
* - Once started, monitoring must remain active until HAL is stopped or the
* chip is reconfigured.
diff --git a/wifi/1.0/default/Android.mk b/wifi/1.0/default/Android.mk
index 144c067..2d2d898 100644
--- a/wifi/1.0/default/Android.mk
+++ b/wifi/1.0/default/Android.mk
@@ -16,9 +16,11 @@
include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.wifi@1.0-service
LOCAL_MODULE_RELATIVE_PATH := hw
+LOCAL_PROPRIETARY_MODULE := true
LOCAL_CPPFLAGS := -Wall -Werror -Wextra
LOCAL_SRC_FILES := \
hidl_struct_util.cpp \
+ hidl_sync_util.cpp \
service.cpp \
wifi.cpp \
wifi_ap_iface.cpp \
diff --git a/wifi/1.0/default/THREADING.README b/wifi/1.0/default/THREADING.README
new file mode 100644
index 0000000..8366ca0
--- /dev/null
+++ b/wifi/1.0/default/THREADING.README
@@ -0,0 +1,35 @@
+Vendor HAL Threading Model
+==========================
+The vendor HAL service has two threads:
+1. HIDL thread: This is the main thread which processes all the incoming HIDL
+RPC's.
+2. Legacy HAL event loop thread: This is the thread forked off for processing
+the legacy HAL event loop (wifi_event_loop()). This thread is used to process
+any asynchronous netlink events posted by the driver. Any asynchronous
+callbacks passed to the legacy HAL API's are invoked on this thread.
+
+Synchronization Concerns
+========================
+wifi_legacy_hal.cpp has a bunch of global "C" style functions to handle the
+legacy callbacks. Each of these "C" style function invokes a corresponding
+"std::function" version of the callback which does the actual processing.
+The variables holding these "std::function" callbacks are reset from the HIDL
+thread when they are no longer used. For example: stopGscan() will reset the
+corresponding "on_gscan_*" callback variables which were set when startGscan()
+was invoked. This is not thread safe since these callback variables are
+accesed from the legacy hal event loop thread as well.
+
+Synchronization Solution
+========================
+Adding a global lock seems to be the most trivial solution to the problem.
+a) All of the asynchronous "C" style callbacks will acquire the global lock
+before invoking the corresponding "std::function" callback variables.
+b) All of the HIDL methods will also acquire the global lock before processing
+(in hidl_return_util::validateAndCall()).
+
+Note: It's important that we only acquire the global lock for asynchronous
+callbacks, because there is no guarantee (or documentation to clarify) that the
+synchronous callbacks are invoked on the same invocation thread. If that is not
+the case in some implementation, we will end up deadlocking the system since the
+HIDL thread would have acquired the global lock which is needed by the
+synchronous callback executed on the legacy hal event loop thread.
diff --git a/wifi/1.0/default/android.hardware.wifi@1.0-service.rc b/wifi/1.0/default/android.hardware.wifi@1.0-service.rc
index 9d09347..c0ae4d4 100644
--- a/wifi/1.0/default/android.hardware.wifi@1.0-service.rc
+++ b/wifi/1.0/default/android.hardware.wifi@1.0-service.rc
@@ -1,4 +1,4 @@
-service wifi_hal_legacy /system/bin/hw/android.hardware.wifi@1.0-service
+service wifi_hal_legacy /vendor/bin/hw/android.hardware.wifi@1.0-service
class hal
user wifi
group wifi
diff --git a/wifi/1.0/default/hidl_return_util.h b/wifi/1.0/default/hidl_return_util.h
index 2986165..3f6364b 100644
--- a/wifi/1.0/default/hidl_return_util.h
+++ b/wifi/1.0/default/hidl_return_util.h
@@ -17,6 +17,7 @@
#ifndef HIDL_RETURN_UTIL_H_
#define HIDL_RETURN_UTIL_H_
+#include "hidl_sync_util.h"
#include "wifi_status_util.h"
namespace android {
@@ -44,6 +45,7 @@
WorkFuncT&& work,
const std::function<void(const WifiStatus&)>& hidl_cb,
Args&&... args) {
+ const auto lock = hidl_sync_util::acquireGlobalLock();
if (obj->isValid()) {
hidl_cb((obj->*work)(std::forward<Args>(args)...));
} else {
@@ -61,6 +63,7 @@
WorkFuncT&& work,
const std::function<void(const WifiStatus&, ReturnT)>& hidl_cb,
Args&&... args) {
+ const auto lock = hidl_sync_util::acquireGlobalLock();
if (obj->isValid()) {
const auto& ret_pair = (obj->*work)(std::forward<Args>(args)...);
const WifiStatus& status = std::get<0>(ret_pair);
@@ -86,6 +89,7 @@
WorkFuncT&& work,
const std::function<void(const WifiStatus&, ReturnT1, ReturnT2)>& hidl_cb,
Args&&... args) {
+ const auto lock = hidl_sync_util::acquireGlobalLock();
if (obj->isValid()) {
const auto& ret_tuple = (obj->*work)(std::forward<Args>(args)...);
const WifiStatus& status = std::get<0>(ret_tuple);
diff --git a/wifi/1.0/default/hidl_struct_util.cpp b/wifi/1.0/default/hidl_struct_util.cpp
index 7464b81..e57919d 100644
--- a/wifi/1.0/default/hidl_struct_util.cpp
+++ b/wifi/1.0/default/hidl_struct_util.cpp
@@ -780,12 +780,14 @@
legacy_request->discovery_indication_cfg |=
hidl_request.configParams.disableJoinedClusterIndication ? 0x4 : 0x0;
legacy_request->config_sid_beacon = 1;
- if (hidl_request.configParams.numberOfServiceIdsInBeacon > 127) {
- LOG(ERROR) << "convertHidlNanEnableRequestToLegacy: numberOfServiceIdsInBeacon > 127";
+ if (hidl_request.configParams.numberOfPublishServiceIdsInBeacon > 127) {
+ LOG(ERROR) << "convertHidlNanEnableRequestToLegacy: numberOfPublishServiceIdsInBeacon > 127";
return false;
}
- legacy_request->sid_beacon_val = (hidl_request.configParams.includeServiceIdsInBeacon ? 0x1 : 0x0)
- | (hidl_request.configParams.numberOfServiceIdsInBeacon << 1);
+ legacy_request->sid_beacon_val =
+ (hidl_request.configParams.includePublishServiceIdsInBeacon ? 0x1 : 0x0)
+ | (hidl_request.configParams.numberOfPublishServiceIdsInBeacon << 1);
+ // TODO: b/35195516 connect SubscribeServiceIds to legacy HAL once implemented
legacy_request->config_rssi_window_size = 1;
legacy_request->rssi_window_size_val = hidl_request.configParams.rssiWindowSize;
legacy_request->config_disc_mac_addr_randomization = 1;
@@ -809,7 +811,7 @@
legacy_request->config_2dot4g_rssi_proximity = 1;
legacy_request->rssi_proximity_2dot4g_val =
hidl_request.configParams.bandSpecificConfig[
- (size_t) NanBandIndex::NAN_BAND_24GHZ].rssiProximity;
+ (size_t) NanBandIndex::NAN_BAND_24GHZ].rssiCloseProximity;
legacy_request->config_scan_params = 1;
legacy_request->scan_params_val.dwell_time[legacy_hal::NAN_CHANNEL_24G_BAND] =
hidl_request.configParams.bandSpecificConfig[
@@ -832,7 +834,7 @@
legacy_request->config_5g_rssi_close_proximity = 1;
legacy_request->rssi_close_proximity_5g_val =
hidl_request.configParams.bandSpecificConfig[
- (size_t) NanBandIndex::NAN_BAND_5GHZ].rssiProximity;
+ (size_t) NanBandIndex::NAN_BAND_5GHZ].rssiCloseProximity;
legacy_request->scan_params_val.dwell_time[legacy_hal::NAN_CHANNEL_5G_BAND_LOW] =
hidl_request.configParams.bandSpecificConfig[
(size_t) NanBandIndex::NAN_BAND_5GHZ].dwellTimeMs;
@@ -850,8 +852,8 @@
legacy_request->config_dw.dw_5g_interval_val = hidl_request.configParams
.bandSpecificConfig[(size_t) NanBandIndex::NAN_BAND_5GHZ].discoveryWindowIntervalVal;
if (hidl_request.debugConfigs.validClusterIdVals) {
- legacy_request->cluster_low = hidl_request.debugConfigs.clusterIdLowVal;
- legacy_request->cluster_high = hidl_request.debugConfigs.clusterIdHighVal;
+ legacy_request->cluster_low = hidl_request.debugConfigs.clusterIdBottomRangeVal;
+ legacy_request->cluster_high = hidl_request.debugConfigs.clusterIdTopRangeVal;
} else { // need 'else' since not configurable in legacy HAL
legacy_request->cluster_low = 0x0000;
legacy_request->cluster_high = 0xFFFF;
@@ -916,6 +918,7 @@
memcpy(legacy_request->service_specific_info,
hidl_request.baseConfigs.serviceSpecificInfo.data(),
legacy_request->service_specific_info_len);
+ // TODO: b/35193423 add support for extended service specific info
legacy_request->rx_match_filter_len = hidl_request.baseConfigs.rxMatchFilter.size();
if (legacy_request->rx_match_filter_len > NAN_MAX_MATCH_FILTER_LEN) {
LOG(ERROR) << "convertHidlNanPublishRequestToLegacy: rx_match_filter_len too large";
@@ -994,6 +997,7 @@
memcpy(legacy_request->service_specific_info,
hidl_request.baseConfigs.serviceSpecificInfo.data(),
legacy_request->service_specific_info_len);
+ // TODO: b/35193423 add support for extended service specific info
legacy_request->rx_match_filter_len = hidl_request.baseConfigs.rxMatchFilter.size();
if (legacy_request->rx_match_filter_len > NAN_MAX_MATCH_FILTER_LEN) {
LOG(ERROR) << "convertHidlNanSubscribeRequestToLegacy: rx_match_filter_len too large";
@@ -1072,14 +1076,15 @@
legacy_hal::NAN_TX_PRIORITY_HIGH : legacy_hal::NAN_TX_PRIORITY_NORMAL;
legacy_request->dw_or_faw = hidl_request.shouldUseDiscoveryWindow ?
legacy_hal::NAN_TRANSMIT_IN_DW : legacy_hal::NAN_TRANSMIT_IN_FAW;
- legacy_request->service_specific_info_len = hidl_request.message.size();
+ legacy_request->service_specific_info_len = hidl_request.serviceSpecificInfo.size();
if (legacy_request->service_specific_info_len > NAN_MAX_SERVICE_SPECIFIC_INFO_LEN) {
LOG(ERROR) << "convertHidlNanTransmitFollowupRequestToLegacy: service_specific_info_len too large";
return false;
}
memcpy(legacy_request->service_specific_info,
- hidl_request.message.data(),
+ hidl_request.serviceSpecificInfo.data(),
legacy_request->service_specific_info_len);
+ // TODO: b/35193423 add support for extended service specific info
legacy_request->recv_indication_cfg = hidl_request.disableFollowupResultIndication ? 0x1 : 0x0;
return true;
@@ -1104,12 +1109,13 @@
legacy_request->discovery_indication_cfg |=
hidl_request.disableJoinedClusterIndication ? 0x4 : 0x0;
legacy_request->config_sid_beacon = 1;
- if (hidl_request.numberOfServiceIdsInBeacon > 127) {
- LOG(ERROR) << "convertHidlNanConfigRequestToLegacy: numberOfServiceIdsInBeacon > 127";
+ if (hidl_request.numberOfPublishServiceIdsInBeacon > 127) {
+ LOG(ERROR) << "convertHidlNanConfigRequestToLegacy: numberOfPublishServiceIdsInBeacon > 127";
return false;
}
- legacy_request->sid_beacon = (hidl_request.includeServiceIdsInBeacon ? 0x1 : 0x0)
- | (hidl_request.numberOfServiceIdsInBeacon << 1);
+ legacy_request->sid_beacon = (hidl_request.includePublishServiceIdsInBeacon ? 0x1 : 0x0)
+ | (hidl_request.numberOfPublishServiceIdsInBeacon << 1);
+ // TODO: b/35195516 connect SubscribeServiceIds to legacy HAL once implemented
legacy_request->config_rssi_window_size = 1;
legacy_request->rssi_window_size_val = hidl_request.rssiWindowSize;
legacy_request->config_disc_mac_addr_randomization = 1;
@@ -1130,7 +1136,7 @@
legacy_request->config_2dot4g_rssi_proximity = 1;
legacy_request->rssi_proximity_2dot4g_val =
hidl_request.bandSpecificConfig[
- (size_t) NanBandIndex::NAN_BAND_24GHZ].rssiProximity;
+ (size_t) NanBandIndex::NAN_BAND_24GHZ].rssiCloseProximity;
*/
legacy_request->config_scan_params = 1;
legacy_request->scan_params_val.dwell_time[legacy_hal::NAN_CHANNEL_24G_BAND] =
@@ -1156,7 +1162,7 @@
legacy_request->config_5g_rssi_close_proximity = 1;
legacy_request->rssi_close_proximity_5g_val =
hidl_request.bandSpecificConfig[
- (size_t) NanBandIndex::NAN_BAND_5GHZ].rssiProximity;
+ (size_t) NanBandIndex::NAN_BAND_5GHZ].rssiCloseProximity;
legacy_request->scan_params_val.dwell_time[legacy_hal::NAN_CHANNEL_5G_BAND_LOW] =
hidl_request.bandSpecificConfig[
(size_t) NanBandIndex::NAN_BAND_5GHZ].dwellTimeMs;
@@ -1177,30 +1183,6 @@
return true;
}
-bool convertHidlNanBeaconSdfPayloadRequestToLegacy(
- const NanBeaconSdfPayloadRequest& hidl_request,
- legacy_hal::NanBeaconSdfPayloadRequest* legacy_request) {
- if (!legacy_request) {
- LOG(ERROR) << "convertHidlNanBeaconSdfPayloadRequestToLegacy: legacy_request is null";
- return false;
- }
- memset(legacy_request, 0, sizeof(legacy_hal::NanBeaconSdfPayloadRequest));
-
- legacy_request->vsa.payload_transmit_flag = hidl_request.transmitInNext16dws ? 1 : 0;
- legacy_request->vsa.tx_in_discovery_beacon = hidl_request.transmitInDiscoveryBeacon;
- legacy_request->vsa.tx_in_sync_beacon = hidl_request.transmitInSyncBeacon;
- legacy_request->vsa.tx_in_service_discovery = hidl_request.transmitInServiceDiscoveryFrame;
- legacy_request->vsa.vendor_oui = hidl_request.vendorOui;
- legacy_request->vsa.vsa_len = hidl_request.vsa.size();
- if (legacy_request->vsa.vsa_len > NAN_MAX_VSA_DATA_LEN) {
- LOG(ERROR) << "convertHidlNanBeaconSdfPayloadRequestToLegacy: vsa_len too long";
- return false;
- }
- memcpy(legacy_request->vsa.vsa, hidl_request.vsa.data(), legacy_request->vsa.vsa_len);
-
- return true;
-}
-
bool convertHidlNanDataPathInitiatorRequestToLegacy(
const NanInitiateDataPathRequest& hidl_request,
legacy_hal::NanDataPathInitiatorRequest* legacy_request) {
@@ -1295,7 +1277,8 @@
hidl_response->maxMatchFilterLen = legacy_response.max_match_filter_len;
hidl_response->maxTotalMatchFilterLen = legacy_response.max_total_match_filter_len;
hidl_response->maxServiceSpecificInfoLen = legacy_response.max_service_specific_info_len;
- hidl_response->maxVsaDataLen = legacy_response.max_vsa_data_len;
+ // TODO: b/35193423 add support for extended service specific info
+ hidl_response->maxExtendedServiceSpecificInfoLen = 0;
hidl_response->maxNdiInterfaces = legacy_response.max_ndi_interfaces;
hidl_response->maxNdpSessions = legacy_response.max_ndp_sessions;
hidl_response->maxAppInfoLen = legacy_response.max_app_info_len;
@@ -1319,6 +1302,7 @@
hidl_ind->addr = hidl_array<uint8_t, 6>(legacy_ind.addr);
hidl_ind->serviceSpecificInfo = std::vector<uint8_t>(legacy_ind.service_specific_info,
legacy_ind.service_specific_info + legacy_ind.service_specific_info_len);
+ // TODO: b/35193423 add support for extended service specific info
hidl_ind->matchFilter = std::vector<uint8_t>(legacy_ind.sdf_match_filter,
legacy_ind.sdf_match_filter + legacy_ind.sdf_match_filter_len);
hidl_ind->matchOccuredInBeaconFlag = legacy_ind.match_occured_flag == 1;
@@ -1346,32 +1330,12 @@
hidl_ind->peerId = legacy_ind.requestor_instance_id;
hidl_ind->addr = hidl_array<uint8_t, 6>(legacy_ind.addr);
hidl_ind->receivedInFaw = legacy_ind.dw_or_faw == 1;
- hidl_ind->message = std::vector<uint8_t>(legacy_ind.service_specific_info,
+ hidl_ind->serviceSpecificInfo = std::vector<uint8_t>(legacy_ind.service_specific_info,
legacy_ind.service_specific_info + legacy_ind.service_specific_info_len);
return true;
}
-bool convertLegacyNanBeaconSdfPayloadIndToHidl(
- const legacy_hal::NanBeaconSdfPayloadInd& legacy_ind,
- NanBeaconSdfPayloadInd* hidl_ind) {
- if (!hidl_ind) {
- LOG(ERROR) << "convertLegacyNanBeaconSdfPayloadIndToHidl: hidl_ind is null";
- return false;
- }
- hidl_ind->addr = hidl_array<uint8_t, 6>(legacy_ind.addr);
- hidl_ind->isVsaReceived = legacy_ind.is_vsa_received == 1;
- hidl_ind->vsaReceivedOnFrames = legacy_ind.vsa.vsa_received_on;
- hidl_ind->vsaVendorOui = legacy_ind.vsa.vendor_oui;
- hidl_ind->vsa = std::vector<uint8_t>(legacy_ind.vsa.vsa,
- legacy_ind.vsa.vsa + legacy_ind.vsa.attr_len);
- hidl_ind->isBeaconSdfPayloadReceived = legacy_ind.is_beacon_sdf_payload_received == 1;
- hidl_ind->beaconSdfPayloadData = std::vector<uint8_t>(legacy_ind.data.frame_data,
- legacy_ind.data.frame_data + legacy_ind.data.frame_len);
-
- return true;
-}
-
bool convertLegacyNanDataPathRequestIndToHidl(
const legacy_hal::NanDataPathRequestInd& legacy_ind,
NanDataPathRequestInd* hidl_ind) {
diff --git a/wifi/1.0/default/hidl_struct_util.h b/wifi/1.0/default/hidl_struct_util.h
index 14bc77d..490dcae 100644
--- a/wifi/1.0/default/hidl_struct_util.h
+++ b/wifi/1.0/default/hidl_struct_util.h
@@ -110,9 +110,6 @@
bool convertHidlNanTransmitFollowupRequestToLegacy(
const NanTransmitFollowupRequest& hidl_request,
legacy_hal::NanTransmitFollowupRequest* legacy_request);
-bool convertHidlNanBeaconSdfPayloadRequestToLegacy(
- const NanBeaconSdfPayloadRequest& hidl_request,
- legacy_hal::NanBeaconSdfPayloadRequest* legacy_request);
bool convertHidlNanDataPathInitiatorRequestToLegacy(
const NanInitiateDataPathRequest& hidl_request,
legacy_hal::NanDataPathInitiatorRequest* legacy_request);
@@ -135,9 +132,6 @@
bool convertLegacyNanDataPathConfirmIndToHidl(
const legacy_hal::NanDataPathConfirmInd& legacy_ind,
NanDataPathConfirmInd* hidl_ind);
-bool convertLegacyNanBeaconSdfPayloadIndToHidl(
- const legacy_hal::NanBeaconSdfPayloadInd& legacy_ind,
- NanBeaconSdfPayloadInd* hidl_ind);
// RTT controller conversion methods.
bool convertHidlVectorOfRttConfigToLegacy(
diff --git a/wifi/1.0/default/hidl_sync_util.cpp b/wifi/1.0/default/hidl_sync_util.cpp
new file mode 100644
index 0000000..7d47f2f
--- /dev/null
+++ b/wifi/1.0/default/hidl_sync_util.cpp
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2016 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.
+ */
+
+#include "hidl_sync_util.h"
+
+namespace {
+std::recursive_mutex g_mutex;
+} // namespace
+
+namespace android {
+namespace hardware {
+namespace wifi {
+namespace V1_0 {
+namespace implementation {
+namespace hidl_sync_util {
+
+std::unique_lock<std::recursive_mutex> acquireGlobalLock() {
+ return std::unique_lock<std::recursive_mutex>{g_mutex};
+}
+
+} // namespace hidl_sync_util
+} // namespace implementation
+} // namespace V1_0
+} // namespace wifi
+} // namespace hardware
+} // namespace android
diff --git a/wifi/1.0/default/hidl_sync_util.h b/wifi/1.0/default/hidl_sync_util.h
new file mode 100644
index 0000000..6631e55
--- /dev/null
+++ b/wifi/1.0/default/hidl_sync_util.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2016 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.
+ */
+
+#ifndef HIDL_SYNC_UTIL_H_
+#define HIDL_SYNC_UTIL_H_
+
+#include <mutex>
+
+// Utility that provides a global lock to synchronize access between
+// the HIDL thread and the legacy HAL's event loop.
+namespace android {
+namespace hardware {
+namespace wifi {
+namespace V1_0 {
+namespace implementation {
+namespace hidl_sync_util {
+std::unique_lock<std::recursive_mutex> acquireGlobalLock();
+} // namespace hidl_sync_util
+} // namespace implementation
+} // namespace V1_0
+} // namespace wifi
+} // namespace hardware
+} // namespace android
+#endif // HIDL_SYNC_UTIL_H_
diff --git a/wifi/1.0/default/service.cpp b/wifi/1.0/default/service.cpp
index 96d5c6f..059304e 100644
--- a/wifi/1.0/default/service.cpp
+++ b/wifi/1.0/default/service.cpp
@@ -27,7 +27,7 @@
int main(int /*argc*/, char** argv) {
android::base::InitLogging(argv,
android::base::LogdLogger(android::base::SYSTEM));
- LOG(INFO) << "wifi_hal_legacy is starting up...";
+ LOG(INFO) << "Wifi Hal is starting up...";
configureRpcThreadpool(1, true /* callerWillJoin */);
@@ -39,6 +39,6 @@
joinRpcThreadpool();
- LOG(INFO) << "wifi_hal_legacy is terminating...";
+ LOG(INFO) << "Wifi Hal is terminating...";
return 0;
}
diff --git a/wifi/1.0/default/wifi_chip.cpp b/wifi/1.0/default/wifi_chip.cpp
index e15178d..0e2d54e 100644
--- a/wifi/1.0/default/wifi_chip.cpp
+++ b/wifi/1.0/default/wifi_chip.cpp
@@ -415,12 +415,16 @@
WifiStatus status = handleChipConfiguration(mode_id);
if (status.code != WifiStatusCode::SUCCESS) {
for (const auto& callback : event_callbacks_) {
- callback->onChipReconfigureFailure(status);
+ if (!callback->onChipReconfigureFailure(status).isOk()) {
+ LOG(ERROR) << "Failed to invoke onChipReconfigureFailure callback";
+ }
}
return status;
}
for (const auto& callback : event_callbacks_) {
- callback->onChipReconfigured(mode_id);
+ if (!callback->onChipReconfigured(mode_id).isOk()) {
+ LOG(ERROR) << "Failed to invoke onChipReconfigured callback";
+ }
}
current_mode_id_ = mode_id;
return status;
@@ -500,7 +504,9 @@
std::string ifname = legacy_hal_.lock()->getApIfaceName();
ap_iface_ = new WifiApIface(ifname, legacy_hal_);
for (const auto& callback : event_callbacks_) {
- callback->onIfaceAdded(IfaceType::AP, ifname);
+ if (!callback->onIfaceAdded(IfaceType::AP, ifname).isOk()) {
+ LOG(ERROR) << "Failed to invoke onIfaceAdded callback";
+ }
}
return {createWifiStatus(WifiStatusCode::SUCCESS), ap_iface_};
}
@@ -528,7 +534,9 @@
}
invalidateAndClear(ap_iface_);
for (const auto& callback : event_callbacks_) {
- callback->onIfaceRemoved(IfaceType::AP, ifname);
+ if (!callback->onIfaceRemoved(IfaceType::AP, ifname).isOk()) {
+ LOG(ERROR) << "Failed to invoke onIfaceRemoved callback";
+ }
}
return createWifiStatus(WifiStatusCode::SUCCESS);
}
@@ -542,7 +550,9 @@
std::string ifname = legacy_hal_.lock()->getNanIfaceName();
nan_iface_ = new WifiNanIface(ifname, legacy_hal_);
for (const auto& callback : event_callbacks_) {
- callback->onIfaceAdded(IfaceType::NAN, ifname);
+ if (!callback->onIfaceAdded(IfaceType::NAN, ifname).isOk()) {
+ LOG(ERROR) << "Failed to invoke onIfaceAdded callback";
+ }
}
return {createWifiStatus(WifiStatusCode::SUCCESS), nan_iface_};
}
@@ -570,7 +580,9 @@
}
invalidateAndClear(nan_iface_);
for (const auto& callback : event_callbacks_) {
- callback->onIfaceRemoved(IfaceType::NAN, ifname);
+ if (!callback->onIfaceRemoved(IfaceType::NAN, ifname).isOk()) {
+ LOG(ERROR) << "Failed to invoke onIfaceAdded callback";
+ }
}
return createWifiStatus(WifiStatusCode::SUCCESS);
}
@@ -584,7 +596,9 @@
std::string ifname = legacy_hal_.lock()->getP2pIfaceName();
p2p_iface_ = new WifiP2pIface(ifname, legacy_hal_);
for (const auto& callback : event_callbacks_) {
- callback->onIfaceAdded(IfaceType::P2P, ifname);
+ if (!callback->onIfaceAdded(IfaceType::P2P, ifname).isOk()) {
+ LOG(ERROR) << "Failed to invoke onIfaceAdded callback";
+ }
}
return {createWifiStatus(WifiStatusCode::SUCCESS), p2p_iface_};
}
@@ -612,7 +626,9 @@
}
invalidateAndClear(p2p_iface_);
for (const auto& callback : event_callbacks_) {
- callback->onIfaceRemoved(IfaceType::P2P, ifname);
+ if (!callback->onIfaceRemoved(IfaceType::P2P, ifname).isOk()) {
+ LOG(ERROR) << "Failed to invoke onIfaceRemoved callback";
+ }
}
return createWifiStatus(WifiStatusCode::SUCCESS);
}
@@ -624,7 +640,9 @@
std::string ifname = legacy_hal_.lock()->getStaIfaceName();
sta_iface_ = new WifiStaIface(ifname, legacy_hal_);
for (const auto& callback : event_callbacks_) {
- callback->onIfaceAdded(IfaceType::STA, ifname);
+ if (!callback->onIfaceAdded(IfaceType::STA, ifname).isOk()) {
+ LOG(ERROR) << "Failed to invoke onIfaceAdded callback";
+ }
}
return {createWifiStatus(WifiStatusCode::SUCCESS), sta_iface_};
}
@@ -652,7 +670,9 @@
}
invalidateAndClear(sta_iface_);
for (const auto& callback : event_callbacks_) {
- callback->onIfaceRemoved(IfaceType::STA, ifname);
+ if (!callback->onIfaceRemoved(IfaceType::STA, ifname).isOk()) {
+ LOG(ERROR) << "Failed to invoke onIfaceRemoved callback";
+ }
}
return createWifiStatus(WifiStatusCode::SUCCESS);
}
@@ -743,7 +763,9 @@
return;
}
for (const auto& callback : shared_ptr_this->getEventCallbacks()) {
- callback->onDebugErrorAlert(error_code, debug_data);
+ if (!callback->onDebugErrorAlert(error_code, debug_data).isOk()) {
+ LOG(ERROR) << "Failed to invoke onDebugErrorAlert callback";
+ }
}
};
legacy_status = legacy_hal_.lock()->registerErrorAlertCallbackHandler(
@@ -806,7 +828,10 @@
return;
}
for (const auto& callback : shared_ptr_this->getEventCallbacks()) {
- callback->onDebugRingBufferDataAvailable(hidl_status, data);
+ if (!callback->onDebugRingBufferDataAvailable(hidl_status, data).isOk()) {
+ LOG(ERROR) << "Failed to invoke onDebugRingBufferDataAvailable"
+ << " callback";
+ }
}
};
legacy_hal::wifi_error legacy_status =
diff --git a/wifi/1.0/default/wifi_legacy_hal.cpp b/wifi/1.0/default/wifi_legacy_hal.cpp
index e4eddcd..cd89acc 100644
--- a/wifi/1.0/default/wifi_legacy_hal.cpp
+++ b/wifi/1.0/default/wifi_legacy_hal.cpp
@@ -19,6 +19,7 @@
#include <android-base/logging.h>
#include <cutils/properties.h>
+#include "hidl_sync_util.h"
#include "wifi_legacy_hal.h"
#include "wifi_legacy_hal_stubs.h"
@@ -54,7 +55,8 @@
// std::function methods to be invoked.
// Callback to be invoked once |stop| is complete.
std::function<void(wifi_handle handle)> on_stop_complete_internal_callback;
-void onStopComplete(wifi_handle handle) {
+void onAsyncStopComplete(wifi_handle handle) {
+ const auto lock = hidl_sync_util::acquireGlobalLock();
if (on_stop_complete_internal_callback) {
on_stop_complete_internal_callback(handle);
}
@@ -62,7 +64,7 @@
// Callback to be invoked for driver dump.
std::function<void(char*, int)> on_driver_memory_dump_internal_callback;
-void onDriverMemoryDump(char* buffer, int buffer_size) {
+void onSyncDriverMemoryDump(char* buffer, int buffer_size) {
if (on_driver_memory_dump_internal_callback) {
on_driver_memory_dump_internal_callback(buffer, buffer_size);
}
@@ -70,7 +72,7 @@
// Callback to be invoked for firmware dump.
std::function<void(char*, int)> on_firmware_memory_dump_internal_callback;
-void onFirmwareMemoryDump(char* buffer, int buffer_size) {
+void onSyncFirmwareMemoryDump(char* buffer, int buffer_size) {
if (on_firmware_memory_dump_internal_callback) {
on_firmware_memory_dump_internal_callback(buffer, buffer_size);
}
@@ -79,7 +81,8 @@
// Callback to be invoked for Gscan events.
std::function<void(wifi_request_id, wifi_scan_event)>
on_gscan_event_internal_callback;
-void onGscanEvent(wifi_request_id id, wifi_scan_event event) {
+void onAsyncGscanEvent(wifi_request_id id, wifi_scan_event event) {
+ const auto lock = hidl_sync_util::acquireGlobalLock();
if (on_gscan_event_internal_callback) {
on_gscan_event_internal_callback(id, event);
}
@@ -88,9 +91,10 @@
// Callback to be invoked for Gscan full results.
std::function<void(wifi_request_id, wifi_scan_result*, uint32_t)>
on_gscan_full_result_internal_callback;
-void onGscanFullResult(wifi_request_id id,
- wifi_scan_result* result,
- uint32_t buckets_scanned) {
+void onAsyncGscanFullResult(wifi_request_id id,
+ wifi_scan_result* result,
+ uint32_t buckets_scanned) {
+ const auto lock = hidl_sync_util::acquireGlobalLock();
if (on_gscan_full_result_internal_callback) {
on_gscan_full_result_internal_callback(id, result, buckets_scanned);
}
@@ -99,10 +103,10 @@
// Callback to be invoked for link layer stats results.
std::function<void((wifi_request_id, wifi_iface_stat*, int, wifi_radio_stat*))>
on_link_layer_stats_result_internal_callback;
-void onLinkLayerStatsResult(wifi_request_id id,
- wifi_iface_stat* iface_stat,
- int num_radios,
- wifi_radio_stat* radio_stat) {
+void onSyncLinkLayerStatsResult(wifi_request_id id,
+ wifi_iface_stat* iface_stat,
+ int num_radios,
+ wifi_radio_stat* radio_stat) {
if (on_link_layer_stats_result_internal_callback) {
on_link_layer_stats_result_internal_callback(
id, iface_stat, num_radios, radio_stat);
@@ -112,7 +116,10 @@
// Callback to be invoked for rssi threshold breach.
std::function<void((wifi_request_id, uint8_t*, int8_t))>
on_rssi_threshold_breached_internal_callback;
-void onRssiThresholdBreached(wifi_request_id id, uint8_t* bssid, int8_t rssi) {
+void onAsyncRssiThresholdBreached(wifi_request_id id,
+ uint8_t* bssid,
+ int8_t rssi) {
+ const auto lock = hidl_sync_util::acquireGlobalLock();
if (on_rssi_threshold_breached_internal_callback) {
on_rssi_threshold_breached_internal_callback(id, bssid, rssi);
}
@@ -121,10 +128,11 @@
// Callback to be invoked for ring buffer data indication.
std::function<void(char*, char*, int, wifi_ring_buffer_status*)>
on_ring_buffer_data_internal_callback;
-void onRingBufferData(char* ring_name,
- char* buffer,
- int buffer_size,
- wifi_ring_buffer_status* status) {
+void onAsyncRingBufferData(char* ring_name,
+ char* buffer,
+ int buffer_size,
+ wifi_ring_buffer_status* status) {
+ const auto lock = hidl_sync_util::acquireGlobalLock();
if (on_ring_buffer_data_internal_callback) {
on_ring_buffer_data_internal_callback(
ring_name, buffer, buffer_size, status);
@@ -134,10 +142,11 @@
// Callback to be invoked for error alert indication.
std::function<void(wifi_request_id, char*, int, int)>
on_error_alert_internal_callback;
-void onErrorAlert(wifi_request_id id,
- char* buffer,
- int buffer_size,
- int err_code) {
+void onAsyncErrorAlert(wifi_request_id id,
+ char* buffer,
+ int buffer_size,
+ int err_code) {
+ const auto lock = hidl_sync_util::acquireGlobalLock();
if (on_error_alert_internal_callback) {
on_error_alert_internal_callback(id, buffer, buffer_size, err_code);
}
@@ -147,9 +156,10 @@
std::function<void(
wifi_request_id, unsigned num_results, wifi_rtt_result* rtt_results[])>
on_rtt_results_internal_callback;
-void onRttResults(wifi_request_id id,
- unsigned num_results,
- wifi_rtt_result* rtt_results[]) {
+void onAsyncRttResults(wifi_request_id id,
+ unsigned num_results,
+ wifi_rtt_result* rtt_results[]) {
+ const auto lock = hidl_sync_util::acquireGlobalLock();
if (on_rtt_results_internal_callback) {
on_rtt_results_internal_callback(id, num_results, rtt_results);
}
@@ -161,7 +171,8 @@
// So, handle all of them here directly to avoid adding an unnecessary layer.
std::function<void(transaction_id, const NanResponseMsg&)>
on_nan_notify_response_user_callback;
-void onNanNotifyResponse(transaction_id id, NanResponseMsg* msg) {
+void onAysncNanNotifyResponse(transaction_id id, NanResponseMsg* msg) {
+ const auto lock = hidl_sync_util::acquireGlobalLock();
if (on_nan_notify_response_user_callback && msg) {
on_nan_notify_response_user_callback(id, *msg);
}
@@ -169,14 +180,16 @@
std::function<void(const NanPublishTerminatedInd&)>
on_nan_event_publish_terminated_user_callback;
-void onNanEventPublishTerminated(NanPublishTerminatedInd* event) {
+void onAysncNanEventPublishTerminated(NanPublishTerminatedInd* event) {
+ const auto lock = hidl_sync_util::acquireGlobalLock();
if (on_nan_event_publish_terminated_user_callback && event) {
on_nan_event_publish_terminated_user_callback(*event);
}
}
std::function<void(const NanMatchInd&)> on_nan_event_match_user_callback;
-void onNanEventMatch(NanMatchInd* event) {
+void onAysncNanEventMatch(NanMatchInd* event) {
+ const auto lock = hidl_sync_util::acquireGlobalLock();
if (on_nan_event_match_user_callback && event) {
on_nan_event_match_user_callback(*event);
}
@@ -184,7 +197,8 @@
std::function<void(const NanMatchExpiredInd&)>
on_nan_event_match_expired_user_callback;
-void onNanEventMatchExpired(NanMatchExpiredInd* event) {
+void onAysncNanEventMatchExpired(NanMatchExpiredInd* event) {
+ const auto lock = hidl_sync_util::acquireGlobalLock();
if (on_nan_event_match_expired_user_callback && event) {
on_nan_event_match_expired_user_callback(*event);
}
@@ -192,14 +206,16 @@
std::function<void(const NanSubscribeTerminatedInd&)>
on_nan_event_subscribe_terminated_user_callback;
-void onNanEventSubscribeTerminated(NanSubscribeTerminatedInd* event) {
+void onAysncNanEventSubscribeTerminated(NanSubscribeTerminatedInd* event) {
+ const auto lock = hidl_sync_util::acquireGlobalLock();
if (on_nan_event_subscribe_terminated_user_callback && event) {
on_nan_event_subscribe_terminated_user_callback(*event);
}
}
std::function<void(const NanFollowupInd&)> on_nan_event_followup_user_callback;
-void onNanEventFollowup(NanFollowupInd* event) {
+void onAysncNanEventFollowup(NanFollowupInd* event) {
+ const auto lock = hidl_sync_util::acquireGlobalLock();
if (on_nan_event_followup_user_callback && event) {
on_nan_event_followup_user_callback(*event);
}
@@ -207,21 +223,24 @@
std::function<void(const NanDiscEngEventInd&)>
on_nan_event_disc_eng_event_user_callback;
-void onNanEventDiscEngEvent(NanDiscEngEventInd* event) {
+void onAysncNanEventDiscEngEvent(NanDiscEngEventInd* event) {
+ const auto lock = hidl_sync_util::acquireGlobalLock();
if (on_nan_event_disc_eng_event_user_callback && event) {
on_nan_event_disc_eng_event_user_callback(*event);
}
}
std::function<void(const NanDisabledInd&)> on_nan_event_disabled_user_callback;
-void onNanEventDisabled(NanDisabledInd* event) {
+void onAysncNanEventDisabled(NanDisabledInd* event) {
+ const auto lock = hidl_sync_util::acquireGlobalLock();
if (on_nan_event_disabled_user_callback && event) {
on_nan_event_disabled_user_callback(*event);
}
}
std::function<void(const NanTCAInd&)> on_nan_event_tca_user_callback;
-void onNanEventTca(NanTCAInd* event) {
+void onAysncNanEventTca(NanTCAInd* event) {
+ const auto lock = hidl_sync_util::acquireGlobalLock();
if (on_nan_event_tca_user_callback && event) {
on_nan_event_tca_user_callback(*event);
}
@@ -229,7 +248,8 @@
std::function<void(const NanBeaconSdfPayloadInd&)>
on_nan_event_beacon_sdf_payload_user_callback;
-void onNanEventBeaconSdfPayload(NanBeaconSdfPayloadInd* event) {
+void onAysncNanEventBeaconSdfPayload(NanBeaconSdfPayloadInd* event) {
+ const auto lock = hidl_sync_util::acquireGlobalLock();
if (on_nan_event_beacon_sdf_payload_user_callback && event) {
on_nan_event_beacon_sdf_payload_user_callback(*event);
}
@@ -237,14 +257,16 @@
std::function<void(const NanDataPathRequestInd&)>
on_nan_event_data_path_request_user_callback;
-void onNanEventDataPathRequest(NanDataPathRequestInd* event) {
+void onAysncNanEventDataPathRequest(NanDataPathRequestInd* event) {
+ const auto lock = hidl_sync_util::acquireGlobalLock();
if (on_nan_event_data_path_request_user_callback && event) {
on_nan_event_data_path_request_user_callback(*event);
}
}
std::function<void(const NanDataPathConfirmInd&)>
on_nan_event_data_path_confirm_user_callback;
-void onNanEventDataPathConfirm(NanDataPathConfirmInd* event) {
+void onAysncNanEventDataPathConfirm(NanDataPathConfirmInd* event) {
+ const auto lock = hidl_sync_util::acquireGlobalLock();
if (on_nan_event_data_path_confirm_user_callback && event) {
on_nan_event_data_path_confirm_user_callback(*event);
}
@@ -252,7 +274,8 @@
std::function<void(const NanDataPathEndInd&)>
on_nan_event_data_path_end_user_callback;
-void onNanEventDataPathEnd(NanDataPathEndInd* event) {
+void onAysncNanEventDataPathEnd(NanDataPathEndInd* event) {
+ const auto lock = hidl_sync_util::acquireGlobalLock();
if (on_nan_event_data_path_end_user_callback && event) {
on_nan_event_data_path_end_user_callback(*event);
}
@@ -260,7 +283,8 @@
std::function<void(const NanTransmitFollowupInd&)>
on_nan_event_transmit_follow_up_user_callback;
-void onNanEventTransmitFollowUp(NanTransmitFollowupInd* event) {
+void onAysncNanEventTransmitFollowUp(NanTransmitFollowupInd* event) {
+ const auto lock = hidl_sync_util::acquireGlobalLock();
if (on_nan_event_transmit_follow_up_user_callback && event) {
on_nan_event_transmit_follow_up_user_callback(*event);
}
@@ -326,7 +350,8 @@
return WIFI_SUCCESS;
}
LOG(DEBUG) << "Stopping legacy HAL";
- on_stop_complete_internal_callback = [&](wifi_handle handle) {
+ on_stop_complete_internal_callback = [on_stop_complete_user_callback,
+ this](wifi_handle handle) {
CHECK_EQ(global_handle_, handle) << "Handle mismatch";
// Invalidate all the internal pointers now that the HAL is
// stopped.
@@ -335,7 +360,7 @@
on_stop_complete_user_callback();
};
awaiting_event_loop_termination_ = true;
- global_func_table_.wifi_cleanup(global_handle_, onStopComplete);
+ global_func_table_.wifi_cleanup(global_handle_, onAsyncStopComplete);
LOG(DEBUG) << "Legacy HAL stop complete";
is_started_ = false;
return WIFI_SUCCESS;
@@ -391,7 +416,7 @@
reinterpret_cast<uint8_t*>(buffer) + buffer_size);
};
wifi_error status = global_func_table_.wifi_get_driver_memory_dump(
- wlan_interface_handle_, {onDriverMemoryDump});
+ wlan_interface_handle_, {onSyncDriverMemoryDump});
on_driver_memory_dump_internal_callback = nullptr;
return {status, std::move(driver_dump)};
}
@@ -406,7 +431,7 @@
reinterpret_cast<uint8_t*>(buffer) + buffer_size);
};
wifi_error status = global_func_table_.wifi_get_firmware_memory_dump(
- wlan_interface_handle_, {onFirmwareMemoryDump});
+ wlan_interface_handle_, {onSyncFirmwareMemoryDump});
on_firmware_memory_dump_internal_callback = nullptr;
return {status, std::move(firmware_dump)};
}
@@ -488,7 +513,8 @@
}
};
- wifi_scan_result_handler handler = {onGscanFullResult, onGscanEvent};
+ wifi_scan_result_handler handler = {onAsyncGscanFullResult,
+ onAsyncGscanEvent};
wifi_error status = global_func_table_.wifi_start_gscan(
id, wlan_interface_handle_, params, handler);
if (status != WIFI_SUCCESS) {
@@ -584,7 +610,7 @@
};
wifi_error status = global_func_table_.wifi_get_link_stats(
- 0, wlan_interface_handle_, {onLinkLayerStatsResult});
+ 0, wlan_interface_handle_, {onSyncLinkLayerStatsResult});
on_link_layer_stats_result_internal_callback = nullptr;
return {status, link_stats};
}
@@ -609,12 +635,12 @@
std::copy(bssid_ptr, bssid_ptr + 6, std::begin(bssid_arr));
on_threshold_breached_user_callback(id, bssid_arr, rssi);
};
- wifi_error status =
- global_func_table_.wifi_start_rssi_monitoring(id,
- wlan_interface_handle_,
- max_rssi,
- min_rssi,
- {onRssiThresholdBreached});
+ wifi_error status = global_func_table_.wifi_start_rssi_monitoring(
+ id,
+ wlan_interface_handle_,
+ max_rssi,
+ min_rssi,
+ {onAsyncRssiThresholdBreached});
if (status != WIFI_SUCCESS) {
on_rssi_threshold_breached_internal_callback = nullptr;
}
@@ -685,6 +711,12 @@
cmd_id, wlan_interface_handle_);
}
+wifi_error WifiLegacyHal::setScanningMacOui(const std::array<uint8_t, 3>& oui) {
+ std::vector<uint8_t> oui_internal(oui.data(), oui.data() + oui.size());
+ return global_func_table_.wifi_set_scanning_mac_oui(wlan_interface_handle_,
+ oui_internal.data());
+}
+
std::pair<wifi_error, uint32_t> WifiLegacyHal::getLoggerSupportedFeatureSet() {
uint32_t supported_features;
wifi_error status = global_func_table_.wifi_get_logger_supported_feature_set(
@@ -783,7 +815,7 @@
}
};
wifi_error status = global_func_table_.wifi_set_log_handler(
- 0, wlan_interface_handle_, {onRingBufferData});
+ 0, wlan_interface_handle_, {onAsyncRingBufferData});
if (status != WIFI_SUCCESS) {
on_ring_buffer_data_internal_callback = nullptr;
}
@@ -844,7 +876,7 @@
}
};
wifi_error status = global_func_table_.wifi_set_alert_handler(
- 0, wlan_interface_handle_, {onErrorAlert});
+ 0, wlan_interface_handle_, {onAsyncErrorAlert});
if (status != WIFI_SUCCESS) {
on_error_alert_internal_callback = nullptr;
}
@@ -890,7 +922,7 @@
wlan_interface_handle_,
rtt_configs.size(),
rtt_configs_internal.data(),
- {onRttResults});
+ {onAsyncRttResults});
if (status != WIFI_SUCCESS) {
on_rtt_results_internal_callback = nullptr;
}
@@ -994,20 +1026,20 @@
return global_func_table_.wifi_nan_register_handler(
wlan_interface_handle_,
- {onNanNotifyResponse,
- onNanEventPublishTerminated,
- onNanEventMatch,
- onNanEventMatchExpired,
- onNanEventSubscribeTerminated,
- onNanEventFollowup,
- onNanEventDiscEngEvent,
- onNanEventDisabled,
- onNanEventTca,
- onNanEventBeaconSdfPayload,
- onNanEventDataPathRequest,
- onNanEventDataPathConfirm,
- onNanEventDataPathEnd,
- onNanEventTransmitFollowUp});
+ {onAysncNanNotifyResponse,
+ onAysncNanEventPublishTerminated,
+ onAysncNanEventMatch,
+ onAysncNanEventMatchExpired,
+ onAysncNanEventSubscribeTerminated,
+ onAysncNanEventFollowup,
+ onAysncNanEventDiscEngEvent,
+ onAysncNanEventDisabled,
+ onAysncNanEventTca,
+ onAysncNanEventBeaconSdfPayload,
+ onAysncNanEventDataPathRequest,
+ onAysncNanEventDataPathConfirm,
+ onAysncNanEventDataPathEnd,
+ onAysncNanEventTransmitFollowUp});
}
wifi_error WifiLegacyHal::nanEnableRequest(transaction_id id,
diff --git a/wifi/1.0/default/wifi_legacy_hal.h b/wifi/1.0/default/wifi_legacy_hal.h
index 1ab74b7..e65b79b 100644
--- a/wifi/1.0/default/wifi_legacy_hal.h
+++ b/wifi/1.0/default/wifi_legacy_hal.h
@@ -124,6 +124,9 @@
/**
* Class that encapsulates all legacy HAL interactions.
* This class manages the lifetime of the event loop thread used by legacy HAL.
+ *
+ * Note: aThere will only be a single instance of this class created in the Wifi
+ * object and will be valid for the lifetime of the process.
*/
class WifiLegacyHal {
public:
@@ -192,6 +195,7 @@
const std::array<uint8_t, 6>& dst_address,
uint32_t period_in_ms);
wifi_error stopSendingOffloadedPacket(uint32_t cmd_id);
+ wifi_error setScanningMacOui(const std::array<uint8_t, 3>& oui);
// Logger/debug functions.
std::pair<wifi_error, uint32_t> getLoggerSupportedFeatureSet();
wifi_error startPktFateMonitoring();
diff --git a/wifi/1.0/default/wifi_nan_iface.cpp b/wifi/1.0/default/wifi_nan_iface.cpp
index 333fac7..8d76f91 100644
--- a/wifi/1.0/default/wifi_nan_iface.cpp
+++ b/wifi/1.0/default/wifi_nan_iface.cpp
@@ -120,14 +120,6 @@
}
break;
}
- case legacy_hal::NAN_RESPONSE_BEACON_SDF_PAYLOAD: {
- for (const auto& callback : shared_ptr_this->event_callbacks_) {
- if (!callback->notifyBeaconSdfPayloadResponse(id, wifiNanStatus).isOk()) {
- LOG(ERROR) << "Failed to invoke the callback";
- }
- }
- break;
- }
case legacy_hal::NAN_GET_CAPABILITIES: {
NanCapabilities hidl_struct;
if (!hidl_struct_util::convertLegacyNanCapabilitiesResponseToHidl(
@@ -183,6 +175,8 @@
}
break;
}
+ case legacy_hal::NAN_RESPONSE_BEACON_SDF_PAYLOAD:
+ /* fall through */
case legacy_hal::NAN_RESPONSE_TCA:
/* fall through */
case legacy_hal::NAN_RESPONSE_STATS:
@@ -402,24 +396,8 @@
};
callback_handlers.on_event_beacon_sdf_payload = [weak_ptr_this](
- const legacy_hal::NanBeaconSdfPayloadInd& msg) {
- const auto shared_ptr_this = weak_ptr_this.promote();
- if (!shared_ptr_this.get() || !shared_ptr_this->isValid()) {
- LOG(ERROR) << "Callback invoked on an invalid object";
- return;
- }
- NanBeaconSdfPayloadInd hidl_struct;
- if (!hidl_struct_util::convertLegacyNanBeaconSdfPayloadIndToHidl(
- msg, &hidl_struct)) {
- LOG(ERROR) << "Failed to convert nan capabilities response";
- return;
- }
-
- for (const auto& callback : shared_ptr_this->event_callbacks_) {
- if (!callback->eventBeaconSdfPayload(hidl_struct).isOk()) {
- LOG(ERROR) << "Failed to invoke the callback";
- }
- }
+ const legacy_hal::NanBeaconSdfPayloadInd& /* msg */) {
+ LOG(ERROR) << "on_event_beacon_sdf_payload - should not be called";
};
legacy_hal::wifi_error legacy_status =
@@ -517,7 +495,7 @@
Return<void> WifiNanIface::stopPublishRequest(
uint16_t cmd_id,
- uint16_t sessionId,
+ uint8_t sessionId,
stopPublishRequest_cb hidl_status_cb) {
return validateAndCall(this,
WifiStatusCode::ERROR_WIFI_IFACE_INVALID,
@@ -541,7 +519,7 @@
Return<void> WifiNanIface::stopSubscribeRequest(
uint16_t cmd_id,
- uint16_t sessionId,
+ uint8_t sessionId,
stopSubscribeRequest_cb hidl_status_cb) {
return validateAndCall(this,
WifiStatusCode::ERROR_WIFI_IFACE_INVALID,
@@ -621,18 +599,6 @@
ndpInstanceId);
}
-Return<void> WifiNanIface::beaconSdfPayloadRequest(
- uint16_t cmd_id,
- const NanBeaconSdfPayloadRequest& msg,
- beaconSdfPayloadRequest_cb hidl_status_cb) {
- return validateAndCall(this,
- WifiStatusCode::ERROR_WIFI_IFACE_INVALID,
- &WifiNanIface::beaconSdfPayloadRequestInternal,
- hidl_status_cb,
- cmd_id,
- msg);
-}
-
std::pair<WifiStatus, std::string> WifiNanIface::getNameInternal() {
return {createWifiStatus(WifiStatusCode::SUCCESS), ifname_};
}
@@ -699,7 +665,7 @@
}
WifiStatus WifiNanIface::stopPublishRequestInternal(
- uint16_t cmd_id, uint16_t sessionId) {
+ uint16_t cmd_id, uint8_t sessionId) {
legacy_hal::NanPublishCancelRequest legacy_msg;
legacy_msg.publish_id = sessionId;
legacy_hal::wifi_error legacy_status =
@@ -720,7 +686,7 @@
}
WifiStatus WifiNanIface::stopSubscribeRequestInternal(
- uint16_t cmd_id, uint16_t sessionId) {
+ uint16_t cmd_id, uint8_t sessionId) {
legacy_hal::NanSubscribeCancelRequest legacy_msg;
legacy_msg.subscribe_id = sessionId;
legacy_hal::wifi_error legacy_status =
@@ -783,16 +749,6 @@
free(legacy_msg);
return createWifiStatusFromLegacyError(legacy_status);
}
-WifiStatus WifiNanIface::beaconSdfPayloadRequestInternal(
- uint16_t cmd_id, const NanBeaconSdfPayloadRequest& msg) {
- legacy_hal::NanBeaconSdfPayloadRequest legacy_msg;
- if (!hidl_struct_util::convertHidlNanBeaconSdfPayloadRequestToLegacy(msg, &legacy_msg)) {
- return createWifiStatus(WifiStatusCode::ERROR_INVALID_ARGS);
- }
- legacy_hal::wifi_error legacy_status =
- legacy_hal_.lock()->nanBeaconSdfPayloadRequest(cmd_id, legacy_msg);
- return createWifiStatusFromLegacyError(legacy_status);
-}
} // namespace implementation
} // namespace V1_0
diff --git a/wifi/1.0/default/wifi_nan_iface.h b/wifi/1.0/default/wifi_nan_iface.h
index 4fae3df..d1da60e 100644
--- a/wifi/1.0/default/wifi_nan_iface.h
+++ b/wifi/1.0/default/wifi_nan_iface.h
@@ -60,13 +60,13 @@
const NanPublishRequest& msg,
startPublishRequest_cb hidl_status_cb) override;
Return<void> stopPublishRequest(uint16_t cmd_id,
- uint16_t sessionId,
+ uint8_t sessionId,
stopPublishRequest_cb hidl_status_cb) override;
Return<void> startSubscribeRequest(uint16_t cmd_id,
const NanSubscribeRequest& msg,
startSubscribeRequest_cb hidl_status_cb) override;
Return<void> stopSubscribeRequest(uint16_t cmd_id,
- uint16_t sessionId,
+ uint8_t sessionId,
stopSubscribeRequest_cb hidl_status_cb) override;
Return<void> transmitFollowupRequest(uint16_t cmd_id,
const NanTransmitFollowupRequest& msg,
@@ -87,9 +87,6 @@
Return<void> terminateDataPathRequest(uint16_t cmd_id,
uint32_t ndpInstanceId,
terminateDataPathRequest_cb hidl_status_cb) override;
- Return<void> beaconSdfPayloadRequest(uint16_t cmd_id,
- const NanBeaconSdfPayloadRequest& msg,
- beaconSdfPayloadRequest_cb hidl_status_cb) override;
private:
// Corresponding worker functions for the HIDL methods.
@@ -105,10 +102,10 @@
WifiStatus disableRequestInternal(uint16_t cmd_id);
WifiStatus startPublishRequestInternal(uint16_t cmd_id,
const NanPublishRequest& msg);
- WifiStatus stopPublishRequestInternal(uint16_t cmd_id, uint16_t sessionId);
+ WifiStatus stopPublishRequestInternal(uint16_t cmd_id, uint8_t sessionId);
WifiStatus startSubscribeRequestInternal(uint16_t cmd_id,
const NanSubscribeRequest& msg);
- WifiStatus stopSubscribeRequestInternal(uint16_t cmd_id, uint16_t sessionId);
+ WifiStatus stopSubscribeRequestInternal(uint16_t cmd_id, uint8_t sessionId);
WifiStatus transmitFollowupRequestInternal(
uint16_t cmd_id, const NanTransmitFollowupRequest& msg);
WifiStatus createDataInterfaceRequestInternal(uint16_t cmd_id,
@@ -121,8 +118,6 @@
uint16_t cmd_id, const NanRespondToDataPathIndicationRequest& msg);
WifiStatus terminateDataPathRequestInternal(
uint16_t cmd_id, uint32_t ndpInstanceId);
- WifiStatus beaconSdfPayloadRequestInternal(
- uint16_t cmd_id, const NanBeaconSdfPayloadRequest& msg);
std::string ifname_;
std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal_;
diff --git a/wifi/1.0/default/wifi_sta_iface.cpp b/wifi/1.0/default/wifi_sta_iface.cpp
index be2fe37..6100334 100644
--- a/wifi/1.0/default/wifi_sta_iface.cpp
+++ b/wifi/1.0/default/wifi_sta_iface.cpp
@@ -250,6 +250,15 @@
cmd_id);
}
+Return<void> WifiStaIface::setScanningMacOui(
+ const hidl_array<uint8_t, 3>& oui, setScanningMacOui_cb hidl_status_cb) {
+ return validateAndCall(this,
+ WifiStatusCode::ERROR_WIFI_IFACE_INVALID,
+ &WifiStaIface::setScanningMacOuiInternal,
+ hidl_status_cb,
+ oui);
+}
+
Return<void> WifiStaIface::startDebugPacketFateMonitoring(
startDebugPacketFateMonitoring_cb hidl_status_cb) {
return validateAndCall(this,
@@ -380,7 +389,9 @@
return;
}
for (const auto& callback : shared_ptr_this->getEventCallbacks()) {
- callback->onBackgroundScanFailure(id);
+ if (!callback->onBackgroundScanFailure(id).isOk()) {
+ LOG(ERROR) << "Failed to invoke onBackgroundScanFailure callback";
+ }
}
};
const auto& on_results_callback = [weak_ptr_this](
@@ -398,7 +409,9 @@
return;
}
for (const auto& callback : shared_ptr_this->getEventCallbacks()) {
- callback->onBackgroundScanResults(id, hidl_scan_datas);
+ if (!callback->onBackgroundScanResults(id, hidl_scan_datas).isOk()) {
+ LOG(ERROR) << "Failed to invoke onBackgroundScanResults callback";
+ }
}
};
const auto& on_full_result_callback = [weak_ptr_this](
@@ -417,7 +430,9 @@
return;
}
for (const auto& callback : shared_ptr_this->getEventCallbacks()) {
- callback->onBackgroundFullScanResult(id, hidl_scan_result);
+ if (!callback->onBackgroundFullScanResult(id, hidl_scan_result).isOk()) {
+ LOG(ERROR) << "Failed to invoke onBackgroundFullScanResult callback";
+ }
}
};
legacy_hal::wifi_error legacy_status =
@@ -477,7 +492,9 @@
return;
}
for (const auto& callback : shared_ptr_this->getEventCallbacks()) {
- callback->onRssiThresholdBreached(id, bssid, rssi);
+ if (!callback->onRssiThresholdBreached(id, bssid, rssi).isOk()) {
+ LOG(ERROR) << "Failed to invoke onRssiThresholdBreached callback";
+ }
}
};
legacy_hal::wifi_error legacy_status =
@@ -553,6 +570,12 @@
return createWifiStatusFromLegacyError(legacy_status);
}
+WifiStatus WifiStaIface::setScanningMacOuiInternal(const std::array<uint8_t, 3>& oui) {
+ legacy_hal::wifi_error legacy_status =
+ legacy_hal_.lock()->setScanningMacOui(oui);
+ return createWifiStatusFromLegacyError(legacy_status);
+}
+
WifiStatus WifiStaIface::startDebugPacketFateMonitoringInternal() {
legacy_hal::wifi_error legacy_status =
legacy_hal_.lock()->startPktFateMonitoring();
diff --git a/wifi/1.0/default/wifi_sta_iface.h b/wifi/1.0/default/wifi_sta_iface.h
index ca79c5b..bc2d75f 100644
--- a/wifi/1.0/default/wifi_sta_iface.h
+++ b/wifi/1.0/default/wifi_sta_iface.h
@@ -95,6 +95,8 @@
startSendingKeepAlivePackets_cb hidl_status_cb) override;
Return<void> stopSendingKeepAlivePackets(
uint32_t cmd_id, stopSendingKeepAlivePackets_cb hidl_status_cb) override;
+ Return<void> setScanningMacOui(const hidl_array<uint8_t, 3>& oui,
+ setScanningMacOui_cb hidl_status_cb) override;
Return<void> startDebugPacketFateMonitoring(
startDebugPacketFateMonitoring_cb hidl_status_cb) override;
Return<void> getDebugTxPacketFates(
@@ -140,6 +142,7 @@
const std::array<uint8_t, 6>& dst_address,
uint32_t period_in_ms);
WifiStatus stopSendingKeepAlivePacketsInternal(uint32_t cmd_id);
+ WifiStatus setScanningMacOuiInternal(const std::array<uint8_t, 3>& oui);
WifiStatus startDebugPacketFateMonitoringInternal();
std::pair<WifiStatus, std::vector<WifiDebugTxPacketFateReport>>
getDebugTxPacketFatesInternal();
diff --git a/wifi/1.0/types.hal b/wifi/1.0/types.hal
index 1ec1357..1c6d0e0 100644
--- a/wifi/1.0/types.hal
+++ b/wifi/1.0/types.hal
@@ -211,7 +211,7 @@
/**
* STA specific types.
- * TODO(b/32159498): Move to a separate nan_types.hal.
+ * TODO(b/32159498): Move to a separate sta_types.hal.
*/
/**
* Parameters to specify the APF capabilities of this iface.
@@ -562,6 +562,9 @@
/**
* NAN specific types.
* TODO(b/32159498): Move to a separate nan_types.hal.
+ *
+ * References to "NAN Spec" are to the Wi-Fi Alliance "Wi-Fi Neighbor Awareness
+ * Networking (NAN) Technical Specification".
*/
/**
@@ -624,55 +627,59 @@
};
/**
- * NAN Match indication type.
+ * NAN Match indication type: control how often to trigger |IWifiNanIfaceEventCallback.eventMatch|
+ * for a single discovery session - i.e. continuously discovering the same publisher with no new
+ * data.
*/
enum NanMatchAlg : uint32_t {
- MATCH_ONCE = 0,
- MATCH_CONTINUOUS,
- MATCH_NEVER,
+ MATCH_ONCE = 0, // Only trigger |IWifiNanIfaceEventCallback.eventMatch| once
+ MATCH_CONTINUOUS, // Trigger |IWifiNanIfaceEventCallback.eventMatch| every time
+ MATCH_NEVER, // Never trigger |IWifiNanIfaceEventCallback.eventMatch|
};
/**
* NAN publish discovery session types.
*/
enum NanPublishType : uint32_t {
- UNSOLICITED = 0,
- SOLICITED,
- UNSOLICITED_SOLICITED,
+ UNSOLICITED = 0, // Publish session broadcasts discovery packets
+ SOLICITED, // Publish session silent, responds to active subscribes queries
+ UNSOLICITED_SOLICITED, // Both
};
/**
* NAN transmit type used in |NanPublishType.SOLICITED| or |NanPublishType.UNSOLICITED_SOLICITED|
- * publish discovery sessions.
+ * publish discovery sessions. Describes the addressing of the packet responding to an ACTIVE
+ * subscribe query.
*/
enum NanTxType : uint32_t {
- BROADCAST = 0,
- UNICAST,
+ BROADCAST = 0, // Respond with a broadcast packet
+ UNICAST, // Respond with a unicast packet
};
/**
- * NAN subscribe discovery session ypes.
+ * NAN subscribe discovery session types.
*/
enum NanSubscribeType : uint32_t {
- PASSIVE = 0,
- ACTIVE,
+ PASSIVE = 0, // Subscribe session scans for |NanPublishType.UNSOLICITED| publish sessions.
+ ACTIVE, // Subscribe session probes for |NanPublishType.SOLICITED| publish sessions.
};
/**
* NAN Service Response Filter Attribute Bit.
*/
enum NanSrfType : uint32_t {
- BLOOM_FILTER = 0,
- PARTIAL_MAC_ADDR,
+ BLOOM_FILTER = 0, // Use a Bloom filter.
+ PARTIAL_MAC_ADDR, // Use a list of MAC addresses.
};
/**
- * NAN DP channel config options.
+ * NAN DP (data-path) channel config options.
*/
enum NanDataPathChannelCfg : uint32_t {
- CHANNEL_NOT_REQUESTED = 0,
- REQUEST_CHANNEL_SETUP,
- FORCE_CHANNEL_SETUP,
+ CHANNEL_NOT_REQUESTED = 0, // No channel request is specified.
+ REQUEST_CHANNEL_SETUP, // Channel request is specified - but may be overridden by firmware.
+ FORCE_CHANNEL_SETUP, // Channel request is specified and must be respected. If the firmware
+ // cannot honor the request then the data-path request is rejected.
};
/**
@@ -680,86 +687,100 @@
*/
struct NanBandSpecificConfig {
/**
- * RSSI values controlling clustering behavior per spec.
+ * RSSI values controlling clustering behavior per spec. RSSI values are specified without a sign,
+ * e.g. a value of -65dBm would be specified as 65.
*/
- uint8_t rssiClose;
- uint8_t rssiMiddle;
+ uint8_t rssiClose; // NAN Spec: RSSI_close
+ uint8_t rssiMiddle; // NAN Spec: RSSI_middle
/**
- * RSSI value determining whether discovery is near (used if enabled in discovery).
+ * RSSI value determining whether discovery is near (used if enabled in discovery by
+ * |NanDiscoveryCommonConfig.useRssiThreshold|).
+ * RSSI values are specified without a sign, e.g. a value of -65dBm would be specified as 65.
+ * NAN Spec: RSSI_close_proximity
*/
- uint8_t rssiProximity;
+ uint8_t rssiCloseProximity;
/**
- * Dwell time of each discovery channel in milliseconds.
- * If time set to 0 then the FW default time must be used.
+ * Dwell time of each discovery channel in milliseconds. If set to 0 then the firmware determines
+ * the dwell time to use.
*/
uint8_t dwellTimeMs;
/**
- * Scan period of each discovery channel in seconds.
- * If time set to 0 then the FW default time must be used.
+ * Scan period of each discovery channel in seconds. If set to 0 then the firmware determines
+ * the scan period to use.
*/
uint16_t scanPeriodSec;
/**
- * Specifies the interval for Sync beacons and SDF's.
+ * Specifies the discovery window interval for Sync beacons and SDF's.
* Valid values of DW Interval are: 1, 2, 3, 4 and 5 corresponding to 1, 2, 4, 8, and 16 DWs.
* Value of 0:
* - reserved in 2.4GHz band
* - no wakeup at all in 5GHz band
- * The publish/subscribe period values don't override the device level configurations if
- * specified (if 'valid' is true).
+ * The publish/subscribe period values don't override this device level configurations if
+ * it is specified.
+ * Configuration is only used only if |validDiscoveryWindowIntervalVal| is set to true.
+ * NAN Spec: Device Capability Attribute / 2.4 GHz DW, Device Capability Attribute / 5 GHz DW
*/
bool validDiscoveryWindowIntervalVal;
uint8_t discoveryWindowIntervalVal;
};
/**
- * Configuration parameters
+ * Debug configuration parameters. Many of these allow non-standard-compliant operation and are
+ * not intended for normal operational mode.
*/
struct NanDebugConfig {
/**
- * The low and high values of the cluster ID: standard values are 0x0000 - 0xFFFF.
- * A clusterLow == clusterHigh indicates a request to join or create a cluster with that ID.
- * Used if 'valid' is true.
+ * Specification of the lower 2 bytes of the cluster ID. The cluster ID is 50-60-9a-01-00-00 to
+ * 50-60-9a-01-FF-FF. Configuration of the bottom and top values of the range (which defaults to
+ * 0x0000 and 0xFFFF respectively).
+ * Configuration is only used if |validClusterIdVals| is set to true.
*/
bool validClusterIdVals;
- uint16_t clusterIdLowVal;
- uint16_t clusterIdHighVal;
+ uint16_t clusterIdBottomRangeVal;
+ uint16_t clusterIdTopRangeVal;
/**
- * NAN management interface address, If specified ('valid' is true) then overrides any other
- * configuration (specifically the default randomization).
+ * NAN management interface address, if specified (|validIntfAddrVal| is true) then overrides any
+ * other configuration (specifically the default randomization configured by
+ * |NanConfigRequest.macAddressRandomizationIntervalSec|).
*/
bool validIntfAddrVal;
MacAddress intfAddrVal;
/**
- * The 24 bit Organizationally Unique ID + the 8 bit Network Id. Used if 'valid' is true.
+ * Combination of the 24 bit Organizationally Unique ID (OUI) and the 8 bit OUI Type.
+ * Used if |validOuiVal| is set to true.
*/
bool validOuiVal;
uint32_t ouiVal;
/**
- * Force the Random Factor to the specified value for all transmitted Sync/Discovery beacons
- * if the 'valid' flag is true.
+ * Force the Random Factor to the specified value for all transmitted Sync/Discovery beacons.
+ * Used if |validRandomFactorForceVal| is set to true.
+ * NAN Spec: Master Indication Attribute / Random Factor
*/
bool validRandomFactorForceVal;
uint8_t randomFactorForceVal;
/**
* Forces the hop-count for all transmitted Sync and Discovery Beacons NO matter the real
- * hop-count being received over the air. Used if the 'valid' flag is true.
+ * hop-count being received over the air. Used if the |validHopCountForceVal}| flag is set to
+ * true.
+ * NAN Spec: Cluster Attribute / Anchor Master Information / Hop Count to Anchor Master
*/
bool validHopCountForceVal;
uint8_t hopCountForceVal;
/**
* Frequency in MHz to of the discovery channel in the specified band. Indexed by |NanBandIndex|.
+ * Used if the |validDiscoveryChannelVal| is set to true.
*/
bool validDiscoveryChannelVal;
WifiChannelInMhz[2] discoveryChannelMhzVal;
/**
* Specifies whether sync/discovery beacons are transmitted in the specified band. Indexed by
- * |NanBandIndex|.
+ * |NanBandIndex|. Used if the |validUseBeaconsInBandVal| is set to true.
*/
bool validUseBeaconsInBandVal;
bool[2] useBeaconsInBandVal;
/**
- * Specified whether SDF (service discovery frames) are transmitted in the specified band. Indexed
- * by |NanBandIndex|.
+ * Specifies whether SDF (service discovery frames) are transmitted in the specified band. Indexed
+ * by |NanBandIndex|. Used if the |validUseSdfInBandVal| is set to true.
*/
bool validUseSdfInBandVal;
bool[2] useSdfInBandVal;
@@ -771,34 +792,48 @@
struct NanConfigRequest {
/**
* Master preference of this device.
+ * NAN Spec: Master Indication Attribute / Master Preference
*/
uint8_t masterPref;
/**
* Controls whether or not the |IWifiNanIfaceEventCallback.eventClusterEvent| will be delivered
- * for DISCOVERY_MAC_ADDRESS_CHANGED.
+ * for |NanClusterEventType.DISCOVERY_MAC_ADDRESS_CHANGED|.
*/
bool disableDiscoveryAddressChangeIndication;
/**
* Controls whether or not the |IWifiNanIfaceEventCallback.eventClusterEvent| will be delivered
- * for STARTED_CLUSTER.
+ * for |NanClusterEventType.STARTED_CLUSTER|.
*/
bool disableStartedClusterIndication;
/**
* Controls whether or not the |IWifiNanIfaceEventCallback.eventClusterEvent| will be delivered
- * for JOINED_CLUSTER.
+ * for |NanClusterEventType.JOINED_CLUSTER|.
*/
bool disableJoinedClusterIndication;
/**
- * Control whether service IDs are included in Sync/Discovery beacons.
+ * Control whether publish service IDs are included in Sync/Discovery beacons.
+ * NAN Spec: Service ID List Attribute
*/
- bool includeServiceIdsInBeacon;
+ bool includePublishServiceIdsInBeacon;
/**
- * If |includeServiceIdInBeacon| is true then specifies the number of service IDs to include
- * in the Sync/Discovery beacons:
+ * If |includePublishServiceIdsInBeacon| is true then specifies the number of publish service IDs
+ * to include in the Sync/Discovery beacons:
* Value = 0: include as many service IDs as will fit into the maximum allowed beacon frame size.
* Value must fit within 7 bits - i.e. <= 127.
*/
- uint8_t numberOfServiceIdsInBeacon;
+ uint8_t numberOfPublishServiceIdsInBeacon;
+ /**
+ * Control whether subscribe service IDs are included in Sync/Discovery beacons.
+ * Spec: Subscribe Service ID List Attribute
+ */
+ bool includeSubscribeServiceIdsInBeacon;
+ /**
+ * If |includeSubscribeServiceIdsInBeacon| is true then specifies the number of subscribe service
+ * IDs to include in the Sync/Discovery beacons:
+ * Value = 0: include as many service IDs as will fit into the maximum allowed beacon frame size.
+ * Value must fit within 7 bits - i.e. <= 127.
+ */
+ uint8_t numberOfSubscribeServiceIdsInBeacon;
/**
* Number of samples used to calculate RSSI.
*/
@@ -820,7 +855,7 @@
};
/**
- * Enable requests for NAN: start-up configuration.
+ * Enable requests for NAN: start-up configuration |IWifiNanIface.enableRequest|.
*/
struct NanEnableRequest {
/**
@@ -833,30 +868,31 @@
uint8_t hopCountMax;
/**
* Configurations of NAN cluster operation. Can also be modified at run-time using
- * |configRequest|.
+ * |IWifiNanIface.configRequest|.
*/
NanConfigRequest configParams;
/**
- * Non-standard configurations of NAN cluster operation - useful for debugging opeations.
+ * Non-standard configurations of NAN cluster operation - useful for debugging operations.
*/
NanDebugConfig debugConfigs;
};
/**
- * Cipher suite flags - to be used as a bitmask.
+ * Cipher suite flags.
*/
enum NanCipherSuiteType : uint32_t {
- SHARED_KEY_128_MASK = 1 << 0,
- SHARED_KEY_256_MASK = 1 << 1
+ SHARED_KEY_128_MASK = 1 << 0, // NCS-SK-128
+ SHARED_KEY_256_MASK = 1 << 1 // NCS-SK-256
};
/**
- * Ranging in the context of discovery sessions indication controls - to be used as a bitmask.
+ * Ranging in the context of discovery sessions indication controls. Controls the frequency of
+ * ranging-driven |IWifiNanIfaceEventCallback.eventMatch|.
*/
enum NanRangingIndication : uint32_t {
- CONTINUOUS_INDICATION_MASK = 1 << 0,
- INGRESS_MET_MASK = 1 << 1,
- EGRESS_MET_MASK = 1 << 2
+ CONTINUOUS_INDICATION_MASK = 1 << 0, // trigger event on every RTT measurement
+ INGRESS_MET_MASK = 1 << 1, // trigger event only when ingress conditions met
+ EGRESS_MET_MASK = 1 << 2 // trigger event only when egress conditions met
};
/**
@@ -865,58 +901,82 @@
struct NanDiscoveryCommonConfig {
/**
* The ID of the discovery session being configured. A value of 0 specifies a request to create
- * a new discovery session.
+ * a new discovery session. The new discovery session ID is returned with
+ * |IWifiNanIfaceEventCallback.notifyStartPublishResponse| or
+ * |IWifiNanIfaceEventCallback.notifyStartSubscribeResponse|.
+ * NAN Spec: Service Descriptor Attribute (SDA) / Instance ID
*/
- uint16_t sessionId;
+ uint8_t sessionId;
/**
* The lifetime of the discovery session in seconds. A value of 0 means run forever or until
- * canceled.
+ * canceled using |IWifiIface.stopPublishRequest| or |IWifiIface.stopSubscribeRequest|.
*/
uint16_t ttlSec;
/**
* Indicates the interval between two Discovery Windows in which the device supporting the
- * service is awake to transmit or receive the Service Discovery frames.
- * Valid values of Awake DW Interval are: 1, 2, 4, 8 and 16. A value of 0 will default to 1.
+ * service is awake to transmit or receive the Service Discovery frames. Valid values of Awake
+ * DW Interval are: 1, 2, 4, 8 and 16. A value of 0 will default to 1. Does not override
+ * |NanBandSpecificConfig.discoveryWindowIntervalVal| configurations if those are specified.
*/
uint16_t discoveryWindowPeriod;
/**
- * Number of other-air-air operations (i.e. active transmissions), 0 means forever or until
- * canceled.
+ * The lifetime of the discovery session in number of transmitted SDF discovery packets. A value
+ * of 0 means forever or until canceled using |IWifiIface.stopPublishRequest| or
+ * |IWifiIface.stopSubscribeRequest|.
*/
uint8_t discoveryCount;
/**
* UTF-8 encoded string identifying the service.
* Max length: |NanCapabilities.maxServiceNameLen|.
+ * NAN Spec: The only acceptable single-byte UTF-8 symbols for a Service Name are alphanumeric
+ * values (A-Z, a-z, 0-9), the hyphen ('-'), and the period ('.'). All valid multi-byte UTF-8
+ * characters are acceptable in a Service Name.
*/
vec<uint8_t> serviceName;
/**
- * Specifies the matching indication to host: once, continuous, or never.
+ * Specifies how often to trigger |IWifiNanIfaceEventCallback.eventMatch| when continuously
+ * discovering the same discovery session (with no changes).
*/
NanMatchAlg discoveryMatchIndicator;
/**
- * Arbitrary information communicated as part of discovery.
+ * Arbitrary information communicated in discovery packets - there is no semantic meaning to these
+ * bytes. They are passed-through from publisher to subscriber as-is with no parsing.
* Max length: |NanCapabilities.maxServiceSpecificInfoLen|.
+ * NAN Spec: Service Descriptor Attribute (SDA) / Service Info
*/
vec<uint8_t> serviceSpecificInfo;
/**
- * Ordered sequence of <length, value> pairs (length uses 1 byte) which specify further match
- * criteria (beyond the service name).
+ * Arbitrary information communicated in discovery packets - there is no semantic meaning to these
+ * bytes. They are passed-through from publisher to subscriber as-is with no parsing.
+ * Max length: |NanCapabilities.maxExtendedServiceSpecificInfoLen|.
+ * Spec: Service Descriptor Extension Attribute (SDEA) / Service Info
+ */
+ vec<uint8_t> extendedServiceSpecificInfo;
+ /**
+ * Ordered sequence of <length, value> pairs (|length| uses 1 byte and contains the number of
+ * bytes in the |value| field) which specify further match criteria (beyond the service name).
+ * The match behavior is specified in details in the NAN spec.
* Publisher: used in SOLICITED or SOLICITED_UNSOLICITED sessions.
* Subscriber: used in ACTIVE or PASSIVE sessions.
* Max length: |NanCapabilities.maxMatchFilterLen|.
+ * NAN Spec: matching_filter_rx
*/
vec<uint8_t> rxMatchFilter;
/**
- * Ordered sequence of <length, value> pairs (length uses 1 byte) which specify further match
- * criteria (beyond the service name).
+ * Ordered sequence of <length, value> pairs (|length| uses 1 byte and contains the number of
+ * bytes in the |value| field) which specify further match criteria (beyond the service name).
+ * The match behavior is specified in details in the NAN spec.
* Publisher: used if provided.
- * Subscriber: used in ACTIVE sessions.
+ * Subscriber: used (if provided) only in ACTIVE sessions.
* Max length: |NanCapabilities.maxMatchFilterLen|.
+ * NAN Spec: matching_filter_tx and Service Descriptor Attribute (SDA) / Matching Filter
*/
vec<uint8_t> txMatchFilter;
/**
- * Specifies whether or not the discovery session uses the |rssiProximity| value (configured
- * in enable/configure requests) to filter out matched discovered peers.
+ * Specifies whether or not the discovery session uses the
+ * |NanBandSpecificConfig.rssiCloseProximity| value (configured in enable/configure requests) to
+ * filter out matched discovered peers.
+ * NAN Spec: Service Descriptor Attribute / Service Control / Discovery Range Limited.
*/
bool useRssiThreshold;
/**
@@ -935,45 +995,49 @@
*/
bool disableFollowupReceivedIndication;
/**
- * Cipher types supported in data-paths constructed in the context of this discovery session. The
- * |NanCipherSuiteType| bit fields are used to set this value.
+ * Cipher types supported in data-paths constructed in the context of this discovery session.
*/
bitfield<NanCipherSuiteType> supportedCipherTypes;
/**
- * Optional PMK for data-paths constructed in the context of this discovery session. A PMK could
- * also be provided during the actual construction of the data-path (which allows unique PMKs for
- * each data-path).
+ * Optional Pairwise Master Key (PMK) for data-paths constructed in the context of this discovery
+ * session. A PMK can also be provided during the actual construction of the data-path (which
+ * allows for unique PMKs for each data-path).
* Max length: 32
+ * Ref: IEEE 802.11i
*/
vec<uint8_t> pmk;
/**
* Specifies whether or not security is enabled in any data-path (NDP) constructed in the context
* of this discovery session.
+ * NAN Spec: Service Discovery Extension Attribute (SDEA) / Control / Security Required
*/
bool securityEnabledInNdp;
/**
* Specifies whether or not there is a ranging requirement in this discovery session.
* Note that ranging is only performed if all other match criteria with the peer are met.
+ * NAN Spec: Service Discovery Extension Attribute (SDEA) / Control / Ranging Require.
*/
bool rangingRequired;
/**
- * Interval in msec between two ranging measurements.
- * If the Awake DW interval in Enable/Config is larger than the ranging interval - priority is
- * given to Awake DW interval.
+ * Interval in msec between two ranging measurements. Only relevant if |rangingRequired| is true.
+ * If the Awake DW interval specified either in |discoveryWindowPeriod| or in
+ * |NanBandSpecificConfig.discoveryWindowIntervalVal| is larger than the ranging interval then
+ * priority is given to Awake DW interval.
*/
uint32_t rangingIntervalMsec;
/**
- * The type of ranging indication feedback to be provided by discovery session matches. Use
- * bit-fields from |NanRangingIndication|.
+ * The type of ranging feedback to be provided by discovery session matches
+ * |IWifiNanIfaceEventCallback.eventMatch|. Only relevant if |rangingRequired| is true.
*/
bitfield<NanRangingIndication> configRangingIndications;
/**
- * The ingress and egress distance in cm. If ranging is eanbled (|rangingEnabled| is true) then
- * \configRangingIndications\ is used to determine whether ingress and/or egress (or neither)
+ * The ingress and egress distance in cm. If ranging is enabled (|rangingEnabled| is true) then
+ * |configRangingIndications| is used to determine whether ingress and/or egress (or neither)
* are used to determine whether a match has occurred.
+ * NAN Spec: Service Discovery Extension Attribute (SDEA) / Ingress & Egress Range Limit
*/
- uint32_t distanceIngressCm;
- uint32_t distanceEgressCm;
+ uint16_t distanceIngressCm;
+ uint16_t distanceEgressCm;
};
/**
@@ -1009,27 +1073,35 @@
*/
NanSubscribeType subscribeType;
/**
- * For Active subscribe discovery sessions specify how the Service Response Filter (SRF)
- * attribute is populated.
+ * For |NanSubscribeType.ACTIVE| subscribe discovery sessions specify how the Service Response
+ * Filter (SRF) attribute is populated. Relevant only if |shouldUseSrf| is set to true.
+ * NAN Spec: Service Descriptor Attribute (SDA) / Service Response Filter / SRF Control / SRF Type
*/
NanSrfType srfType;
/**
- * Configure the requested response of the Service Response Filter (SRF).
+ * Configure whether inclusion of an address in |intfAddr| indicates that those devices should
+ * respond or the reverse. Relevant only if |shouldUseSrf| is set to true and |srfType| is set to
+ * |NanSrfType.PARTIAL_MAC_ADDR|.
+ * NAN Spec: Service Descriptor Attribute (SDA) / Service Response Filter / SRF Control / Include
*/
bool srfRespondIfInAddressSet;
/**
- * Control whether the Service Response Filter (SRF) is transmitted OTA.
+ * Control whether the Service Response Filter (SRF) is used.
+ * NAN Spec: Service Descriptor Attribute (SDA) / Service Control /
+ * Service Response Filter Present
*/
bool shouldUseSrf;
/**
- * Control whether the Service Specific Info (SSI) is needed in the Publish message to trigger
- * service discovery (a match).
+ * Control whether the presence of |NanDiscoveryCommonConfig.serviceSpecificInfo| data is needed
+ * in the publisher in order to trigger service discovery, i.e. a
+ * |IWifiNanIfaceEventCallback.eventMatch|. The test is for presence of data - not for the
+ * specific contents of the data.
*/
bool isSsiRequiredForMatch;
/**
- * NAN Interface Address, conforming to the format as described in
- * 8.2.4.3.2 of IEEE Std. 802.11-2012.
- * Max length: |NanCapabilities.maxSubscribeInterfaceAddresses|.
+ * NAN Interface Addresses constituting the Service Response Filter (SRF).
+ * Max length (number of addresses): |NanCapabilities.maxSubscribeInterfaceAddresses|.
+ * NAN Spec: Service Descriptor Attribute (SDA) / Service Response Filter / Address Set
*/
vec<MacAddress> intfAddr;
};
@@ -1041,15 +1113,17 @@
/**
* ID of an active publish or subscribe discovery session. Follow-up message is transmitted in the
* context of the discovery session.
+ * NAN Spec: Service Descriptor Attribute (SDA) / Instance ID
*/
- uint16_t discoverySessionId;
+ uint8_t discoverySessionId;
/**
- * ID of the peer. Obtained as part of an earlier |eventMatch| or |eventFollowupReceived|.
+ * ID of the peer. Obtained as part of an earlier |IWifiNanIfaceEventCallback.eventMatch| or
+ * |IWifiNanIfaceEventCallback.eventFollowupReceived|.
*/
uint32_t peerId;
/**
- * MAC address of the peer. Obtained as part of an earlier |eventMatch| or
- * |eventFollowupReceived|.
+ * MAC address of the peer. Obtained as part of an earlier |IWifiNanIfaceEventCallback.eventMatch|
+ * or |IWifiNanIfaceEventCallback.eventFollowupReceived|.
*/
MacAddress addr;
/**
@@ -1062,13 +1136,22 @@
*/
bool shouldUseDiscoveryWindow;
/**
- * Message as a byte sequence.
+ * Arbitrary information communicated to the peer - there is no semantic meaning to these
+ * bytes. They are passed-through from sender to receiver as-is with no parsing.
* Max length: |NanCapabilities.maxServiceSpecificInfoLen|.
+ * NAN Spec: Service Descriptor Attribute (SDA) / Service Info
*/
- vec<uint8_t> message;
+ vec<uint8_t> serviceSpecificInfo;
/**
- * Disable |eventTransmitFollowup| - i.e. do not get indication on whether the follow-up
- * was transmitted and received successfully.
+ * Arbitrary information communicated in discovery packets - there is no semantic meaning to these
+ * bytes. They are passed-through from publisher to subscriber as-is with no parsing.
+ * Max length: |NanCapabilities.maxExtendedServiceSpecificInfoLen|.
+ * Spec: Service Descriptor Extension Attribute (SDEA) / Service Info
+ */
+ vec<uint8_t> extendedServiceSpecificInfo;
+ /**
+ * Disable |IWifiNanIfaceEventCallback.eventTransmitFollowup| - i.e. do not get indication on
+ * whether the follow-up was transmitted and received successfully.
*/
bool disableFollowupResultIndication;
};
@@ -1078,11 +1161,13 @@
*/
struct NanInitiateDataPathRequest {
/**
- * ID of the peer. Obtained as part of an earlier |eventMatch| or |eventFollowupReceived|.
+ * ID of the peer. Obtained as part of an earlier |IWifiNanIfaceEventCallback.eventMatch| or
+ * |IWifiNanIfaceEventCallback.eventFollowupReceived|.
*/
uint32_t peerId;
/**
- * NAN management interface MAC address of the peer.
+ * NAN management interface MAC address of the peer. Obtained as part of an earlier
+ * |IWifiNanIfaceEventCallback.eventMatch| or |IWifiNanIfaceEventCallback.eventFollowupReceived|.
*/
MacAddress peerDiscMacAddr;
/**
@@ -1090,31 +1175,36 @@
*/
NanDataPathChannelCfg channelRequestType;
/**
- * Channel frequency in MHz to start data-path.
+ * Channel frequency in MHz to start data-path. Not relevant if |channelRequestType| is
+ * |NanDataPathChannelCfg.CHANNEL_NOT_REQUESTED|.
*/
WifiChannelInMhz channel;
/**
- * NAN data interface name on which this data-path session is to be started.
- * This must be an interface created using |createDataInterfaceRequest|.
+ * NAN data interface name on which this data-path session is to be initiated.
+ * This must be an interface created using |IWifiNanIface.createDataInterfaceRequest|.
*/
string ifaceName;
/**
* Specifies whether or not security is required for the data-path being created.
+ * NAN Spec: Data Path Attributes / NDP Attribute / NDP Control / Security Present
*/
bool securityRequired;
/**
- * Arbitrary token transmitted as part of the data-path negotiation (not encrypted).
+ * Arbitrary information communicated to the peer as part of the data-path setup process - there
+ * is no semantic meaning to these bytes. They are passed-through from sender to receiver as-is
+ * with no parsing.
* Max length: |NanCapabilities.maxAppInfoLen|.
+ * NAN Spec: Data Path Attributes / NDP Attribute / NDP Specific Info
*/
vec<uint8_t> appInfo;
/**
- * Cipher types supported in data-paths constructed in the context of this discovery session. The
- * |NanCipherSuiteType| bit fields are used to set this value.
+ * Cipher types supported in data-paths constructed in the context of this discovery session.
*/
bitfield<NanCipherSuiteType> supportedCipherTypes;
/**
- * PMK of the data-path being requested (if |securityRequired| is true).
+ * Pairwise Master Key (PMK) for the data-path being requested (if |securityRequired| is true).
* Max length: 32
+ * Ref: IEEE 802.11i
*/
vec<uint8_t> pmk;
};
@@ -1125,65 +1215,44 @@
struct NanRespondToDataPathIndicationRequest {
/**
* Accept (true) or reject (false) the request.
+ * NAN Spec: Data Path Attributes / NDP Attribute / Type and Status
*/
bool acceptRequest;
/**
* ID of the data-path (NDP) for which we're responding - obtained as part of the request in
- * |NanDataPathRequestInd|.
+ * |IWifiNanIfaceEventCallback.eventDataPathRequest|.
*/
uint32_t ndpInstanceId;
/**
* NAN data interface name on which this data-path session is to be started.
- * This must be an interface created using |createDataInterfaceRequest|.
+ * This must be an interface created using |IWifiNanIface.createDataInterfaceRequest|.
*/
string ifaceName;
/**
* Specifies whether or not security is required for the data-path being created.
+ * NAN Spec: Data Path Attributes / NDP Attribute / NDP Control / Security Present
*/
bool securityRequired;
/**
- * Arbitrary token transmitted as part of the data-path negotiation (not encrypted).
+ * Arbitrary information communicated to the peer as part of the data-path setup process - there
+ * is no semantic meaning to these bytes. They are passed-through from sender to receiver as-is
+ * with no parsing.
* Max length: |NanCapabilities.maxAppInfoLen|.
+ * NAN Spec: Data Path Attributes / NDP Attribute / NDP Specific Info
*/
vec<uint8_t> appInfo;
/**
- * Cipher types supported in data-paths constructed in the context of this discovery session. The
- * |NanCipherSuiteType| bit fields are used to set this value.
+ * Cipher types supported in data-paths constructed in the context of this discovery session.
*/
bitfield<NanCipherSuiteType> supportedCipherTypes;
/**
- * PMK of the data-path being requested (if |securityRequired| is true).
+ * Pairwise Master Key (PMK) for the data-path being negotiated (if |securityRequired| is true).
* Max length: 32
*/
vec<uint8_t> pmk;
};
/**
- * Specifies vendor-specific information fields to be included in NAN management frames.
- */
-struct NanBeaconSdfPayloadRequest {
- /**
- * If true information is transmitted in next 16 DWs, else only in the next (1) DW.
- */
- bool transmitInNext16dws;
- /**
- * Specify the management frames in which the vendor-specific information is included.
- */
- bool transmitInDiscoveryBeacon;
- bool transmitInSyncBeacon;
- bool transmitInServiceDiscoveryFrame;
- /**
- * Organizationally Unique Identifier (OUI).
- */
- uint32_t vendorOui;
- /**
- * Vendor specific attribute to be transmitted.
- * Max length: |NanCapabilities.maxVsaDataLen|.
- */
- vec<uint8_t> vsa;
-};
-
-/**
* NDP Capabilities response.
*/
struct NanCapabilities {
@@ -1208,24 +1277,24 @@
*/
uint32_t maxMatchFilterLen;
/**
- * Maximum length (in bytes) of aggregate match filters.
+ * Maximum length (in bytes) of aggregate match filters across all active sessions.
*/
uint32_t maxTotalMatchFilterLen;
/**
- * Maximum length (in bytes) of the service specific info length or message length in follow-ups.
+ * Maximum length (in bytes) of the service specific info field.
*/
uint32_t maxServiceSpecificInfoLen;
/**
- * Maximum length (in bytes) of vendor-specific (VSA) data.
+ * Maximum length (in bytes) of the extended service specific info field.
*/
- uint32_t maxVsaDataLen;
+ uint32_t maxExtendedServiceSpecificInfoLen;
/**
- * Maximum number of data interfaces which can be created concurrently on the device.
+ * Maximum number of data interfaces (NDI) which can be created concurrently on the device.
*/
uint32_t maxNdiInterfaces;
/**
- * Maximum number of data paths which can be created concurrently on each individual
- * data interface.
+ * Maximum number of data paths (NDP) which can be created concurrently on each individual
+ * data interface (NDI).
*/
uint32_t maxNdpSessions;
/**
@@ -1239,7 +1308,7 @@
/**
* Maximum number MAC interface addresses which can be specified to a subscribe discovery session.
*/
- uint32_t maxSubscribeInterfaceAddresses; // TODO: (hard-code to 42) get from HAL
+ uint32_t maxSubscribeInterfaceAddresses;
/**
* The set of supported Cipher suites. The |NanCipherSuiteType| bit fields are used.
*/
@@ -1252,10 +1321,12 @@
struct NanMatchInd {
/**
* Publish or subscribe discovery session ID of an existing discovery session.
+ * NAN Spec: Service Descriptor Attribute (SDA) / Instance ID
*/
- uint16_t discoverySessionId;
+ uint8_t discoverySessionId;
/**
- * A unique ID of the peer. Can be subsequently used in |transmitFollowupRequest|.
+ * A unique ID of the peer. Can be subsequently used in |IWifiNanIface.transmitFollowupRequest| or
+ * to set up a data-path.
*/
uint32_t peerId;
/**
@@ -1263,47 +1334,60 @@
*/
MacAddress addr;
/**
- * The arbitrary information contained in the |serviceSpecificInfo| of the peer's discovery
- * session.
+ * The arbitrary information contained in the |NanDiscoveryCommonConfig.serviceSpecificInfo| of
+ * the peer's discovery session configuration.
* Max length: |NanCapabilities.maxServiceSpecificInfoLen|.
+ * NAN Spec: Service Descriptor Attribute (SDA) / Service Info
*/
vec<uint8_t> serviceSpecificInfo;
/**
- * Ordered sequence of <length, value> pairs (length uses 1 byte) of the peer's discovery session
- * match filter.
+ * Arbitrary information communicated in discovery packets - there is no semantic meaning to these
+ * bytes. They are passed-through from publisher to subscriber as-is with no parsing.
+ * Max length: |NanCapabilities.maxExtendedServiceSpecificInfoLen|.
+ * Spec: Service Descriptor Extension Attribute (SDEA) / Service Info
+ */
+ vec<uint8_t> extendedServiceSpecificInfo;
+ /**
+ * The match filter from the discovery packet (publish or subscribe) which caused service
+ * discovery. Matches the peer's |NanDiscoveryCommonConfig.txMatchFilter|.
* Max length: |NanCapabilities.maxMatchFilterLen|.
+ * NAN Spec: Service Descriptor Attribute (SDA) / Matching Filter
*/
vec<uint8_t> matchFilter;
/**
- * Indicates the type of discovery: Beacon if true, Service Discovery Frames (SDF) if false.
+ * Indicates the type of discovery: true if match occurred on a Beacon frame, false if the match
+ * occurred on a Service Discovery Frames (SDF).
*/
bool matchOccuredInBeaconFlag;
/**
- * Flag to indicate FW is out of resource and that it can no longer
- * track this Service Name.
+ * Flag to indicate firmware is out of resource and that it can no longer track this Service Name.
+ * Indicates that while |IWifiNanIfaceEventCallback.eventMatch| will be received, the
+ * |NanDiscoveryCommonConfig.discoveryMatchIndicator| configuration will not be honored.
*/
bool outOfResourceFlag;
/**
- * If RSSI filtering was configured in discovery session setup then this
- * field must contain the received RSSI value. It will contain 0 if RSSI filtering was not
- * configured.
+ * If RSSI filtering was enabled using |NanDiscoveryCommonConfig.useRssiThreshold| in discovery
+ * session setup then this field contains the received RSSI value. It will contain 0 if RSSI
+ * filtering was not enabled.
* RSSI values are returned without sign, e.g. -70dBm will be returned as 70.
*/
uint8_t rssiValue;
/**
* Cipher types supported by the peer for data-paths constructed in the context of this discovery
- * session. The |NanCipherSuiteType| bit fields are used to set this value.
+ * session.
*/
bitfield<NanCipherSuiteType> peerSupportedCipherTypes;
/**
* Indicates whether or not the peer requires security enabled in any data-path (NDP) constructed
* in the context of this discovery session.
+ * NAN Spec: Service Discovery Extension Attribute (SDEA) / Control / Security Required
*/
bool peerRequiresSecurityEnabledInNdp;
/**
- * Indicates whether or not the peer requires (and hence allows) ranging in this discovery
- * session.
+ * Indicates whether or not the peer requires (and hence allows) ranging in the context of this
+ * discovery session.
* Note that ranging is only performed if all other match criteria with the peer are met.
+ * NAN Spec: Service Discovery Extension Attribute (SDEA) / Control / Ranging Require.
*/
bool peerRequiresRanging;
/**
@@ -1324,8 +1408,8 @@
*/
uint32_t rangingMeasurementInCm;
/**
- * The ranging event(s) which triggered the ranging. Uses bit-fields from |NanRangingIndication|.
- * E.g. can indicate that continuous ranging is required, or else that an ingress event occurred.
+ * The ranging event(s) which triggered the ranging. E.g. can indicate that continuous ranging was
+ * requested, or else that an ingress event occurred.
*/
bitfield<NanRangingIndication> rangingIndicationType;
};
@@ -1337,10 +1421,12 @@
/**
* Discovery session (publish or subscribe) ID of a previously created discovery session. The
* message is received in the context of this discovery session.
+ * NAN Spec: Service Descriptor Attribute (SDA) / Instance ID
*/
- uint16_t discoverySessionId;
+ uint8_t discoverySessionId;
/**
- * A unique ID of the peer. Can be subsequently used in |transmitFollowupRequest|.
+ * A unique ID of the peer. Can be subsequently used in |IWifiNanIface.transmitFollowupRequest| or
+ * to set up a data-path.
*/
uint32_t peerId;
/**
@@ -1353,10 +1439,19 @@
*/
bool receivedInFaw;
/**
- * Received message as a byte sequence.
+ * Received message from the peer - there is no semantic meaning to these bytes. They are
+ * passed-through from sender to receiver as-is with no parsing.
* Max length: |NanCapabilities.maxServiceSpecificInfoLen|.
+ * NAN Spec: Service Descriptor Attribute (SDA) / Service Info
*/
- vec<uint8_t> message;
+ vec<uint8_t> serviceSpecificInfo;
+ /**
+ * Arbitrary information communicated in discovery packets - there is no semantic meaning to these
+ * bytes. They are passed-through from publisher to subscriber as-is with no parsing.
+ * Max length: |NanCapabilities.maxExtendedServiceSpecificInfoLen|.
+ * Spec: Service Descriptor Extension Attribute (SDEA) / Service Info
+ */
+ vec<uint8_t> extendedServiceSpecificInfo;
};
/**
@@ -1394,54 +1489,6 @@
};
/**
- * Mask to determine on which frames the vendor-specific attribute (VSA) was received on.
- */
-enum NanVsaRxFrameMask: uint32_t {
- DISCOVERY_BEACON_MASK = 1 << 0,
- SYNC_BEACON_MASK = 1 << 1,
- SERVICE_DISCOVERY_MASK = 1 << 2
-};
-
-/**
- * NAN Beacon or SDF Payload Indication Message structure.
- * The BeaconSdfPayloadInd message indicates to the upper layers that information
- * elements were received either in a Beacon or SDF which needs to be delivered
- * outside of a Publish/Subscribe Handle.
- */
-struct NanBeaconSdfPayloadInd {
- /**
- * The MAC address of the peer which sent the attributes.
- */
- MacAddress addr;
- /**
- * A flag indicating whether a vendor-specific attribute (VSA) has been received.
- */
- bool isVsaReceived;
- /**
- * Frames on which this vendor specific attribute was received.
- * Mask |NanVsaRxFrameMask| defined above.
- */
- bitfield<NanVsaRxFrameMask> vsaReceivedOnFrames;
- /**
- * Organizationally Unique Identifier (OUI) of the vendor-specific attribute.
- */
- uint32_t vsaVendorOui;
- /**
- * Contents of the vendor specific attribute.
- * Max length: |NanCapabilities.maxVsaDataLen|.
- */
- vec<uint8_t> vsa;
- /**
- * A flag indicating whether a NAN beacon or SDF payload has been received.
- */
- bool isBeaconSdfPayloadReceived;
- /**
- * The contents of the NAN beacon or SDF payload.
- */
- vec<uint8_t> beaconSdfPayloadData;
-};
-
-/**
* NAN Data path request Indication Message structure.
* Event indication received by an intended Responder when a Nan Data request initiated by an
* Initiator.
@@ -1450,8 +1497,9 @@
/**
* ID of an active publish or subscribe discovery session - the data-path request is in the
* context of this discovery session.
+ * NAN Spec: Data Path Attributes / NDP Attribute / Publish ID
*/
- uint16_t discoverySessionId;
+ uint8_t discoverySessionId;
/**
* MAC address of the Initiator peer. This is the MAC address of the peer's management/discovery
* NAN interface.
@@ -1463,11 +1511,15 @@
uint32_t ndpInstanceId;
/**
* Specifies whether or not security is required by the peer for the data-path being created.
+ * NAN Spec: Data Path Attributes / NDP Attribute / NDP Control / Security Present
*/
bool securityRequired;
/**
- * Arbitrary token transmitted by the peer as part of the data-path negotiation (not encrypted).
+ * Arbitrary information communicated from the peer as part of the data-path setup process - there
+ * is no semantic meaning to these bytes. They are passed-through from sender to receiver as-is
+ * with no parsing.
* Max length: |NanCapabilities.maxAppInfoLen|.
+ * NAN Spec: Data Path Attributes / NDP Attribute / NDP Specific Info
*/
vec<uint8_t> appInfo;
};
@@ -1491,8 +1543,11 @@
*/
MacAddress peerNdiMacAddr;
/**
- * Arbitrary token transmitted by the peer as part of the data-path negotiation (not encrypted).
+ * Arbitrary information communicated from the peer as part of the data-path setup process - there
+ * is no semantic meaning to these bytes. They are passed-through from sender to receiver as-is
+ * with no parsing.
* Max length: |NanCapabilities.maxAppInfoLen|.
+ * NAN Spec: Data Path Attributes / NDP Attribute / NDP Specific Info
*/
vec<uint8_t> appInfo;
/**
diff --git a/wifi/1.0/vts/Android.mk b/wifi/1.0/vts/Android.mk
deleted file mode 100644
index d347136..0000000
--- a/wifi/1.0/vts/Android.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-# include hidl test makefiles
-include $(LOCAL_PATH)/functional/vts/testcases/hal/wifi/hidl/Android.mk
diff --git a/wifi/1.0/vts/Wifi.vts b/wifi/1.0/vts/Wifi.vts
index 608e012..3f567a4 100644
--- a/wifi/1.0/vts/Wifi.vts
+++ b/wifi/1.0/vts/Wifi.vts
@@ -4,9 +4,20 @@
package: "android.hardware.wifi"
+import: "android.hardware.wifi@1.0::IWifiApIface"
import: "android.hardware.wifi@1.0::IWifiChip"
+import: "android.hardware.wifi@1.0::IWifiChipEventCallback"
import: "android.hardware.wifi@1.0::IWifiEventCallback"
+import: "android.hardware.wifi@1.0::IWifiIface"
+import: "android.hardware.wifi@1.0::IWifiNanIface"
+import: "android.hardware.wifi@1.0::IWifiNanIfaceEventCallback"
+import: "android.hardware.wifi@1.0::IWifiP2pIface"
+import: "android.hardware.wifi@1.0::IWifiRttController"
+import: "android.hardware.wifi@1.0::IWifiRttControllerEventCallback"
+import: "android.hardware.wifi@1.0::IWifiStaIface"
+import: "android.hardware.wifi@1.0::IWifiStaIfaceEventCallback"
import: "android.hardware.wifi@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
api: {
@@ -17,8 +28,7 @@
}
arg: {
type: TYPE_HIDL_CALLBACK
- predefined_type: "IWifiEventCallback"
- is_callback: true
+ predefined_type: "::android::hardware::wifi::V1_0::IWifiEventCallback"
}
callflow: {
entry: true
@@ -95,8 +105,7 @@
}
return_type_hidl: {
type: TYPE_HIDL_INTERFACE
- predefined_type: "IWifiChip"
- is_callback: false
+ predefined_type: "::android::hardware::wifi::V1_0::IWifiChip"
}
arg: {
type: TYPE_SCALAR
diff --git a/wifi/1.0/vts/WifiApIface.vts b/wifi/1.0/vts/WifiApIface.vts
index c4f3640..6b58058 100644
--- a/wifi/1.0/vts/WifiApIface.vts
+++ b/wifi/1.0/vts/WifiApIface.vts
@@ -5,6 +5,8 @@
package: "android.hardware.wifi"
import: "android.hardware.wifi@1.0::IWifiIface"
+import: "android.hardware.wifi@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
api: {
@@ -30,4 +32,20 @@
}
}
+ api: {
+ name: "setCountryCode"
+ return_type_hidl: {
+ type: TYPE_STRUCT
+ predefined_type: "::android::hardware::wifi::V1_0::WifiStatus"
+ }
+ arg: {
+ type: TYPE_ARRAY
+ vector_size: 2
+ vector_value: {
+ type: TYPE_SCALAR
+ scalar_type: "int8_t"
+ }
+ }
+ }
+
}
diff --git a/wifi/1.0/vts/WifiChip.vts b/wifi/1.0/vts/WifiChip.vts
index 4b278c1..1208202 100644
--- a/wifi/1.0/vts/WifiChip.vts
+++ b/wifi/1.0/vts/WifiChip.vts
@@ -8,10 +8,14 @@
import: "android.hardware.wifi@1.0::IWifiChipEventCallback"
import: "android.hardware.wifi@1.0::IWifiIface"
import: "android.hardware.wifi@1.0::IWifiNanIface"
+import: "android.hardware.wifi@1.0::IWifiNanIfaceEventCallback"
import: "android.hardware.wifi@1.0::IWifiP2pIface"
import: "android.hardware.wifi@1.0::IWifiRttController"
+import: "android.hardware.wifi@1.0::IWifiRttControllerEventCallback"
import: "android.hardware.wifi@1.0::IWifiStaIface"
+import: "android.hardware.wifi@1.0::IWifiStaIfaceEventCallback"
import: "android.hardware.wifi@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
attribute: {
@@ -137,8 +141,7 @@
}
arg: {
type: TYPE_HIDL_CALLBACK
- predefined_type: "IWifiChipEventCallback"
- is_callback: true
+ predefined_type: "::android::hardware::wifi::V1_0::IWifiChipEventCallback"
}
}
@@ -150,6 +153,7 @@
}
return_type_hidl: {
type: TYPE_MASK
+ scalar_type: "uint32_t"
predefined_type: "::android::hardware::wifi::V1_0::IWifiChip::ChipCapabilityMask"
}
}
@@ -243,8 +247,7 @@
}
return_type_hidl: {
type: TYPE_HIDL_INTERFACE
- predefined_type: "IWifiApIface"
- is_callback: false
+ predefined_type: "::android::hardware::wifi::V1_0::IWifiApIface"
}
}
@@ -270,8 +273,7 @@
}
return_type_hidl: {
type: TYPE_HIDL_INTERFACE
- predefined_type: "IWifiApIface"
- is_callback: false
+ predefined_type: "::android::hardware::wifi::V1_0::IWifiApIface"
}
arg: {
type: TYPE_STRING
@@ -297,8 +299,7 @@
}
return_type_hidl: {
type: TYPE_HIDL_INTERFACE
- predefined_type: "IWifiNanIface"
- is_callback: false
+ predefined_type: "::android::hardware::wifi::V1_0::IWifiNanIface"
}
}
@@ -324,8 +325,7 @@
}
return_type_hidl: {
type: TYPE_HIDL_INTERFACE
- predefined_type: "IWifiNanIface"
- is_callback: false
+ predefined_type: "::android::hardware::wifi::V1_0::IWifiNanIface"
}
arg: {
type: TYPE_STRING
@@ -351,8 +351,7 @@
}
return_type_hidl: {
type: TYPE_HIDL_INTERFACE
- predefined_type: "IWifiP2pIface"
- is_callback: false
+ predefined_type: "::android::hardware::wifi::V1_0::IWifiP2pIface"
}
}
@@ -378,8 +377,7 @@
}
return_type_hidl: {
type: TYPE_HIDL_INTERFACE
- predefined_type: "IWifiP2pIface"
- is_callback: false
+ predefined_type: "::android::hardware::wifi::V1_0::IWifiP2pIface"
}
arg: {
type: TYPE_STRING
@@ -405,8 +403,7 @@
}
return_type_hidl: {
type: TYPE_HIDL_INTERFACE
- predefined_type: "IWifiStaIface"
- is_callback: false
+ predefined_type: "::android::hardware::wifi::V1_0::IWifiStaIface"
}
}
@@ -432,8 +429,7 @@
}
return_type_hidl: {
type: TYPE_HIDL_INTERFACE
- predefined_type: "IWifiStaIface"
- is_callback: false
+ predefined_type: "::android::hardware::wifi::V1_0::IWifiStaIface"
}
arg: {
type: TYPE_STRING
@@ -459,13 +455,11 @@
}
return_type_hidl: {
type: TYPE_HIDL_INTERFACE
- predefined_type: "IWifiRttController"
- is_callback: false
+ predefined_type: "::android::hardware::wifi::V1_0::IWifiRttController"
}
arg: {
type: TYPE_HIDL_INTERFACE
- predefined_type: "IWifiIface"
- is_callback: false
+ predefined_type: "::android::hardware::wifi::V1_0::IWifiIface"
}
}
diff --git a/wifi/1.0/vts/WifiChipEventCallback.vts b/wifi/1.0/vts/WifiChipEventCallback.vts
index c755162..2246f82 100644
--- a/wifi/1.0/vts/WifiChipEventCallback.vts
+++ b/wifi/1.0/vts/WifiChipEventCallback.vts
@@ -5,6 +5,7 @@
package: "android.hardware.wifi"
import: "android.hardware.wifi@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
api: {
diff --git a/wifi/1.0/vts/WifiEventCallback.vts b/wifi/1.0/vts/WifiEventCallback.vts
index a0cf667..60ec87c 100644
--- a/wifi/1.0/vts/WifiEventCallback.vts
+++ b/wifi/1.0/vts/WifiEventCallback.vts
@@ -5,6 +5,7 @@
package: "android.hardware.wifi"
import: "android.hardware.wifi@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
api: {
diff --git a/wifi/1.0/vts/WifiIface.vts b/wifi/1.0/vts/WifiIface.vts
index 1434a3e..0de0f8d 100644
--- a/wifi/1.0/vts/WifiIface.vts
+++ b/wifi/1.0/vts/WifiIface.vts
@@ -5,6 +5,7 @@
package: "android.hardware.wifi"
import: "android.hardware.wifi@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
api: {
diff --git a/wifi/1.0/vts/WifiNanIface.vts b/wifi/1.0/vts/WifiNanIface.vts
index 663b526..66c8755 100644
--- a/wifi/1.0/vts/WifiNanIface.vts
+++ b/wifi/1.0/vts/WifiNanIface.vts
@@ -7,6 +7,7 @@
import: "android.hardware.wifi@1.0::IWifiIface"
import: "android.hardware.wifi@1.0::IWifiNanIfaceEventCallback"
import: "android.hardware.wifi@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
api: {
@@ -40,8 +41,7 @@
}
arg: {
type: TYPE_HIDL_CALLBACK
- predefined_type: "IWifiNanIfaceEventCallback"
- is_callback: true
+ predefined_type: "::android::hardware::wifi::V1_0::IWifiNanIfaceEventCallback"
}
}
@@ -129,7 +129,7 @@
}
arg: {
type: TYPE_SCALAR
- scalar_type: "uint16_t"
+ scalar_type: "uint8_t"
}
}
@@ -161,7 +161,7 @@
}
arg: {
type: TYPE_SCALAR
- scalar_type: "uint16_t"
+ scalar_type: "uint8_t"
}
}
@@ -259,20 +259,4 @@
}
}
- api: {
- name: "beaconSdfPayloadRequest"
- return_type_hidl: {
- type: TYPE_STRUCT
- predefined_type: "::android::hardware::wifi::V1_0::WifiStatus"
- }
- arg: {
- type: TYPE_SCALAR
- scalar_type: "uint16_t"
- }
- arg: {
- type: TYPE_STRUCT
- predefined_type: "::android::hardware::wifi::V1_0::NanBeaconSdfPayloadRequest"
- }
- }
-
}
diff --git a/wifi/1.0/vts/WifiNanIfaceEventCallback.vts b/wifi/1.0/vts/WifiNanIfaceEventCallback.vts
index 30ca88a..e3e82f7 100644
--- a/wifi/1.0/vts/WifiNanIfaceEventCallback.vts
+++ b/wifi/1.0/vts/WifiNanIfaceEventCallback.vts
@@ -5,6 +5,7 @@
package: "android.hardware.wifi"
import: "android.hardware.wifi@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
api: {
@@ -71,7 +72,7 @@
}
arg: {
type: TYPE_SCALAR
- scalar_type: "uint16_t"
+ scalar_type: "uint8_t"
}
}
@@ -99,7 +100,7 @@
}
arg: {
type: TYPE_SCALAR
- scalar_type: "uint16_t"
+ scalar_type: "uint8_t"
}
}
@@ -161,6 +162,10 @@
type: TYPE_STRUCT
predefined_type: "::android::hardware::wifi::V1_0::WifiNanStatus"
}
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
}
api: {
@@ -173,10 +178,6 @@
type: TYPE_STRUCT
predefined_type: "::android::hardware::wifi::V1_0::WifiNanStatus"
}
- arg: {
- type: TYPE_SCALAR
- scalar_type: "uint32_t"
- }
}
api: {
@@ -192,18 +193,6 @@
}
api: {
- name: "notifyBeaconSdfPayloadResponse"
- arg: {
- type: TYPE_SCALAR
- scalar_type: "uint16_t"
- }
- arg: {
- type: TYPE_STRUCT
- predefined_type: "::android::hardware::wifi::V1_0::WifiNanStatus"
- }
- }
-
- api: {
name: "eventClusterEvent"
arg: {
type: TYPE_STRUCT
@@ -223,7 +212,7 @@
name: "eventPublishTerminated"
arg: {
type: TYPE_SCALAR
- scalar_type: "uint16_t"
+ scalar_type: "uint8_t"
}
arg: {
type: TYPE_STRUCT
@@ -235,7 +224,7 @@
name: "eventSubscribeTerminated"
arg: {
type: TYPE_SCALAR
- scalar_type: "uint16_t"
+ scalar_type: "uint8_t"
}
arg: {
type: TYPE_STRUCT
@@ -255,7 +244,7 @@
name: "eventMatchExpired"
arg: {
type: TYPE_SCALAR
- scalar_type: "uint16_t"
+ scalar_type: "uint8_t"
}
arg: {
type: TYPE_SCALAR
@@ -307,12 +296,4 @@
}
}
- api: {
- name: "eventBeaconSdfPayload"
- arg: {
- type: TYPE_STRUCT
- predefined_type: "::android::hardware::wifi::V1_0::NanBeaconSdfPayloadInd"
- }
- }
-
}
diff --git a/wifi/1.0/vts/WifiP2pIface.vts b/wifi/1.0/vts/WifiP2pIface.vts
index b40c81e..220f332 100644
--- a/wifi/1.0/vts/WifiP2pIface.vts
+++ b/wifi/1.0/vts/WifiP2pIface.vts
@@ -5,6 +5,8 @@
package: "android.hardware.wifi"
import: "android.hardware.wifi@1.0::IWifiIface"
+import: "android.hardware.wifi@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
api: {
diff --git a/wifi/1.0/vts/WifiRttController.vts b/wifi/1.0/vts/WifiRttController.vts
index 0fd3626..45fb309 100644
--- a/wifi/1.0/vts/WifiRttController.vts
+++ b/wifi/1.0/vts/WifiRttController.vts
@@ -7,6 +7,7 @@
import: "android.hardware.wifi@1.0::IWifiIface"
import: "android.hardware.wifi@1.0::IWifiRttControllerEventCallback"
import: "android.hardware.wifi@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
api: {
@@ -17,8 +18,7 @@
}
return_type_hidl: {
type: TYPE_HIDL_INTERFACE
- predefined_type: "IWifiIface"
- is_callback: false
+ predefined_type: "::android::hardware::wifi::V1_0::IWifiIface"
}
}
@@ -30,8 +30,7 @@
}
arg: {
type: TYPE_HIDL_CALLBACK
- predefined_type: "IWifiRttControllerEventCallback"
- is_callback: true
+ predefined_type: "::android::hardware::wifi::V1_0::IWifiRttControllerEventCallback"
}
}
@@ -68,8 +67,8 @@
type: TYPE_VECTOR
vector_value: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
diff --git a/wifi/1.0/vts/WifiRttControllerEventCallback.vts b/wifi/1.0/vts/WifiRttControllerEventCallback.vts
index 028fd03..e3c2651 100644
--- a/wifi/1.0/vts/WifiRttControllerEventCallback.vts
+++ b/wifi/1.0/vts/WifiRttControllerEventCallback.vts
@@ -5,6 +5,7 @@
package: "android.hardware.wifi"
import: "android.hardware.wifi@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
api: {
diff --git a/wifi/1.0/vts/WifiStaIface.vts b/wifi/1.0/vts/WifiStaIface.vts
index 0cff792..1edf4db 100644
--- a/wifi/1.0/vts/WifiStaIface.vts
+++ b/wifi/1.0/vts/WifiStaIface.vts
@@ -7,6 +7,7 @@
import: "android.hardware.wifi@1.0::IWifiIface"
import: "android.hardware.wifi@1.0::IWifiStaIfaceEventCallback"
import: "android.hardware.wifi@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
attribute: {
@@ -109,8 +110,7 @@
}
arg: {
type: TYPE_HIDL_CALLBACK
- predefined_type: "IWifiStaIfaceEventCallback"
- is_callback: true
+ predefined_type: "::android::hardware::wifi::V1_0::IWifiStaIfaceEventCallback"
}
}
@@ -122,6 +122,7 @@
}
return_type_hidl: {
type: TYPE_MASK
+ scalar_type: "uint32_t"
predefined_type: "::android::hardware::wifi::V1_0::IWifiStaIface::StaIfaceCapabilityMask"
}
}
@@ -351,16 +352,16 @@
}
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
}
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -384,15 +385,23 @@
}
api: {
- name: "startDebugPacketFateMonitoring"
+ name: "setScanningMacOui"
return_type_hidl: {
type: TYPE_STRUCT
predefined_type: "::android::hardware::wifi::V1_0::WifiStatus"
}
+ arg: {
+ type: TYPE_ARRAY
+ vector_size: 3
+ vector_value: {
+ type: TYPE_SCALAR
+ scalar_type: "uint8_t"
+ }
+ }
}
api: {
- name: "stopDebugPacketFateMonitoring"
+ name: "startDebugPacketFateMonitoring"
return_type_hidl: {
type: TYPE_STRUCT
predefined_type: "::android::hardware::wifi::V1_0::WifiStatus"
diff --git a/wifi/1.0/vts/WifiStaIfaceEventCallback.vts b/wifi/1.0/vts/WifiStaIfaceEventCallback.vts
index b04ad26..99bf03f 100644
--- a/wifi/1.0/vts/WifiStaIfaceEventCallback.vts
+++ b/wifi/1.0/vts/WifiStaIfaceEventCallback.vts
@@ -5,6 +5,7 @@
package: "android.hardware.wifi"
import: "android.hardware.wifi@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
api: {
@@ -50,8 +51,8 @@
}
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
diff --git a/wifi/1.0/vts/functional/Android.bp b/wifi/1.0/vts/functional/Android.bp
index 422eec5..8a5d7e0 100644
--- a/wifi/1.0/vts/functional/Android.bp
+++ b/wifi/1.0/vts/functional/Android.bp
@@ -21,6 +21,7 @@
"main.cpp",
"wifi_ap_iface_hidl_test.cpp",
"wifi_chip_hidl_test.cpp",
+ "wifi_hidl_call_util_selftest.cpp",
"wifi_hidl_test.cpp",
"wifi_hidl_test_utils.cpp",
"wifi_nan_iface_hidl_test.cpp",
@@ -40,11 +41,7 @@
],
static_libs: ["libgtest"],
cflags: [
- "--coverage",
"-O0",
"-g",
],
- ldflags: [
- "--coverage"
- ]
}
diff --git a/wifi/1.0/vts/functional/Android.mk b/wifi/1.0/vts/functional/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/wifi/1.0/vts/functional/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/wifi/1.0/vts/functional/vts/testcases/hal/wifi/__init__.py b/wifi/1.0/vts/functional/vts/testcases/hal/wifi/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/wifi/1.0/vts/functional/vts/testcases/hal/wifi/__init__.py
+++ /dev/null
diff --git a/wifi/1.0/vts/functional/vts/testcases/hal/wifi/hidl/Android.mk b/wifi/1.0/vts/functional/vts/testcases/hal/wifi/hidl/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/wifi/1.0/vts/functional/vts/testcases/hal/wifi/hidl/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/wifi/1.0/vts/functional/vts/testcases/hal/wifi/hidl/__init__.py b/wifi/1.0/vts/functional/vts/testcases/hal/wifi/hidl/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/wifi/1.0/vts/functional/vts/testcases/hal/wifi/hidl/__init__.py
+++ /dev/null
diff --git a/wifi/1.0/vts/functional/vts/testcases/hal/wifi/hidl/target/Android.mk b/wifi/1.0/vts/functional/vts/testcases/hal/wifi/hidl/target/Android.mk
deleted file mode 100644
index 40f154e..0000000
--- a/wifi/1.0/vts/functional/vts/testcases/hal/wifi/hidl/target/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2016 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := HalWifiHidlTargetTest
-VTS_CONFIG_SRC_DIR := testcases/hal/wifi/hidl/target
-include test/vts/tools/build/Android.host_config.mk
diff --git a/wifi/1.0/vts/functional/vts/testcases/hal/wifi/hidl/target/AndroidTest.xml b/wifi/1.0/vts/functional/vts/testcases/hal/wifi/hidl/target/AndroidTest.xml
deleted file mode 100644
index 1099a5a..0000000
--- a/wifi/1.0/vts/functional/vts/testcases/hal/wifi/hidl/target/AndroidTest.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<configuration description="Config for VTS WiFi HIDL HAL's basic target-side test cases">
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HidlHalTest.push" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="HalWifiHidlTargetTest" />
- <option name="binary-test-sources" value="
- _32bit::DATA/nativetest/wifi_hidl_test/wifi_hidl_test,
- _64bit::DATA/nativetest64/wifi_hidl_test/wifi_hidl_test,
- "/>
- <option name="binary-test-type" value="gtest" />
- <option name="test-timeout" value="10m" />
- </test>
-</configuration>
diff --git a/wifi/1.0/vts/functional/wifi_hidl_call_util.h b/wifi/1.0/vts/functional/wifi_hidl_call_util.h
new file mode 100644
index 0000000..03200a0
--- /dev/null
+++ b/wifi/1.0/vts/functional/wifi_hidl_call_util.h
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2017 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.
+ */
+
+#pragma once
+
+#include <functional>
+#include <tuple>
+#include <type_traits>
+#include <utility>
+
+#include <gtest/gtest.h>
+
+namespace {
+namespace detail {
+template <typename>
+struct functionArgSaver;
+
+// Provides a std::function that takes one argument, and a buffer
+// wherein the function will store its argument. The buffer has
+// the same type as the argument, but with const and reference
+// modifiers removed.
+template <typename ArgT>
+struct functionArgSaver<std::function<void(ArgT)>> final {
+ using StorageT = typename std::remove_const<
+ typename std::remove_reference<ArgT>::type>::type;
+
+ std::function<void(ArgT)> saveArgs = [this](ArgT arg) {
+ this->saved_values = arg;
+ };
+
+ StorageT saved_values;
+};
+
+// Provides a std::function that takes two arguments, and a buffer
+// wherein the function will store its arguments. The buffer is a
+// std::pair, whose elements have the same types as the arguments
+// (but with const and reference modifiers removed).
+template <typename Arg1T, typename Arg2T>
+struct functionArgSaver<std::function<void(Arg1T, Arg2T)>> final {
+ using StorageT =
+ std::pair<typename std::remove_const<
+ typename std::remove_reference<Arg1T>::type>::type,
+ typename std::remove_const<
+ typename std::remove_reference<Arg2T>::type>::type>;
+
+ std::function<void(Arg1T, Arg2T)> saveArgs = [this](Arg1T arg1,
+ Arg2T arg2) {
+ this->saved_values = {arg1, arg2};
+ };
+
+ StorageT saved_values;
+};
+
+// Provides a std::function that takes three or more arguments, and a
+// buffer wherein the function will store its arguments. The buffer is a
+// std::tuple whose elements have the same types as the arguments (but
+// with const and reference modifiers removed).
+template <typename... ArgT>
+struct functionArgSaver<std::function<void(ArgT...)>> final {
+ using StorageT = std::tuple<typename std::remove_const<
+ typename std::remove_reference<ArgT>::type>::type...>;
+
+ std::function<void(ArgT...)> saveArgs = [this](ArgT... arg) {
+ this->saved_values = {arg...};
+ };
+
+ StorageT saved_values;
+};
+
+// Invokes |method| on |object|, providing |method| a CallbackT as the
+// final argument. Returns a copy of the parameters that |method| provided
+// to CallbackT. (The parameters are returned by value.)
+template <typename CallbackT, typename MethodT, typename ObjectT,
+ typename... ArgT>
+typename functionArgSaver<CallbackT>::StorageT invokeMethod(
+ MethodT method, ObjectT object, ArgT&&... methodArg) {
+ functionArgSaver<CallbackT> result_buffer;
+ const auto& res = ((*object).*method)(std::forward<ArgT>(methodArg)...,
+ result_buffer.saveArgs);
+ EXPECT_TRUE(res.isOk());
+ return result_buffer.saved_values;
+}
+} // namespace detail
+} // namespace
+
+// Invokes |method| on |strong_pointer|, passing provided arguments through to
+// |method|.
+//
+// Returns either:
+// - A copy of the result callback parameter (for callbacks with a single
+// parameter), OR
+// - A pair containing a copy of the result callback parameters (for callbacks
+// with two parameters), OR
+// - A tuple containing a copy of the result callback paramters (for callbacks
+// with three or more parameters).
+//
+// Example usage:
+// EXPECT_EQ(WifiStatusCode::SUCCESS,
+// HIDL_INVOKE(strong_pointer, methodReturningWifiStatus).code);
+// EXPECT_EQ(WifiStatusCode::SUCCESS,
+// HIDL_INVOKE(strong_pointer, methodReturningWifiStatusAndOneMore)
+// .first.code);
+// EXPECT_EQ(WifiStatusCode::SUCCESS, std::get<0>(
+// HIDL_INVOKE(strong_pointer, methodReturningWifiStatusAndTwoMore))
+// .code);
+#define HIDL_INVOKE(strong_pointer, method, ...) \
+ (detail::invokeMethod< \
+ std::remove_reference<decltype(*strong_pointer)>::type::method##_cb>( \
+ &std::remove_reference<decltype(*strong_pointer)>::type::method, \
+ strong_pointer, ##__VA_ARGS__))
diff --git a/wifi/1.0/vts/functional/wifi_hidl_call_util_selftest.cpp b/wifi/1.0/vts/functional/wifi_hidl_call_util_selftest.cpp
new file mode 100644
index 0000000..129bdb2
--- /dev/null
+++ b/wifi/1.0/vts/functional/wifi_hidl_call_util_selftest.cpp
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2017 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.
+ */
+
+#include <functional>
+#include <type_traits>
+
+#include <hidl/Status.h>
+#include <utils/RefBase.h>
+#include <utils/StrongPointer.h>
+
+#include "wifi_hidl_call_util.h"
+
+namespace {
+/*
+ * Example of a user-defined data-type.
+ *
+ * Used to verify that, within the internals of HIDL_INVOKE,
+ * reference parameters are stored by copy.
+ */
+class Dummy {};
+
+/*
+ * Example of what a HIDL-generated proxy might look like.
+ */
+class IExample : public ::android::RefBase {
+ public:
+ // The callback type, for a method called startWithCallbackCopy, which
+ // has a callback that takes an |int|. Both the name, and the value,
+ // must match what would appear in HIDL-generated code.
+ using startWithCallbackCopy_cb = std::function<void(int)>;
+
+ // The callback type, for a method called startWithCallbackReference, which
+ // has a callback that takes an |int|. Both the name, and the value,
+ // must match what would appear in HIDL-generated code.
+ using startWithCallbackReference_cb = std::function<void(int)>;
+
+ // Constants which allow tests to verify that the proxy methods can
+ // correctly return a value. We use different values for by-copy and
+ // by-reference, to double-check that a call was dispatched properly.
+ static constexpr int kByCopyResult = 42;
+ static constexpr int kByReferenceResult = 420;
+
+ // Example of what a no-arg method would look like, if the callback
+ // is passed by-value.
+ ::android::hardware::Return<void> startWithCallbackCopy(
+ startWithCallbackCopy_cb _hidl_cb) {
+ _hidl_cb(kByCopyResult);
+ return ::android::hardware::Void();
+ }
+ // Example of what a no-arg method would look like, if the callback
+ // is passed by const-reference.
+ ::android::hardware::Return<void> startWithCallbackReference(
+ const startWithCallbackReference_cb& _hidl_cb) {
+ _hidl_cb(kByReferenceResult);
+ return ::android::hardware::Void();
+ }
+};
+
+constexpr int IExample::kByCopyResult;
+constexpr int IExample::kByReferenceResult;
+} // namespace
+
+static_assert(std::is_same<int, detail::functionArgSaver<
+ std::function<void(int)>>::StorageT>::value,
+ "Single-arg result should be stored directly.");
+
+static_assert(
+ std::is_same<std::pair<int, long>, detail::functionArgSaver<std::function<
+ void(int, long)>>::StorageT>::value,
+ "Two-arg result should be stored as a pair.");
+
+static_assert(
+ std::is_same<std::tuple<char, int, long>,
+ detail::functionArgSaver<
+ std::function<void(char, int, long)>>::StorageT>::value,
+ "Three-arg result should be stored as a tuple.");
+
+static_assert(std::is_same<Dummy, detail::functionArgSaver<std::function<
+ void(const Dummy&)>>::StorageT>::value,
+ "Reference should be stored by copy.");
+
+/*
+ * Verifies that HIDL_INVOKE can be used with methods that take the result
+ * callback as a by-value parameter. (This reflects the current implementation
+ * of HIDL-generated code.)
+ */
+TEST(HidlInvokeTest, WorksWithMethodThatTakesResultCallbackByValue) {
+ ::android::sp<IExample> sp = new IExample();
+ EXPECT_EQ(IExample::kByCopyResult, HIDL_INVOKE(sp, startWithCallbackCopy));
+}
+
+/*
+ * Verifies that HIDL_INVOKE can be used with methods that take the result
+ * callback as a const-reference parameter. (This ensures that HIDL_INVOKE will
+ * continue to work, if the HIDL-generated code switches to const-ref.)
+ */
+TEST(HidlInvokeTest, WorksWithMethodThatTakesResultCallbackByConstReference) {
+ ::android::sp<IExample> sp = new IExample();
+ EXPECT_EQ(IExample::kByReferenceResult,
+ HIDL_INVOKE(sp, startWithCallbackReference));
+}
diff --git a/wifi/1.0/vts/functional/wifi_hidl_test_utils.cpp b/wifi/1.0/vts/functional/wifi_hidl_test_utils.cpp
index 050bba3..8f34a88 100644
--- a/wifi/1.0/vts/functional/wifi_hidl_test_utils.cpp
+++ b/wifi/1.0/vts/functional/wifi_hidl_test_utils.cpp
@@ -16,6 +16,7 @@
#include <gtest/gtest.h>
+#include "wifi_hidl_call_util.h"
#include "wifi_hidl_test_utils.h"
using ::android::hardware::wifi::V1_0::IWifi;
@@ -52,41 +53,23 @@
return nullptr;
}
- bool operation_failed = false;
- wifi->start([&](WifiStatus status) {
- if (status.code != WifiStatusCode::SUCCESS) {
- operation_failed = true;
- }
- });
- if (operation_failed) {
+ if (HIDL_INVOKE(wifi, start).code != WifiStatusCode::SUCCESS) {
return nullptr;
}
- std::vector<ChipId> wifi_chip_ids;
- wifi->getChipIds(
- [&](const WifiStatus& status, const hidl_vec<ChipId>& chip_ids) {
- if (status.code != WifiStatusCode::SUCCESS) {
- operation_failed = true;
- }
- wifi_chip_ids = chip_ids;
- });
- // We don't expect more than 1 chip currently.
- if (operation_failed || wifi_chip_ids.size() != 1) {
+ const auto& status_and_chip_ids = HIDL_INVOKE(wifi, getChipIds);
+ const auto& chip_ids = status_and_chip_ids.second;
+ if (status_and_chip_ids.first.code != WifiStatusCode::SUCCESS ||
+ chip_ids.size() != 1) {
return nullptr;
}
- sp<IWifiChip> wifi_chip;
- wifi->getChip(wifi_chip_ids[0],
- [&](const WifiStatus& status, const sp<IWifiChip>& chip) {
- if (status.code != WifiStatusCode::SUCCESS) {
- operation_failed = true;
- }
- wifi_chip = chip;
- });
- if (operation_failed) {
+ const auto& status_and_chip = HIDL_INVOKE(wifi, getChip, chip_ids[0]);
+ if (status_and_chip.first.code != WifiStatusCode::SUCCESS) {
return nullptr;
}
- return wifi_chip;
+
+ return status_and_chip.second;
}
// Since we currently only support one iface of each type. Just iterate thru the
@@ -116,30 +99,18 @@
bool configureChipToSupportIfaceType(const sp<IWifiChip>& wifi_chip,
IfaceType type) {
- bool operation_failed = false;
- std::vector<IWifiChip::ChipMode> chip_modes;
- wifi_chip->getAvailableModes(
- [&](WifiStatus status, const hidl_vec<IWifiChip::ChipMode>& modes) {
- if (status.code != WifiStatusCode::SUCCESS) {
- operation_failed = true;
- }
- chip_modes = modes;
- });
- if (operation_failed) {
+ const auto& status_and_modes = HIDL_INVOKE(wifi_chip, getAvailableModes);
+ if (status_and_modes.first.code != WifiStatusCode::SUCCESS) {
return false;
}
ChipModeId mode_id;
- if (!findModeToSupportIfaceType(type, chip_modes, &mode_id)) {
+ if (!findModeToSupportIfaceType(type, status_and_modes.second, &mode_id)) {
return false;
}
- wifi_chip->configureChip(mode_id, [&](WifiStatus status) {
- if (status.code != WifiStatusCode::SUCCESS) {
- operation_failed = true;
- }
- });
- if (operation_failed) {
+ if (HIDL_INVOKE(wifi_chip, configureChip, mode_id).code !=
+ WifiStatusCode::SUCCESS) {
return false;
}
return true;
@@ -154,19 +125,11 @@
return nullptr;
}
- bool operation_failed = false;
- sp<IWifiApIface> wifi_ap_iface;
- wifi_chip->createApIface(
- [&](const WifiStatus& status, const sp<IWifiApIface>& iface) {
- if (status.code != WifiStatusCode::SUCCESS) {
- operation_failed = true;
- }
- wifi_ap_iface = iface;
- });
- if (operation_failed) {
+ const auto& status_and_iface = HIDL_INVOKE(wifi_chip, createApIface);
+ if (status_and_iface.first.code != WifiStatusCode::SUCCESS) {
return nullptr;
}
- return wifi_ap_iface;
+ return status_and_iface.second;
}
sp<IWifiNanIface> getWifiNanIface() {
@@ -178,19 +141,11 @@
return nullptr;
}
- bool operation_failed = false;
- sp<IWifiNanIface> wifi_nan_iface;
- wifi_chip->createNanIface(
- [&](const WifiStatus& status, const sp<IWifiNanIface>& iface) {
- if (status.code != WifiStatusCode::SUCCESS) {
- operation_failed = true;
- }
- wifi_nan_iface = iface;
- });
- if (operation_failed) {
+ const auto& status_and_iface = HIDL_INVOKE(wifi_chip, createNanIface);
+ if (status_and_iface.first.code != WifiStatusCode::SUCCESS) {
return nullptr;
}
- return wifi_nan_iface;
+ return status_and_iface.second;
}
sp<IWifiP2pIface> getWifiP2pIface() {
@@ -202,19 +157,11 @@
return nullptr;
}
- bool operation_failed = false;
- sp<IWifiP2pIface> wifi_p2p_iface;
- wifi_chip->createP2pIface(
- [&](const WifiStatus& status, const sp<IWifiP2pIface>& iface) {
- if (status.code != WifiStatusCode::SUCCESS) {
- operation_failed = true;
- }
- wifi_p2p_iface = iface;
- });
- if (operation_failed) {
+ const auto& status_and_iface = HIDL_INVOKE(wifi_chip, createP2pIface);
+ if (status_and_iface.first.code != WifiStatusCode::SUCCESS) {
return nullptr;
}
- return wifi_p2p_iface;
+ return status_and_iface.second;
}
sp<IWifiStaIface> getWifiStaIface() {
@@ -226,19 +173,11 @@
return nullptr;
}
- bool operation_failed = false;
- sp<IWifiStaIface> wifi_sta_iface;
- wifi_chip->createStaIface(
- [&](const WifiStatus& status, const sp<IWifiStaIface>& iface) {
- if (status.code != WifiStatusCode::SUCCESS) {
- operation_failed = true;
- }
- wifi_sta_iface = iface;
- });
- if (operation_failed) {
+ const auto& status_and_iface = HIDL_INVOKE(wifi_chip, createStaIface);
+ if (status_and_iface.first.code != WifiStatusCode::SUCCESS) {
return nullptr;
}
- return wifi_sta_iface;
+ return status_and_iface.second;
}
sp<IWifiRttController> getWifiRttController() {
@@ -251,26 +190,16 @@
return nullptr;
}
- bool operation_failed = false;
- sp<IWifiRttController> wifi_rtt_controller;
- wifi_chip->createRttController(
- wifi_sta_iface, [&](const WifiStatus& status,
- const sp<IWifiRttController>& controller) {
- if (status.code != WifiStatusCode::SUCCESS) {
- operation_failed = true;
- }
- wifi_rtt_controller = controller;
- });
- if (operation_failed) {
+ const auto& status_and_controller =
+ HIDL_INVOKE(wifi_chip, createRttController, wifi_sta_iface);
+ if (status_and_controller.first.code != WifiStatusCode::SUCCESS) {
return nullptr;
}
- return wifi_rtt_controller;
+ return status_and_controller.second;
}
void stopWifi() {
sp<IWifi> wifi = getWifi();
ASSERT_NE(wifi, nullptr);
- wifi->stop([](const WifiStatus& status) {
- ASSERT_EQ(status.code, WifiStatusCode::SUCCESS);
- });
+ ASSERT_EQ(HIDL_INVOKE(wifi, stop).code, WifiStatusCode::SUCCESS);
}
diff --git a/wifi/1.0/vts/types.vts b/wifi/1.0/vts/types.vts
index fd60d4e..388dbc3 100644
--- a/wifi/1.0/vts/types.vts
+++ b/wifi/1.0/vts/types.vts
@@ -383,6 +383,7 @@
struct_value: {
name: "eventReportScheme"
type: TYPE_MASK
+ scalar_type: "uint32_t"
predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
}
struct_value: {
@@ -567,8 +568,8 @@
struct_value: {
name: "bssid"
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -622,6 +623,7 @@
struct_value: {
name: "flags"
type: TYPE_MASK
+ scalar_type: "int32_t"
predefined_type: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
}
struct_value: {
@@ -662,8 +664,8 @@
type: TYPE_VECTOR
vector_value: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -674,8 +676,8 @@
type: TYPE_VECTOR
vector_value: {
type: TYPE_ARRAY
+ vector_size: 32
vector_value: {
- vector_size: 32
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -689,11 +691,11 @@
enum_value: {
scalar_type: "uint8_t"
- enumerator: "ENABLED"
+ enumerator: "DISABLED"
scalar_value: {
uint8_t: 0
}
- enumerator: "DISABLED"
+ enumerator: "ENABLED"
scalar_value: {
uint8_t: 1
}
@@ -920,7 +922,7 @@
scalar_type: "uint8_t"
}
struct_value: {
- name: "rssiProximity"
+ name: "rssiCloseProximity"
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -955,12 +957,12 @@
scalar_type: "bool_t"
}
struct_value: {
- name: "clusterIdLowVal"
+ name: "clusterIdBottomRangeVal"
type: TYPE_SCALAR
scalar_type: "uint16_t"
}
struct_value: {
- name: "clusterIdHighVal"
+ name: "clusterIdTopRangeVal"
type: TYPE_SCALAR
scalar_type: "uint16_t"
}
@@ -972,8 +974,8 @@
struct_value: {
name: "intfAddrVal"
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -1015,7 +1017,8 @@
}
struct_value: {
name: "discoveryChannelMhzVal"
- type: TYPE_VECTOR
+ type: TYPE_ARRAY
+ vector_size: 2
vector_value: {
type: TYPE_SCALAR
scalar_type: "uint32_t"
@@ -1028,7 +1031,8 @@
}
struct_value: {
name: "useBeaconsInBandVal"
- type: TYPE_VECTOR
+ type: TYPE_ARRAY
+ vector_size: 2
vector_value: {
type: TYPE_SCALAR
scalar_type: "bool_t"
@@ -1041,7 +1045,8 @@
}
struct_value: {
name: "useSdfInBandVal"
- type: TYPE_VECTOR
+ type: TYPE_ARRAY
+ vector_size: 2
vector_value: {
type: TYPE_SCALAR
scalar_type: "bool_t"
@@ -1073,12 +1078,22 @@
scalar_type: "bool_t"
}
struct_value: {
- name: "includeServiceIdsInBeacon"
+ name: "includePublishServiceIdsInBeacon"
type: TYPE_SCALAR
scalar_type: "bool_t"
}
struct_value: {
- name: "numberOfServiceIdsInBeacon"
+ name: "numberOfPublishServiceIdsInBeacon"
+ type: TYPE_SCALAR
+ scalar_type: "uint8_t"
+ }
+ struct_value: {
+ name: "includeSubscribeServiceIdsInBeacon"
+ type: TYPE_SCALAR
+ scalar_type: "bool_t"
+ }
+ struct_value: {
+ name: "numberOfSubscribeServiceIdsInBeacon"
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -1099,10 +1114,46 @@
}
struct_value: {
name: "bandSpecificConfig"
- type: TYPE_VECTOR
+ type: TYPE_ARRAY
+ vector_size: 2
vector_value: {
+ name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
type: TYPE_STRUCT
- predefined_type: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
+ struct_value: {
+ name: "rssiClose"
+ type: TYPE_SCALAR
+ scalar_type: "uint8_t"
+ }
+ struct_value: {
+ name: "rssiMiddle"
+ type: TYPE_SCALAR
+ scalar_type: "uint8_t"
+ }
+ struct_value: {
+ name: "rssiCloseProximity"
+ type: TYPE_SCALAR
+ scalar_type: "uint8_t"
+ }
+ struct_value: {
+ name: "dwellTimeMs"
+ type: TYPE_SCALAR
+ scalar_type: "uint8_t"
+ }
+ struct_value: {
+ name: "scanPeriodSec"
+ type: TYPE_SCALAR
+ scalar_type: "uint16_t"
+ }
+ struct_value: {
+ name: "validDiscoveryWindowIntervalVal"
+ type: TYPE_SCALAR
+ scalar_type: "bool_t"
+ }
+ struct_value: {
+ name: "discoveryWindowIntervalVal"
+ type: TYPE_SCALAR
+ scalar_type: "uint8_t"
+ }
}
}
}
@@ -1112,7 +1163,8 @@
type: TYPE_STRUCT
struct_value: {
name: "operateInBand"
- type: TYPE_VECTOR
+ type: TYPE_ARRAY
+ vector_size: 2
vector_value: {
type: TYPE_SCALAR
scalar_type: "bool_t"
@@ -1179,7 +1231,7 @@
struct_value: {
name: "sessionId"
type: TYPE_SCALAR
- scalar_type: "uint16_t"
+ scalar_type: "uint8_t"
}
struct_value: {
name: "ttlSec"
@@ -1198,7 +1250,11 @@
}
struct_value: {
name: "serviceName"
- type: TYPE_STRING
+ type: TYPE_VECTOR
+ vector_value: {
+ type: TYPE_SCALAR
+ scalar_type: "uint8_t"
+ }
}
struct_value: {
name: "discoveryMatchIndicator"
@@ -1214,6 +1270,14 @@
}
}
struct_value: {
+ name: "extendedServiceSpecificInfo"
+ type: TYPE_VECTOR
+ vector_value: {
+ type: TYPE_SCALAR
+ scalar_type: "uint8_t"
+ }
+ }
+ struct_value: {
name: "rxMatchFilter"
type: TYPE_VECTOR
vector_value: {
@@ -1252,6 +1316,7 @@
struct_value: {
name: "supportedCipherTypes"
type: TYPE_MASK
+ scalar_type: "uint32_t"
predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
}
struct_value: {
@@ -1280,17 +1345,18 @@
struct_value: {
name: "configRangingIndications"
type: TYPE_MASK
+ scalar_type: "uint32_t"
predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
}
struct_value: {
name: "distanceIngressCm"
type: TYPE_SCALAR
- scalar_type: "uint32_t"
+ scalar_type: "uint16_t"
}
struct_value: {
name: "distanceEgressCm"
type: TYPE_SCALAR
- scalar_type: "uint32_t"
+ scalar_type: "uint16_t"
}
}
@@ -1352,8 +1418,8 @@
type: TYPE_VECTOR
vector_value: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -1367,7 +1433,7 @@
struct_value: {
name: "discoverySessionId"
type: TYPE_SCALAR
- scalar_type: "uint16_t"
+ scalar_type: "uint8_t"
}
struct_value: {
name: "peerId"
@@ -1377,8 +1443,8 @@
struct_value: {
name: "addr"
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -1394,7 +1460,15 @@
scalar_type: "bool_t"
}
struct_value: {
- name: "message"
+ name: "serviceSpecificInfo"
+ type: TYPE_VECTOR
+ vector_value: {
+ type: TYPE_SCALAR
+ scalar_type: "uint8_t"
+ }
+ }
+ struct_value: {
+ name: "extendedServiceSpecificInfo"
type: TYPE_VECTOR
vector_value: {
type: TYPE_SCALAR
@@ -1419,8 +1493,8 @@
struct_value: {
name: "peerDiscMacAddr"
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -1455,6 +1529,7 @@
struct_value: {
name: "supportedCipherTypes"
type: TYPE_MASK
+ scalar_type: "uint32_t"
predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
}
struct_value: {
@@ -1500,6 +1575,7 @@
struct_value: {
name: "supportedCipherTypes"
type: TYPE_MASK
+ scalar_type: "uint32_t"
predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
}
struct_value: {
@@ -1513,44 +1589,6 @@
}
attribute: {
- name: "::android::hardware::wifi::V1_0::NanBeaconSdfPayloadRequest"
- type: TYPE_STRUCT
- struct_value: {
- name: "transmitInNext16dws"
- type: TYPE_SCALAR
- scalar_type: "bool_t"
- }
- struct_value: {
- name: "transmitInDiscoveryBeacon"
- type: TYPE_SCALAR
- scalar_type: "bool_t"
- }
- struct_value: {
- name: "transmitInSyncBeacon"
- type: TYPE_SCALAR
- scalar_type: "bool_t"
- }
- struct_value: {
- name: "transmitInServiceDiscoveryFrame"
- type: TYPE_SCALAR
- scalar_type: "bool_t"
- }
- struct_value: {
- name: "vendorOui"
- type: TYPE_SCALAR
- scalar_type: "uint32_t"
- }
- struct_value: {
- name: "vsa"
- type: TYPE_VECTOR
- vector_value: {
- type: TYPE_SCALAR
- scalar_type: "uint8_t"
- }
- }
-}
-
-attribute: {
name: "::android::hardware::wifi::V1_0::NanCapabilities"
type: TYPE_STRUCT
struct_value: {
@@ -1589,7 +1627,7 @@
scalar_type: "uint32_t"
}
struct_value: {
- name: "maxVsaDataLen"
+ name: "maxExtendedServiceSpecificInfoLen"
type: TYPE_SCALAR
scalar_type: "uint32_t"
}
@@ -1621,6 +1659,7 @@
struct_value: {
name: "supportedCipherSuites"
type: TYPE_MASK
+ scalar_type: "uint32_t"
predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
}
}
@@ -1631,7 +1670,7 @@
struct_value: {
name: "discoverySessionId"
type: TYPE_SCALAR
- scalar_type: "uint16_t"
+ scalar_type: "uint8_t"
}
struct_value: {
name: "peerId"
@@ -1641,8 +1680,8 @@
struct_value: {
name: "addr"
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -1656,6 +1695,14 @@
}
}
struct_value: {
+ name: "extendedServiceSpecificInfo"
+ type: TYPE_VECTOR
+ vector_value: {
+ type: TYPE_SCALAR
+ scalar_type: "uint8_t"
+ }
+ }
+ struct_value: {
name: "matchFilter"
type: TYPE_VECTOR
vector_value: {
@@ -1681,6 +1728,7 @@
struct_value: {
name: "peerSupportedCipherTypes"
type: TYPE_MASK
+ scalar_type: "uint32_t"
predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
}
struct_value: {
@@ -1701,6 +1749,7 @@
struct_value: {
name: "rangingIndicationType"
type: TYPE_MASK
+ scalar_type: "uint32_t"
predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
}
}
@@ -1711,7 +1760,7 @@
struct_value: {
name: "discoverySessionId"
type: TYPE_SCALAR
- scalar_type: "uint16_t"
+ scalar_type: "uint8_t"
}
struct_value: {
name: "peerId"
@@ -1721,8 +1770,8 @@
struct_value: {
name: "addr"
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -1733,7 +1782,15 @@
scalar_type: "bool_t"
}
struct_value: {
- name: "message"
+ name: "serviceSpecificInfo"
+ type: TYPE_VECTOR
+ vector_value: {
+ type: TYPE_SCALAR
+ scalar_type: "uint8_t"
+ }
+ }
+ struct_value: {
+ name: "extendedServiceSpecificInfo"
type: TYPE_VECTOR
vector_value: {
type: TYPE_SCALAR
@@ -1774,78 +1831,7 @@
struct_value: {
name: "addr"
type: TYPE_ARRAY
- vector_value: {
- vector_size: 6
- type: TYPE_SCALAR
- scalar_type: "uint8_t"
- }
- }
-}
-
-attribute: {
- name: "::android::hardware::wifi::V1_0::NanVsaRxFrameMask"
- type: TYPE_ENUM
- enum_value: {
- scalar_type: "uint32_t"
-
- enumerator: "DISCOVERY_BEACON_MASK"
- scalar_value: {
- uint32_t: 1
- }
- enumerator: "SYNC_BEACON_MASK"
- scalar_value: {
- uint32_t: 2
- }
- enumerator: "SERVICE_DISCOVERY_MASK"
- scalar_value: {
- uint32_t: 4
- }
- }
-}
-
-attribute: {
- name: "::android::hardware::wifi::V1_0::NanBeaconSdfPayloadInd"
- type: TYPE_STRUCT
- struct_value: {
- name: "addr"
- type: TYPE_ARRAY
- vector_value: {
- vector_size: 6
- type: TYPE_SCALAR
- scalar_type: "uint8_t"
- }
- }
- struct_value: {
- name: "isVsaReceived"
- type: TYPE_SCALAR
- scalar_type: "bool_t"
- }
- struct_value: {
- name: "vsaReceivedOnFrames"
- type: TYPE_MASK
- predefined_type: "::android::hardware::wifi::V1_0::NanVsaRxFrameMask"
- }
- struct_value: {
- name: "vsaVendorOui"
- type: TYPE_SCALAR
- scalar_type: "uint32_t"
- }
- struct_value: {
- name: "vsa"
- type: TYPE_VECTOR
- vector_value: {
- type: TYPE_SCALAR
- scalar_type: "uint8_t"
- }
- }
- struct_value: {
- name: "isBeaconSdfPayloadReceived"
- type: TYPE_SCALAR
- scalar_type: "bool_t"
- }
- struct_value: {
- name: "beaconSdfPayloadData"
- type: TYPE_VECTOR
+ vector_size: 6
vector_value: {
type: TYPE_SCALAR
scalar_type: "uint8_t"
@@ -1859,13 +1845,13 @@
struct_value: {
name: "discoverySessionId"
type: TYPE_SCALAR
- scalar_type: "uint16_t"
+ scalar_type: "uint8_t"
}
struct_value: {
name: "peerDiscMacAddr"
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -1906,8 +1892,8 @@
struct_value: {
name: "peerNdiMacAddr"
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -2106,8 +2092,8 @@
struct_value: {
name: "addr"
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -2185,8 +2171,8 @@
struct_value: {
name: "addr"
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -2334,11 +2320,13 @@
struct_value: {
name: "preambleSupport"
type: TYPE_MASK
+ scalar_type: "uint32_t"
predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
}
struct_value: {
name: "bwSupport"
type: TYPE_MASK
+ scalar_type: "uint32_t"
predefined_type: "::android::hardware::wifi::V1_0::RttBw"
}
struct_value: {
@@ -2430,8 +2418,8 @@
struct_value: {
name: "countryCode"
type: TYPE_ARRAY
+ vector_size: 2
vector_value: {
- vector_size: 2
type: TYPE_SCALAR
scalar_type: "int8_t"
}
diff --git a/wifi/supplicant/1.0/Android.bp b/wifi/supplicant/1.0/Android.bp
index 261d940..a6c2758 100644
--- a/wifi/supplicant/1.0/Android.bp
+++ b/wifi/supplicant/1.0/Android.bp
@@ -1,9 +1,7 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
-genrule {
- name: "android.hardware.wifi.supplicant@1.0_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi.supplicant@1.0",
+filegroup {
+ name: "android.hardware.wifi.supplicant@1.0_hal",
srcs: [
"types.hal",
"ISupplicant.hal",
@@ -19,6 +17,15 @@
"ISupplicantStaNetwork.hal",
"ISupplicantStaNetworkCallback.hal",
],
+}
+
+genrule {
+ name: "android.hardware.wifi.supplicant@1.0_genc++",
+ tools: ["hidl-gen"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi.supplicant@1.0",
+ srcs: [
+ ":android.hardware.wifi.supplicant@1.0_hal",
+ ],
out: [
"android/hardware/wifi/supplicant/1.0/types.cpp",
"android/hardware/wifi/supplicant/1.0/SupplicantAll.cpp",
@@ -41,19 +48,7 @@
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi.supplicant@1.0",
srcs: [
- "types.hal",
- "ISupplicant.hal",
- "ISupplicantCallback.hal",
- "ISupplicantIface.hal",
- "ISupplicantNetwork.hal",
- "ISupplicantP2pIface.hal",
- "ISupplicantP2pIfaceCallback.hal",
- "ISupplicantP2pNetwork.hal",
- "ISupplicantP2pNetworkCallback.hal",
- "ISupplicantStaIface.hal",
- "ISupplicantStaIfaceCallback.hal",
- "ISupplicantStaNetwork.hal",
- "ISupplicantStaNetworkCallback.hal",
+ ":android.hardware.wifi.supplicant@1.0_hal",
],
out: [
"android/hardware/wifi/supplicant/1.0/types.h",
diff --git a/wifi/supplicant/1.0/Android.mk b/wifi/supplicant/1.0/Android.mk
index ad49b0a..dd210d0 100644
--- a/wifi/supplicant/1.0/Android.mk
+++ b/wifi/supplicant/1.0/Android.mk
@@ -8,7 +8,7 @@
LOCAL_MODULE := android.hardware.wifi.supplicant@1.0-java
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -387,7 +387,7 @@
LOCAL_MODULE := android.hardware.wifi.supplicant@1.0-java-static
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
diff --git a/wifi/supplicant/1.0/ISupplicantP2pIface.hal b/wifi/supplicant/1.0/ISupplicantP2pIface.hal
index 45e90f3..dc1388a 100644
--- a/wifi/supplicant/1.0/ISupplicantP2pIface.hal
+++ b/wifi/supplicant/1.0/ISupplicantP2pIface.hal
@@ -612,4 +612,64 @@
* |SupplicantStatusCode.FAILURE_IFACE_INVALID|
*/
setWfdDeviceInfo(uint8_t[8] info) generates (SupplicantStatus status);
+
+ /**
+ * Creates a NFC handover request message.
+ *
+ * @return status Status of the operation.
+ * Possible status codes:
+ * |SupplicantStatusCode.SUCCESS|,
+ * |SupplicantStatusCode.FAILURE_UNKNOWN|,
+ * |SupplicantStatusCode.FAILURE_IFACE_INVALID|
+ * @return request Bytes representing the handover request as specified in
+ * section 3.1.1 of NFC Connection Handover 1.2 Technical
+ * Specification.
+ */
+ createNfcHandoverRequestMessage()
+ generates (SupplicantStatus status, vec<uint8_t> request);
+
+ /**
+ * Creates a NFC handover select message.
+ *
+ * @return status Status of the operation.
+ * Possible status codes:
+ * |SupplicantStatusCode.SUCCESS|,
+ * |SupplicantStatusCode.FAILURE_UNKNOWN|,
+ * |SupplicantStatusCode.FAILURE_IFACE_INVALID|
+ * @return select Bytes representing the handover select as specified in
+ * section 3.1.2 of NFC Connection Handover 1.2 Technical
+ * Specification.
+ */
+ createNfcHandoverSelectMessage()
+ generates (SupplicantStatus status, vec<uint8_t> select);
+
+ /**
+ * Report the response of the NFC handover request.
+ *
+ * @param request Bytes representing the handover request as specified in
+ * section 3.1.1 of NFC Connection Handover 1.2 Technical
+ * Specification.
+ * @return status Status of the operation.
+ * Possible status codes:
+ * |SupplicantStatusCode.SUCCESS|,
+ * |SupplicantStatusCode.FAILURE_UNKNOWN|,
+ * |SupplicantStatusCode.FAILURE_IFACE_INVALID|
+ */
+ reportNfcHandoverResponse(vec<uint8_t> request)
+ generates (SupplicantStatus status);
+
+ /**
+ * Report the initiation of the NFC handover select.
+ *
+ * @param select Bytes representing the handover select as specified in
+ * section 3.1.2 of NFC Connection Handover 1.2 Technical
+ * Specification.
+ * @return status Status of the operation.
+ * Possible status codes:
+ * |SupplicantStatusCode.SUCCESS|,
+ * |SupplicantStatusCode.FAILURE_UNKNOWN|,
+ * |SupplicantStatusCode.FAILURE_IFACE_INVALID|
+ */
+ reportNfcHandoverInitiation(vec<uint8_t> select)
+ generates (SupplicantStatus status);
};
diff --git a/wifi/supplicant/1.0/ISupplicantP2pIfaceCallback.hal b/wifi/supplicant/1.0/ISupplicantP2pIfaceCallback.hal
index ad4290b..b6ee57f 100644
--- a/wifi/supplicant/1.0/ISupplicantP2pIfaceCallback.hal
+++ b/wifi/supplicant/1.0/ISupplicantP2pIfaceCallback.hal
@@ -195,43 +195,6 @@
oneway onInvitationResult(Bssid bssid, P2pStatusCode status);
/**
- * Used to indicate a push-button request generated during provision discovery.
- *
- * @param p2pDeviceAddress P2P device address.
- */
- oneway onProvisionDiscoveryPbcRequest(MacAddress p2pDeviceAddress);
-
- /**
- * Used to indicate a push-button response generated during provision discovery.
- *
- * @param p2pDeviceAddress P2P device address.
- */
- oneway onProvisionDiscoveryPbcResponse(MacAddress p2pDeviceAddress);
-
- /**
- * Used to indicate the pin generated during provision discovery.
- *
- * @param p2pDeviceAddress P2P device address.
- * @param generatedPin 8 digit pin generated.
- */
- oneway onProvisionDiscoveryShowPin(
- MacAddress p2pDeviceAddress, string generatedPin);
-
- /**
- * Used to indicate that a pin needs to be entered during provision discovery.
- *
- * @param p2pDeviceAddress P2P device address.
- */
- oneway onProvisionDiscoveryEnterPin(MacAddress p2pDeviceAddress);
-
- /**
- * Used to indicate a provision discovery failure.
- *
- * @param p2pDeviceAddress P2P device address.
- */
- oneway onProvisionDiscoveryFailure(MacAddress p2pDeviceAddress);
-
- /**
* Used to indicate the completion of a P2P provision discovery request.
*
* @param p2pDeviceAddress P2P device address.
diff --git a/wifi/supplicant/1.0/ISupplicantStaIfaceCallback.hal b/wifi/supplicant/1.0/ISupplicantStaIfaceCallback.hal
index c3ec060..34237f0 100644
--- a/wifi/supplicant/1.0/ISupplicantStaIfaceCallback.hal
+++ b/wifi/supplicant/1.0/ISupplicantStaIfaceCallback.hal
@@ -257,13 +257,6 @@
string url);
/**
- * Used to indicate the connection to a new network on this iface.
- *
- * @param bssid BSSID of the AP to which we connected.
- */
- oneway onConnected(Bssid bssid);
-
- /**
* Used to indicate the disconnection from the currently connected
* network on this iface.
*
@@ -277,13 +270,6 @@
Bssid bssid, bool locallyGenerated, uint32_t reasonCode);
/**
- * Used to indicate the completion of association to an AP.
- *
- * @param bssid BSSID of the corresponding AP.
- */
- oneway onAssociationCompleted(Bssid bssid);
-
- /**
* Used to indicate an association rejection recieved from the AP
* to which the connection is being attempted.
*
diff --git a/wifi/supplicant/1.0/ISupplicantStaNetwork.hal b/wifi/supplicant/1.0/ISupplicantStaNetwork.hal
index deaad5d..b16fb39 100644
--- a/wifi/supplicant/1.0/ISupplicantStaNetwork.hal
+++ b/wifi/supplicant/1.0/ISupplicantStaNetwork.hal
@@ -106,7 +106,10 @@
PAP = 1,
MSPAP = 2,
MSPAPV2 = 3,
- GTC = 4
+ GTC = 4,
+ SIM = 5,
+ AKA = 6,
+ AKA_PRIME = 7
};
/** Params of |sendNetworkEapSimGsmAuthResponse| request. (Refer RFC 4186) */
@@ -896,6 +899,22 @@
getIdStr() generates (SupplicantStatus status, string idStr);
/**
+ * Retrieves a WPS-NFC configuration token for this network.
+ *
+ * @return status Status of the operation.
+ * Possible status codes:
+ * |SupplicantStatusCode.SUCCESS|,
+ * |SupplicantStatusCode.FAILURE_ARGS_INVALID|,
+ * |SupplicantStatusCode.FAILURE_UNKNOWN|,
+ * |SupplicantStatusCode.FAILURE_NETWORK_INVALID|
+ * @return token Bytes representing WPS-NFC configuration token.
+ * This is a dump of all the WPS atrributes of the AP configuration
+ * as specified in the Wi-Fi Protected Setup Specification.
+ */
+ getWpsNfcConfigurationToken()
+ generates (SupplicantStatus status, vec<uint8_t> token);
+
+ /**
* Enable the network for connection purposes.
*
* This must trigger a connection to the network if:
diff --git a/wifi/supplicant/1.0/vts/Supplicant.vts b/wifi/supplicant/1.0/vts/Supplicant.vts
index 69fe209..534b1cf 100644
--- a/wifi/supplicant/1.0/vts/Supplicant.vts
+++ b/wifi/supplicant/1.0/vts/Supplicant.vts
@@ -6,7 +6,9 @@
import: "android.hardware.wifi.supplicant@1.0::ISupplicantCallback"
import: "android.hardware.wifi.supplicant@1.0::ISupplicantIface"
+import: "android.hardware.wifi.supplicant@1.0::ISupplicantNetwork"
import: "android.hardware.wifi.supplicant@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
attribute: {
@@ -64,8 +66,7 @@
}
return_type_hidl: {
type: TYPE_HIDL_INTERFACE
- predefined_type: "ISupplicantIface"
- is_callback: false
+ predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantIface"
}
arg: {
type: TYPE_STRUCT
@@ -96,8 +97,7 @@
}
arg: {
type: TYPE_HIDL_CALLBACK
- predefined_type: "ISupplicantCallback"
- is_callback: true
+ predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantCallback"
}
}
diff --git a/wifi/supplicant/1.0/vts/SupplicantCallback.vts b/wifi/supplicant/1.0/vts/SupplicantCallback.vts
index e439bd6..2d9e991 100644
--- a/wifi/supplicant/1.0/vts/SupplicantCallback.vts
+++ b/wifi/supplicant/1.0/vts/SupplicantCallback.vts
@@ -4,6 +4,7 @@
package: "android.hardware.wifi.supplicant"
+import: "android.hidl.base@1.0::types"
interface: {
api: {
diff --git a/wifi/supplicant/1.0/vts/SupplicantIface.vts b/wifi/supplicant/1.0/vts/SupplicantIface.vts
index 41c77f8..c703ec0 100644
--- a/wifi/supplicant/1.0/vts/SupplicantIface.vts
+++ b/wifi/supplicant/1.0/vts/SupplicantIface.vts
@@ -6,6 +6,7 @@
import: "android.hardware.wifi.supplicant@1.0::ISupplicantNetwork"
import: "android.hardware.wifi.supplicant@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
attribute: {
@@ -68,8 +69,7 @@
}
return_type_hidl: {
type: TYPE_HIDL_INTERFACE
- predefined_type: "ISupplicantNetwork"
- is_callback: false
+ predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantNetwork"
}
}
@@ -93,8 +93,7 @@
}
return_type_hidl: {
type: TYPE_HIDL_INTERFACE
- predefined_type: "ISupplicantNetwork"
- is_callback: false
+ predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantNetwork"
}
arg: {
type: TYPE_SCALAR
@@ -129,6 +128,22 @@
}
api: {
+ name: "setWpsDeviceType"
+ return_type_hidl: {
+ type: TYPE_STRUCT
+ predefined_type: "::android::hardware::wifi::supplicant::V1_0::SupplicantStatus"
+ }
+ arg: {
+ type: TYPE_ARRAY
+ vector_size: 8
+ vector_value: {
+ type: TYPE_SCALAR
+ scalar_type: "uint8_t"
+ }
+ }
+ }
+
+ api: {
name: "setWpsManufacturer"
return_type_hidl: {
type: TYPE_STRUCT
@@ -180,6 +195,7 @@
}
arg: {
type: TYPE_MASK
+ scalar_type: "uint16_t"
predefined_type: "::android::hardware::wifi::supplicant::V1_0::WpsConfigMethods"
}
}
diff --git a/wifi/supplicant/1.0/vts/SupplicantNetwork.vts b/wifi/supplicant/1.0/vts/SupplicantNetwork.vts
index edcabce..c90f396 100644
--- a/wifi/supplicant/1.0/vts/SupplicantNetwork.vts
+++ b/wifi/supplicant/1.0/vts/SupplicantNetwork.vts
@@ -5,6 +5,7 @@
package: "android.hardware.wifi.supplicant"
import: "android.hardware.wifi.supplicant@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
api: {
diff --git a/wifi/supplicant/1.0/vts/SupplicantP2pIface.vts b/wifi/supplicant/1.0/vts/SupplicantP2pIface.vts
index afa9a8c..2515b60 100644
--- a/wifi/supplicant/1.0/vts/SupplicantP2pIface.vts
+++ b/wifi/supplicant/1.0/vts/SupplicantP2pIface.vts
@@ -5,40 +5,13 @@
package: "android.hardware.wifi.supplicant"
import: "android.hardware.wifi.supplicant@1.0::ISupplicantIface"
+import: "android.hardware.wifi.supplicant@1.0::ISupplicantNetwork"
import: "android.hardware.wifi.supplicant@1.0::ISupplicantP2pIfaceCallback"
import: "android.hardware.wifi.supplicant@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
attribute: {
- name: "::android::hardware::wifi::supplicant::V1_0::ISupplicantIface::ParamSizeLimits"
- type: TYPE_ENUM
- enum_value: {
- scalar_type: "uint32_t"
-
- enumerator: "WPS_DEVICE_NAME_MAX_LEN"
- scalar_value: {
- uint32_t: 32
- }
- enumerator: "WPS_MANUFACTURER_MAX_LEN"
- scalar_value: {
- uint32_t: 64
- }
- enumerator: "WPS_MODEL_NAME_MAX_LEN"
- scalar_value: {
- uint32_t: 32
- }
- enumerator: "WPS_MODEL_NUMBER_MAX_LEN"
- scalar_value: {
- uint32_t: 32
- }
- enumerator: "WPS_SERIAL_NUMBER_MAX_LEN"
- scalar_value: {
- uint32_t: 32
- }
- }
- }
-
- attribute: {
name: "::android::hardware::wifi::supplicant::V1_0::ISupplicantP2pIface::WpsProvisionMethod"
type: TYPE_ENUM
enum_value: {
@@ -126,8 +99,7 @@
}
return_type_hidl: {
type: TYPE_HIDL_INTERFACE
- predefined_type: "ISupplicantNetwork"
- is_callback: false
+ predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantNetwork"
}
}
@@ -151,8 +123,7 @@
}
return_type_hidl: {
type: TYPE_HIDL_INTERFACE
- predefined_type: "ISupplicantNetwork"
- is_callback: false
+ predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantNetwork"
}
arg: {
type: TYPE_SCALAR
@@ -187,6 +158,22 @@
}
api: {
+ name: "setWpsDeviceType"
+ return_type_hidl: {
+ type: TYPE_STRUCT
+ predefined_type: "::android::hardware::wifi::supplicant::V1_0::SupplicantStatus"
+ }
+ arg: {
+ type: TYPE_ARRAY
+ vector_size: 8
+ vector_value: {
+ type: TYPE_SCALAR
+ scalar_type: "uint8_t"
+ }
+ }
+ }
+
+ api: {
name: "setWpsManufacturer"
return_type_hidl: {
type: TYPE_STRUCT
@@ -238,6 +225,7 @@
}
arg: {
type: TYPE_MASK
+ scalar_type: "uint16_t"
predefined_type: "::android::hardware::wifi::supplicant::V1_0::WpsConfigMethods"
}
}
@@ -250,8 +238,7 @@
}
arg: {
type: TYPE_HIDL_CALLBACK
- predefined_type: "ISupplicantP2pIfaceCallback"
- is_callback: true
+ predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantP2pIfaceCallback"
}
}
@@ -263,8 +250,8 @@
}
return_type_hidl: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -355,8 +342,8 @@
}
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -398,8 +385,8 @@
}
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -445,8 +432,8 @@
}
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -464,16 +451,16 @@
}
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
}
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -492,8 +479,8 @@
}
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -562,8 +549,8 @@
}
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -578,12 +565,13 @@
}
return_type_hidl: {
type: TYPE_MASK
+ scalar_type: "uint32_t"
predefined_type: "::android::hardware::wifi::supplicant::V1_0::P2pGroupCapabilityMask"
}
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -677,8 +665,8 @@
}
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -727,8 +715,8 @@
}
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -763,8 +751,8 @@
}
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -802,8 +790,8 @@
}
arg: {
type: TYPE_ARRAY
+ vector_size: 8
vector_value: {
- vector_size: 8
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
diff --git a/wifi/supplicant/1.0/vts/SupplicantP2pIfaceCallback.vts b/wifi/supplicant/1.0/vts/SupplicantP2pIfaceCallback.vts
index 09fd779..b3cf05b 100644
--- a/wifi/supplicant/1.0/vts/SupplicantP2pIfaceCallback.vts
+++ b/wifi/supplicant/1.0/vts/SupplicantP2pIfaceCallback.vts
@@ -5,6 +5,7 @@
package: "android.hardware.wifi.supplicant"
import: "android.hardware.wifi.supplicant@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
attribute: {
@@ -158,24 +159,24 @@
name: "onDeviceFound"
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
}
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
}
arg: {
type: TYPE_ARRAY
+ vector_size: 8
vector_value: {
- vector_size: 8
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -185,6 +186,7 @@
}
arg: {
type: TYPE_MASK
+ scalar_type: "uint16_t"
predefined_type: "::android::hardware::wifi::supplicant::V1_0::WpsConfigMethods"
}
arg: {
@@ -193,12 +195,13 @@
}
arg: {
type: TYPE_MASK
+ scalar_type: "uint32_t"
predefined_type: "::android::hardware::wifi::supplicant::V1_0::P2pGroupCapabilityMask"
}
arg: {
type: TYPE_ARRAY
+ vector_size: 8
vector_value: {
- vector_size: 8
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -209,8 +212,8 @@
name: "onDeviceLost"
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -225,8 +228,8 @@
name: "onGoNegotiationRequest"
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -278,8 +281,8 @@
}
arg: {
type: TYPE_ARRAY
+ vector_size: 32
vector_value: {
- vector_size: 32
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -289,8 +292,8 @@
}
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -316,24 +319,24 @@
name: "onInvitationReceived"
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
}
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
}
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -352,8 +355,8 @@
name: "onInvitationResult"
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -368,8 +371,8 @@
name: "onProvisionDiscoveryPbcRequest"
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -380,8 +383,8 @@
name: "onProvisionDiscoveryPbcResponse"
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -392,8 +395,8 @@
name: "onProvisionDiscoveryShowPin"
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -407,8 +410,8 @@
name: "onProvisionDiscoveryEnterPin"
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -419,8 +422,8 @@
name: "onProvisionDiscoveryFailure"
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -431,8 +434,8 @@
name: "onProvisionDiscoveryCompleted"
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -447,6 +450,7 @@
}
arg: {
type: TYPE_MASK
+ scalar_type: "uint16_t"
predefined_type: "::android::hardware::wifi::supplicant::V1_0::WpsConfigMethods"
}
arg: {
@@ -458,8 +462,8 @@
name: "onServiceDiscoveryResponse"
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -481,16 +485,16 @@
name: "onStaAuthorized"
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
}
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -501,16 +505,16 @@
name: "onStaDeauthorized"
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
}
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
diff --git a/wifi/supplicant/1.0/vts/SupplicantP2pNetwork.vts b/wifi/supplicant/1.0/vts/SupplicantP2pNetwork.vts
index fddcca3..8d0b5a1 100644
--- a/wifi/supplicant/1.0/vts/SupplicantP2pNetwork.vts
+++ b/wifi/supplicant/1.0/vts/SupplicantP2pNetwork.vts
@@ -7,6 +7,7 @@
import: "android.hardware.wifi.supplicant@1.0::ISupplicantNetwork"
import: "android.hardware.wifi.supplicant@1.0::ISupplicantP2pNetworkCallback"
import: "android.hardware.wifi.supplicant@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
api: {
@@ -52,8 +53,7 @@
}
arg: {
type: TYPE_HIDL_CALLBACK
- predefined_type: "ISupplicantP2pNetworkCallback"
- is_callback: true
+ predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantP2pNetworkCallback"
}
}
@@ -80,8 +80,8 @@
}
return_type_hidl: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
diff --git a/wifi/supplicant/1.0/vts/SupplicantP2pNetworkCallback.vts b/wifi/supplicant/1.0/vts/SupplicantP2pNetworkCallback.vts
index 0e9ccde..9493c5e 100644
--- a/wifi/supplicant/1.0/vts/SupplicantP2pNetworkCallback.vts
+++ b/wifi/supplicant/1.0/vts/SupplicantP2pNetworkCallback.vts
@@ -4,6 +4,7 @@
package: "android.hardware.wifi.supplicant"
+import: "android.hidl.base@1.0::types"
interface: {
}
diff --git a/wifi/supplicant/1.0/vts/SupplicantStaIface.vts b/wifi/supplicant/1.0/vts/SupplicantStaIface.vts
index ceadb6c..cc52487 100644
--- a/wifi/supplicant/1.0/vts/SupplicantStaIface.vts
+++ b/wifi/supplicant/1.0/vts/SupplicantStaIface.vts
@@ -5,40 +5,13 @@
package: "android.hardware.wifi.supplicant"
import: "android.hardware.wifi.supplicant@1.0::ISupplicantIface"
+import: "android.hardware.wifi.supplicant@1.0::ISupplicantNetwork"
import: "android.hardware.wifi.supplicant@1.0::ISupplicantStaIfaceCallback"
import: "android.hardware.wifi.supplicant@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
attribute: {
- name: "::android::hardware::wifi::supplicant::V1_0::ISupplicantIface::ParamSizeLimits"
- type: TYPE_ENUM
- enum_value: {
- scalar_type: "uint32_t"
-
- enumerator: "WPS_DEVICE_NAME_MAX_LEN"
- scalar_value: {
- uint32_t: 32
- }
- enumerator: "WPS_MANUFACTURER_MAX_LEN"
- scalar_value: {
- uint32_t: 64
- }
- enumerator: "WPS_MODEL_NAME_MAX_LEN"
- scalar_value: {
- uint32_t: 32
- }
- enumerator: "WPS_MODEL_NUMBER_MAX_LEN"
- scalar_value: {
- uint32_t: 32
- }
- enumerator: "WPS_SERIAL_NUMBER_MAX_LEN"
- scalar_value: {
- uint32_t: 32
- }
- }
- }
-
- attribute: {
name: "::android::hardware::wifi::supplicant::V1_0::ISupplicantStaIface::AnqpInfoId"
type: TYPE_ENUM
enum_value: {
@@ -134,6 +107,19 @@
}
}
+ attribute: {
+ name: "::android::hardware::wifi::supplicant::V1_0::ISupplicantStaIface::ExtRadioWorkDefaults"
+ type: TYPE_ENUM
+ enum_value: {
+ scalar_type: "uint32_t"
+
+ enumerator: "TIMEOUT_IN_SECS"
+ scalar_value: {
+ uint32_t: 10
+ }
+ }
+ }
+
api: {
name: "getName"
return_type_hidl: {
@@ -165,8 +151,7 @@
}
return_type_hidl: {
type: TYPE_HIDL_INTERFACE
- predefined_type: "ISupplicantNetwork"
- is_callback: false
+ predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantNetwork"
}
}
@@ -190,8 +175,7 @@
}
return_type_hidl: {
type: TYPE_HIDL_INTERFACE
- predefined_type: "ISupplicantNetwork"
- is_callback: false
+ predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantNetwork"
}
arg: {
type: TYPE_SCALAR
@@ -226,6 +210,22 @@
}
api: {
+ name: "setWpsDeviceType"
+ return_type_hidl: {
+ type: TYPE_STRUCT
+ predefined_type: "::android::hardware::wifi::supplicant::V1_0::SupplicantStatus"
+ }
+ arg: {
+ type: TYPE_ARRAY
+ vector_size: 8
+ vector_value: {
+ type: TYPE_SCALAR
+ scalar_type: "uint8_t"
+ }
+ }
+ }
+
+ api: {
name: "setWpsManufacturer"
return_type_hidl: {
type: TYPE_STRUCT
@@ -277,6 +277,7 @@
}
arg: {
type: TYPE_MASK
+ scalar_type: "uint16_t"
predefined_type: "::android::hardware::wifi::supplicant::V1_0::WpsConfigMethods"
}
}
@@ -289,8 +290,7 @@
}
arg: {
type: TYPE_HIDL_CALLBACK
- predefined_type: "ISupplicantStaIfaceCallback"
- is_callback: true
+ predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantStaIfaceCallback"
}
}
@@ -338,8 +338,8 @@
}
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -354,8 +354,8 @@
}
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -370,8 +370,8 @@
}
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -386,8 +386,8 @@
}
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -416,8 +416,8 @@
}
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -435,8 +435,8 @@
}
return_type_hidl: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -527,8 +527,8 @@
}
arg: {
type: TYPE_ARRAY
+ vector_size: 2
vector_value: {
- vector_size: 2
type: TYPE_SCALAR
scalar_type: "int8_t"
}
@@ -543,8 +543,8 @@
}
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -562,8 +562,8 @@
}
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -592,8 +592,8 @@
}
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -620,4 +620,39 @@
}
}
+ api: {
+ name: "addExtRadioWork"
+ return_type_hidl: {
+ type: TYPE_STRUCT
+ predefined_type: "::android::hardware::wifi::supplicant::V1_0::SupplicantStatus"
+ }
+ return_type_hidl: {
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+ arg: {
+ type: TYPE_STRING
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+ }
+
+ api: {
+ name: "removeExtRadioWork"
+ return_type_hidl: {
+ type: TYPE_STRUCT
+ predefined_type: "::android::hardware::wifi::supplicant::V1_0::SupplicantStatus"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+ }
+
}
diff --git a/wifi/supplicant/1.0/vts/SupplicantStaIfaceCallback.vts b/wifi/supplicant/1.0/vts/SupplicantStaIfaceCallback.vts
index 88b1c3b..0a35848 100644
--- a/wifi/supplicant/1.0/vts/SupplicantStaIfaceCallback.vts
+++ b/wifi/supplicant/1.0/vts/SupplicantStaIfaceCallback.vts
@@ -5,6 +5,7 @@
package: "android.hardware.wifi.supplicant"
import: "android.hardware.wifi.supplicant@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
attribute: {
@@ -305,8 +306,8 @@
}
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -328,8 +329,8 @@
name: "onAnqpQueryDone"
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -348,8 +349,8 @@
name: "onHs20IconQueryDone"
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -396,8 +397,8 @@
name: "onConnected"
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -408,8 +409,8 @@
name: "onDisconnected"
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -428,8 +429,8 @@
name: "onAssociationCompleted"
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -440,8 +441,8 @@
name: "onAssociationRejected"
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -456,8 +457,8 @@
name: "onAuthenticationTimeout"
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -476,8 +477,8 @@
name: "onWpsEventFail"
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -496,4 +497,20 @@
name: "onWpsEventPbcOverlap"
}
+ api: {
+ name: "onExtRadioWorkStart"
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+ }
+
+ api: {
+ name: "onExtRadioWorkTimeout"
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+ }
+
}
diff --git a/wifi/supplicant/1.0/vts/SupplicantStaNetwork.vts b/wifi/supplicant/1.0/vts/SupplicantStaNetwork.vts
index f493b3e..8ad72f1 100644
--- a/wifi/supplicant/1.0/vts/SupplicantStaNetwork.vts
+++ b/wifi/supplicant/1.0/vts/SupplicantStaNetwork.vts
@@ -7,6 +7,7 @@
import: "android.hardware.wifi.supplicant@1.0::ISupplicantNetwork"
import: "android.hardware.wifi.supplicant@1.0::ISupplicantStaNetworkCallback"
import: "android.hardware.wifi.supplicant@1.0::types"
+import: "android.hidl.base@1.0::types"
interface: {
attribute: {
@@ -247,8 +248,8 @@
struct_value: {
name: "kc"
type: TYPE_ARRAY
+ vector_size: 8
vector_value: {
- vector_size: 8
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -256,8 +257,8 @@
struct_value: {
name: "sres"
type: TYPE_ARRAY
+ vector_size: 4
vector_value: {
- vector_size: 4
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -278,8 +279,8 @@
struct_value: {
name: "ik"
type: TYPE_ARRAY
+ vector_size: 16
vector_value: {
- vector_size: 16
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -287,8 +288,8 @@
struct_value: {
name: "ck"
type: TYPE_ARRAY
+ vector_size: 16
vector_value: {
- vector_size: 16
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -338,8 +339,7 @@
}
arg: {
type: TYPE_HIDL_CALLBACK
- predefined_type: "ISupplicantStaNetworkCallback"
- is_callback: true
+ predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantStaNetworkCallback"
}
}
@@ -366,8 +366,8 @@
}
arg: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -394,6 +394,7 @@
}
arg: {
type: TYPE_MASK
+ scalar_type: "uint32_t"
predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantStaNetwork::KeyMgmtMask"
}
}
@@ -406,6 +407,7 @@
}
arg: {
type: TYPE_MASK
+ scalar_type: "uint32_t"
predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantStaNetwork::ProtoMask"
}
}
@@ -418,6 +420,7 @@
}
arg: {
type: TYPE_MASK
+ scalar_type: "uint32_t"
predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantStaNetwork::AuthAlgMask"
}
}
@@ -430,6 +433,7 @@
}
arg: {
type: TYPE_MASK
+ scalar_type: "uint32_t"
predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantStaNetwork::GroupCipherMask"
}
}
@@ -442,6 +446,7 @@
}
arg: {
type: TYPE_MASK
+ scalar_type: "uint32_t"
predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantStaNetwork::PairwiseCipherMask"
}
}
@@ -670,6 +675,18 @@
}
api: {
+ name: "setProactiveKeyCaching"
+ return_type_hidl: {
+ type: TYPE_STRUCT
+ predefined_type: "::android::hardware::wifi::supplicant::V1_0::SupplicantStatus"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "bool_t"
+ }
+ }
+
+ api: {
name: "setIdStr"
return_type_hidl: {
type: TYPE_STRUCT
@@ -681,6 +698,18 @@
}
api: {
+ name: "setUpdateIdentifier"
+ return_type_hidl: {
+ type: TYPE_STRUCT
+ predefined_type: "::android::hardware::wifi::supplicant::V1_0::SupplicantStatus"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+ }
+
+ api: {
name: "getSsid"
return_type_hidl: {
type: TYPE_STRUCT
@@ -703,8 +732,8 @@
}
return_type_hidl: {
type: TYPE_ARRAY
+ vector_size: 6
vector_value: {
- vector_size: 6
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -731,6 +760,7 @@
}
return_type_hidl: {
type: TYPE_MASK
+ scalar_type: "uint32_t"
predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantStaNetwork::KeyMgmtMask"
}
}
@@ -743,6 +773,7 @@
}
return_type_hidl: {
type: TYPE_MASK
+ scalar_type: "uint32_t"
predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantStaNetwork::ProtoMask"
}
}
@@ -755,6 +786,7 @@
}
return_type_hidl: {
type: TYPE_MASK
+ scalar_type: "uint32_t"
predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantStaNetwork::AuthAlgMask"
}
}
@@ -767,6 +799,7 @@
}
return_type_hidl: {
type: TYPE_MASK
+ scalar_type: "uint32_t"
predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantStaNetwork::GroupCipherMask"
}
}
@@ -779,6 +812,7 @@
}
return_type_hidl: {
type: TYPE_MASK
+ scalar_type: "uint32_t"
predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantStaNetwork::PairwiseCipherMask"
}
}
@@ -1052,8 +1086,19 @@
predefined_type: "::android::hardware::wifi::supplicant::V1_0::SupplicantStatus"
}
arg: {
+ type: TYPE_VECTOR
+ vector_value: {
+ type: TYPE_STRUCT
+ predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantStaNetwork::NetworkResponseEapSimGsmAuthParams"
+ }
+ }
+ }
+
+ api: {
+ name: "sendNetworkEapSimGsmAuthFailure"
+ return_type_hidl: {
type: TYPE_STRUCT
- predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantStaNetwork::NetworkResponseEapSimGsmAuthParams"
+ predefined_type: "::android::hardware::wifi::supplicant::V1_0::SupplicantStatus"
}
}
@@ -1070,6 +1115,30 @@
}
api: {
+ name: "sendNetworkEapSimUmtsAutsResponse"
+ return_type_hidl: {
+ type: TYPE_STRUCT
+ predefined_type: "::android::hardware::wifi::supplicant::V1_0::SupplicantStatus"
+ }
+ arg: {
+ type: TYPE_ARRAY
+ vector_size: 14
+ vector_value: {
+ type: TYPE_SCALAR
+ scalar_type: "uint8_t"
+ }
+ }
+ }
+
+ api: {
+ name: "sendNetworkEapSimUmtsAuthFailure"
+ return_type_hidl: {
+ type: TYPE_STRUCT
+ predefined_type: "::android::hardware::wifi::supplicant::V1_0::SupplicantStatus"
+ }
+ }
+
+ api: {
name: "sendNetworkEapIdentityResponse"
return_type_hidl: {
type: TYPE_STRUCT
diff --git a/wifi/supplicant/1.0/vts/SupplicantStaNetworkCallback.vts b/wifi/supplicant/1.0/vts/SupplicantStaNetworkCallback.vts
index 3fe2da7..1c91d57 100644
--- a/wifi/supplicant/1.0/vts/SupplicantStaNetworkCallback.vts
+++ b/wifi/supplicant/1.0/vts/SupplicantStaNetworkCallback.vts
@@ -4,6 +4,7 @@
package: "android.hardware.wifi.supplicant"
+import: "android.hidl.base@1.0::types"
interface: {
attribute: {
@@ -14,8 +15,8 @@
type: TYPE_VECTOR
vector_value: {
type: TYPE_ARRAY
+ vector_size: 16
vector_value: {
- vector_size: 16
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -29,8 +30,8 @@
struct_value: {
name: "rand"
type: TYPE_ARRAY
+ vector_size: 16
vector_value: {
- vector_size: 16
type: TYPE_SCALAR
scalar_type: "uint8_t"
}
@@ -38,8 +39,8 @@
struct_value: {
name: "autn"
type: TYPE_ARRAY
+ vector_size: 16
vector_value: {
- vector_size: 16
type: TYPE_SCALAR
scalar_type: "uint8_t"
}