if (mDataMQ) {
ALOGE("the client attempts to call prepareForReading twice");
_hidl_cb(Result::INVALID_STATE,
- MQDescriptorSync<uint8_t>(), MQDescriptorSync<ReadStatus>());
+ DataMQ::Descriptor(), StatusMQ::Descriptor());
return Void();
}
std::unique_ptr<DataMQ> tempDataMQ(
ALOGE_IF(!tempDataMQ->isValid(), "data MQ is invalid");
ALOGE_IF(!tempStatusMQ->isValid(), "status MQ is invalid");
_hidl_cb(Result::INVALID_ARGUMENTS,
- MQDescriptorSync<uint8_t>(), MQDescriptorSync<ReadStatus>());
+ DataMQ::Descriptor(), StatusMQ::Descriptor());
return Void();
}
// TODO: Remove event flag management once blocking MQ is implemented. b/33815422
if (status != OK || !mEfGroup) {
ALOGE("failed creating event flag for data MQ: %s", strerror(-status));
_hidl_cb(Result::INVALID_ARGUMENTS,
- MQDescriptorSync<uint8_t>(), MQDescriptorSync<ReadStatus>());
+ DataMQ::Descriptor(), StatusMQ::Descriptor());
return Void();
}
if (status != OK) {
ALOGW("failed to start reader thread: %s", strerror(-status));
_hidl_cb(Result::INVALID_ARGUMENTS,
- MQDescriptorSync<uint8_t>(), MQDescriptorSync<ReadStatus>());
+ DataMQ::Descriptor(), StatusMQ::Descriptor());
return Void();
}
if (mDataMQ) {
ALOGE("the client attempts to call prepareForWriting twice");
_hidl_cb(Result::INVALID_STATE,
- MQDescriptorSync<uint8_t>(), MQDescriptorSync<WriteStatus>());
+ DataMQ::Descriptor(), StatusMQ::Descriptor());
return Void();
}
std::unique_ptr<DataMQ> tempDataMQ(
ALOGE_IF(!tempDataMQ->isValid(), "data MQ is invalid");
ALOGE_IF(!tempStatusMQ->isValid(), "status MQ is invalid");
_hidl_cb(Result::INVALID_ARGUMENTS,
- MQDescriptorSync<uint8_t>(), MQDescriptorSync<WriteStatus>());
+ DataMQ::Descriptor(), StatusMQ::Descriptor());
return Void();
}
// TODO: Remove event flag management once blocking MQ is implemented. b/33815422
if (status != OK || !mEfGroup) {
ALOGE("failed creating event flag for data MQ: %s", strerror(-status));
_hidl_cb(Result::INVALID_ARGUMENTS,
- MQDescriptorSync<uint8_t>(), MQDescriptorSync<WriteStatus>());
+ DataMQ::Descriptor(), StatusMQ::Descriptor());
return Void();
}
if (status != OK) {
ALOGW("failed to start writer thread: %s", strerror(-status));
_hidl_cb(Result::INVALID_ARGUMENTS,
- MQDescriptorSync<uint8_t>(), MQDescriptorSync<WriteStatus>());
+ DataMQ::Descriptor(), StatusMQ::Descriptor());
return Void();
}
#include <hardware/fingerprint.h>
#include "BiometricsFingerprint.h"
+#include <inttypes.h>
+
namespace android {
namespace hardware {
namespace biometrics {
if (auth_token != nullptr && auth_token_length > 0) {
// TODO: cache service?
sp<IServiceManager> sm = android::defaultServiceManager();
- sp<IBinder> binder = sm->getService(String16("android.security.keystore"));
+ sp<::android::IBinder> binder = sm->getService(String16("android.security.keystore"));
sp<IKeystoreService> service = interface_cast<IKeystoreService>(binder);
if (service != nullptr) {
- status_t ret = service->addAuthToken(auth_token, auth_token_length);
- if (ret != ResponseCode::NO_ERROR) {
- ALOGE("Falure sending auth token to KeyStore: %d", ret);
+ auto ret = service->addAuthToken(auth_token, auth_token_length);
+ if (!ret.isOk()) {
+ ALOGE("Failure sending auth token to KeyStore: %" PRId32, int32_t(ret));
}
} else {
ALOGE("Unable to communicate with KeyStore");
--- /dev/null
+#
+# 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
--- /dev/null
+component_class: HAL_HIDL
+component_type_version: 1.0
+component_name: "IBluetoothHci"
+
+package: "android.hardware.bluetooth"
+
+import: "android.hardware.bluetooth@1.0::IBluetoothHciCallbacks"
+import: "android.hardware.bluetooth@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
+ }
+ }
+
+ api: {
+ name: "sendHciCommand"
+ arg: {
+ type: TYPE_VECTOR
+ vector_value: {
+ type: TYPE_SCALAR
+ scalar_type: "uint8_t"
+ }
+ }
+ }
+
+ api: {
+ name: "sendAclData"
+ arg: {
+ type: TYPE_VECTOR
+ vector_value: {
+ type: TYPE_SCALAR
+ scalar_type: "uint8_t"
+ }
+ }
+ }
+
+ api: {
+ name: "sendScoData"
+ arg: {
+ type: TYPE_VECTOR
+ vector_value: {
+ type: TYPE_SCALAR
+ scalar_type: "uint8_t"
+ }
+ }
+ }
+
+ api: {
+ name: "close"
+ }
+
+}
--- /dev/null
+component_class: HAL_HIDL
+component_type_version: 1.0
+component_name: "IBluetoothHciCallbacks"
+
+package: "android.hardware.bluetooth"
+
+import: "android.hardware.bluetooth@1.0::types"
+
+interface: {
+ api: {
+ name: "hciEventReceived"
+ arg: {
+ type: TYPE_VECTOR
+ vector_value: {
+ type: TYPE_SCALAR
+ scalar_type: "uint8_t"
+ }
+ }
+ }
+
+ api: {
+ name: "aclDataReceived"
+ arg: {
+ type: TYPE_VECTOR
+ vector_value: {
+ type: TYPE_SCALAR
+ scalar_type: "uint8_t"
+ }
+ }
+ }
+
+ api: {
+ name: "scoDataReceived"
+ arg: {
+ type: TYPE_VECTOR
+ vector_value: {
+ type: TYPE_SCALAR
+ scalar_type: "uint8_t"
+ }
+ }
+ }
+
+}
--- /dev/null
+#
+# 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)
--- /dev/null
+#
+# 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
--- /dev/null
+<?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>
--- /dev/null
+#
+## 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
--- /dev/null
+<?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>
--- /dev/null
+component_class: HAL_HIDL
+component_type_version: 1.0
+component_name: "types"
+
+package: "android.hardware.bluetooth"
+
+
+attribute: {
+ name: "::android::hardware::bluetooth::V1_0::Status"
+ type: TYPE_ENUM
+ enum_value: {
+ scalar_type: "int32_t"
+
+ enumerator: "SUCCESS"
+ scalar_value: {
+ int32_t: 0
+ }
+ enumerator: "TRANSPORT_ERROR"
+ scalar_value: {
+ int32_t: 1
+ }
+ enumerator: "INITIALIZATION_ERROR"
+ scalar_value: {
+ int32_t: 2
+ }
+ enumerator: "UNKNOWN"
+ scalar_value: {
+ int32_t: 3
+ }
+ }
+}
+
}
-IBootControl* HIDL_FETCH_IBootControl(const char* hal) {
+IBootControl* HIDL_FETCH_IBootControl(const char* /* hal */) {
int ret = 0;
boot_control_module_t* module = NULL;
hw_module_t **hwm = reinterpret_cast<hw_module_t**>(&module);
- ret = hw_get_module(hal, const_cast<const hw_module_t**>(hwm));
+ ret = hw_get_module(BOOT_CONTROL_HARDWARE_MODULE_ID, const_cast<const hw_module_t**>(hwm));
if (ret)
{
- ALOGE("hw_get_module %s failed: %d", hal, ret);
+ ALOGE("hw_get_module %s failed: %d", BOOT_CONTROL_HARDWARE_MODULE_ID, ret);
return nullptr;
}
module->init(module);
using android::hardware::defaultPassthroughServiceImplementation;
int main (int /* argc */, char * /* argv */ []) {
- return defaultPassthroughServiceImplementation<IBootControl>("bootctrl");
+ return defaultPassthroughServiceImplementation<IBootControl>();
}
class BootHidlTest : public ::testing::Test {
public:
virtual void SetUp() override {
- boot = IBootControl::getService("bootctrl");
+ boot = IBootControl::getService();
ASSERT_NE(boot, nullptr);
}
],
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: ["."]
+}
"android.hardware.camera.common@1.0-helper"
]
}
+
+cc_binary {
+ name: "android.hardware.camera.provider@2.4-service",
+ relative_install_path: "hw",
+ srcs: ["service.cpp", "CameraProvider.cpp"],
+ compile_multilib: "32",
+ init_rc: ["android.hardware.camera.provider@2.4-service.rc"],
+ shared_libs: [
+ "libhidlbase",
+ "libhidltransport",
+ "liblog",
+ "libhwbinder",
+ "libutils",
+ "libhardware",
+ "android.hardware.camera.device@1.0",
+ "android.hardware.camera.device@3.2",
+ "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: [
+ "android.hardware.camera.common@1.0-helper"
+ ]
+}
#define LOG_TAG "CamProvider@2.4-impl"
#include <android/log.h>
-#include <regex>
-
#include "CameraProvider.h"
#include "CameraDevice.h"
#include <string.h>
#ifndef ANDROID_HARDWARE_CAMERA_PROVIDER_V2_4_CAMERAPROVIDER_H
#define ANDROID_HARDWARE_CAMERA_PROVIDER_V2_4_CAMERAPROVIDER_H
+#include <regex>
#include "hardware/camera_common.h"
#include "utils/Mutex.h"
#include "utils/SortedVector.h"
--- /dev/null
+service camera-provider-2-4 /system/bin/hw/android.hardware.camera.provider@2.4-service
+ class hal
+ user cameraserver
+ group audio camera input drmrpc
+ ioprio rt 4
+ writepid /dev/cpuset/camera-daemon/tasks /dev/stune/top-app/tasks
\ No newline at end of file
--- /dev/null
+/*
+ * 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.
+ */
+
+#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 <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;
+
+int main()
+{
+ const char instance[] = "legacy/0";
+
+ 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;
+}
\ No newline at end of file
--- /dev/null
+// 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",
+ srcs: [
+ "types.hal",
+ "ICryptoFactory.hal",
+ "ICryptoPlugin.hal",
+ "IDrmFactory.hal",
+ "IDrmPlugin.hal",
+ "IDrmPluginListener.hal",
+ ],
+ out: [
+ "android/hardware/drm/1.0/types.cpp",
+ "android/hardware/drm/1.0/CryptoFactoryAll.cpp",
+ "android/hardware/drm/1.0/CryptoPluginAll.cpp",
+ "android/hardware/drm/1.0/DrmFactoryAll.cpp",
+ "android/hardware/drm/1.0/DrmPluginAll.cpp",
+ "android/hardware/drm/1.0/DrmPluginListenerAll.cpp",
+ ],
+}
+
+genrule {
+ name: "android.hardware.drm@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.drm@1.0",
+ srcs: [
+ "types.hal",
+ "ICryptoFactory.hal",
+ "ICryptoPlugin.hal",
+ "IDrmFactory.hal",
+ "IDrmPlugin.hal",
+ "IDrmPluginListener.hal",
+ ],
+ out: [
+ "android/hardware/drm/1.0/types.h",
+ "android/hardware/drm/1.0/ICryptoFactory.h",
+ "android/hardware/drm/1.0/IHwCryptoFactory.h",
+ "android/hardware/drm/1.0/BnHwCryptoFactory.h",
+ "android/hardware/drm/1.0/BpHwCryptoFactory.h",
+ "android/hardware/drm/1.0/BsCryptoFactory.h",
+ "android/hardware/drm/1.0/ICryptoPlugin.h",
+ "android/hardware/drm/1.0/IHwCryptoPlugin.h",
+ "android/hardware/drm/1.0/BnHwCryptoPlugin.h",
+ "android/hardware/drm/1.0/BpHwCryptoPlugin.h",
+ "android/hardware/drm/1.0/BsCryptoPlugin.h",
+ "android/hardware/drm/1.0/IDrmFactory.h",
+ "android/hardware/drm/1.0/IHwDrmFactory.h",
+ "android/hardware/drm/1.0/BnHwDrmFactory.h",
+ "android/hardware/drm/1.0/BpHwDrmFactory.h",
+ "android/hardware/drm/1.0/BsDrmFactory.h",
+ "android/hardware/drm/1.0/IDrmPlugin.h",
+ "android/hardware/drm/1.0/IHwDrmPlugin.h",
+ "android/hardware/drm/1.0/BnHwDrmPlugin.h",
+ "android/hardware/drm/1.0/BpHwDrmPlugin.h",
+ "android/hardware/drm/1.0/BsDrmPlugin.h",
+ "android/hardware/drm/1.0/IDrmPluginListener.h",
+ "android/hardware/drm/1.0/IHwDrmPluginListener.h",
+ "android/hardware/drm/1.0/BnHwDrmPluginListener.h",
+ "android/hardware/drm/1.0/BpHwDrmPluginListener.h",
+ "android/hardware/drm/1.0/BsDrmPluginListener.h",
+ ],
+}
+
+cc_library_shared {
+ name: "android.hardware.drm@1.0",
+ generated_sources: ["android.hardware.drm@1.0_genc++"],
+ generated_headers: ["android.hardware.drm@1.0_genc++_headers"],
+ export_generated_headers: ["android.hardware.drm@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",
+ ],
+}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package android.hardware.drm.crypto@1.0;
+package android.hardware.drm@1.0;
import ICryptoPlugin;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package android.hardware.drm.crypto@1.0;
+package android.hardware.drm@1.0;
-import android.hardware.drm.crypto@1.0::types;
+import android.hardware.drm@1.0::types;
/**
* Ref: frameworks/native/include/media/hardware/CryptoAPI.h:CryptoPlugin
setMediaDrmSession(vec<uint8_t> sessionId) generates(Status status);
/**
+ * Set a shared memory base for subsequent decrypt operations. The buffer
+ * base is a hidl_memory which maps shared memory in the HAL module.
+ * After the shared buffer base is established, the decrypt() method
+ * receives SharedBuffer instances which specify the buffer address range
+ * for decrypt source and destination addresses.
+ */
+ setSharedBufferBase(memory base);
+
+ /**
* Decrypt an array of subsamples from the source memory buffer to the
* destination memory buffer.
*
*/
decrypt(bool secure, uint8_t[16] keyId, uint8_t[16] iv, Mode mode,
Pattern pattern, vec<SubSample> subSamples,
- memory source, uint32_t offset, DestinationBuffer destination)
+ SharedBuffer source, uint64_t offset, DestinationBuffer destination)
generates(Status status, uint32_t bytesWritten, string detailedError);
};
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package android.hardware.drm.drm@1.0;
+package android.hardware.drm@1.0;
import IDrmPlugin;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package android.hardware.drm.drm@1.0;
+package android.hardware.drm@1.0;
import IDrmPluginListener;
* limitations under the License.
*/
-package android.hardware.drm.drm@1.0;
+package android.hardware.drm@1.0;
-import android.hardware.drm.drm@1.0::types;
+import android.hardware.drm@1.0::types;
/**
* Ref: frameworks/native/include/media/drm/DrmAPI.h:DrmPluginListener
# limitations under the License.
+############# Build legacy drm service ############
+
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
service.cpp \
LOCAL_SHARED_LIBRARIES := \
+ android.hardware.drm@1.0 \
+ android.hidl.memory@1.0 \
libhidlbase \
libhidltransport \
- liblog \
+ libhardware \
libhwbinder \
+ liblog \
libutils \
- libhardware \
- android.hardware.drm.drm@1.0 \
- android.hardware.drm.crypto@1.0 \
- android.hidl.memory@1.0 \
-
LOCAL_C_INCLUDES := \
hardware/interfaces/drm
LOCAL_32_BIT_ONLY := true
include $(BUILD_EXECUTABLE)
+
+############# Build legacy drm impl library ############
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := android.hardware.drm@1.0-impl
+LOCAL_MODULE_RELATIVE_PATH := hw
+LOCAL_SRC_FILES := \
+ DrmFactory.cpp \
+ DrmPlugin.cpp \
+ CryptoFactory.cpp \
+ CryptoPlugin.cpp \
+ TypeConvert.cpp \
+
+LOCAL_SHARED_LIBRARIES := \
+ android.hardware.drm@1.0 \
+ android.hidl.memory@1.0 \
+ libhidlbase \
+ libhidlmemory \
+ libhidltransport \
+ libhwbinder \
+ liblog \
+ libmediadrm \
+ libstagefright_foundation \
+ libutils \
+
+LOCAL_C_INCLUDES := \
+ frameworks/native/include \
+ frameworks/av/include
+
+# TODO: The legacy DRM plugins only support 32-bit. They need
+# to be migrated to 64-bit (b/18948909)
+LOCAL_32_BIT_ONLY := true
+
+include $(BUILD_SHARED_LIBRARY)
namespace android {
namespace hardware {
namespace drm {
-namespace crypto {
namespace V1_0 {
namespace implementation {
loader("/vendor/lib/mediadrm", "createCryptoFactory") {
}
- // Methods from ::android::hardware::drm::crypto::V1_0::ICryptoFactory follow.
+ // 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++) {
} // namespace implementation
} // namespace V1_0
-} // namespace crypto
} // namespace drm
} // namespace hardware
} // namespace android
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#ifndef ANDROID_HARDWARE_DRM_CRYPTO_V1_0__CRYPTOFACTORY_H
-#define ANDROID_HARDWARE_DRM_CRYPTO_V1_0__CRYPTOFACTORY_H
+#ifndef ANDROID_HARDWARE_DRM_V1_0__CRYPTOFACTORY_H
+#define ANDROID_HARDWARE_DRM_V1_0__CRYPTOFACTORY_H
-#include <android/hardware/drm/crypto/1.0/ICryptoFactory.h>
+#include <android/hardware/drm/1.0/ICryptoFactory.h>
#include <hidl/Status.h>
#include <media/hardware/CryptoAPI.h>
#include <media/PluginLoader.h>
namespace android {
namespace hardware {
namespace drm {
-namespace crypto {
namespace V1_0 {
namespace implementation {
-using ::android::hardware::drm::crypto::V1_0::ICryptoFactory;
-using ::android::hardware::drm::crypto::V1_0::ICryptoPlugin;
+using ::android::hardware::drm::V1_0::ICryptoFactory;
+using ::android::hardware::drm::V1_0::ICryptoPlugin;
using ::android::hardware::hidl_array;
using ::android::hardware::hidl_string;
using ::android::hardware::hidl_vec;
CryptoFactory();
virtual ~CryptoFactory() {}
- // Methods from ::android::hardware::drm::crypto::V1_0::ICryptoFactory follow.
+ // Methods from ::android::hardware::drm::V1_0::ICryptoFactory follow.
Return<bool> isCryptoSchemeSupported(const hidl_array<uint8_t, 16>& uuid)
override;
} // namespace implementation
} // namespace V1_0
-} // namespace crypto
} // namespace drm
} // namespace hardware
} // namespace android
-#endif // ANDROID_HARDWARE_DRM_CRYPTO_V1_0__CRYPTOFACTORY_H
+#endif // ANDROID_HARDWARE_DRM_V1_0__CRYPTOFACTORY_H
#include "CryptoPlugin.h"
#include "TypeConvert.h"
-#include <media/stagefright/foundation/AString.h>
-
-#include <hidlmemory/mapping.h>
#include <android/hidl/memory/1.0/IMemory.h>
+#include <hidlmemory/mapping.h>
+#include <media/stagefright/foundation/AString.h>
#include <utils/Log.h>
+using android::hardware::hidl_memory;
using android::hidl::memory::V1_0::IMemory;
-
namespace android {
namespace hardware {
namespace drm {
-namespace crypto {
namespace V1_0 {
namespace implementation {
- // Methods from ::android::hardware::drm::crypto::V1_0::ICryptoPlugin follow
+ // Methods from ::android::hardware::drm::V1_0::ICryptoPlugin follow
Return<bool> CryptoPlugin::requiresSecureDecoderComponent(
const hidl_string& mime) {
return mLegacyPlugin->requiresSecureDecoderComponent(mime);
return toStatus(mLegacyPlugin->setMediaDrmSession(toVector(sessionId)));
}
+ Return<void> CryptoPlugin::setSharedBufferBase(const hidl_memory& base) {
+ mSharedBufferBase = mapMemory(base);
+ return Void();
+ }
+
Return<void> CryptoPlugin::decrypt(bool secure,
const hidl_array<uint8_t, 16>& keyId,
const hidl_array<uint8_t, 16>& iv, Mode mode,
const Pattern& pattern, const hidl_vec<SubSample>& subSamples,
- const hidl_memory& source, uint32_t offset,
+ const SharedBuffer& source, uint64_t offset,
const DestinationBuffer& destination,
decrypt_cb _hidl_cb) {
AString detailMessage;
- sp<IMemory> sharedSourceMemory = mapMemory(source);
+ if (source.offset + offset + source.size > mSharedBufferBase->getSize()) {
+ _hidl_cb(Status::ERROR_DRM_CANNOT_HANDLE, 0, "invalid buffer size");
+ return Void();
+ }
- void *srcPtr = static_cast<void *>(sharedSourceMemory->getPointer());
- uint8_t *offsetSrc = static_cast<uint8_t *>(srcPtr) + offset;
- srcPtr = static_cast<void *>(offsetSrc);
+ uint8_t *base = static_cast<uint8_t *>
+ (static_cast<void *>(mSharedBufferBase->getPointer()));
+ void *srcPtr = static_cast<void *>(base + source.offset + offset);
- sp<IMemory> sharedDestinationMemory;
void *destPtr = NULL;
-
if (destination.type == BufferType::SHARED_MEMORY) {
- sharedDestinationMemory = mapMemory(destination.nonsecureMemory);
- sharedDestinationMemory->update();
- destPtr = sharedDestinationMemory->getPointer();
+ const SharedBuffer& destBuffer = destination.nonsecureMemory;
+ if (destBuffer.offset + destBuffer.size > mSharedBufferBase->getSize()) {
+ _hidl_cb(Status::ERROR_DRM_CANNOT_HANDLE, 0, "invalid buffer size");
+ return Void();
+ }
+ destPtr = static_cast<void *>(base + destination.nonsecureMemory.offset);
} else if (destination.type == BufferType::NATIVE_HANDLE) {
native_handle_t *handle = const_cast<native_handle_t *>(
destination.secureMemory.getNativeHandle());
legacyMode, legacyPattern, srcPtr, legacySubSamples,
subSamples.size(), destPtr, &detailMessage);
- if (destination.type == BufferType::SHARED_MEMORY) {
- sharedDestinationMemory->commit();
- }
-
delete[] legacySubSamples;
uint32_t status;
} // namespace implementation
} // namespace V1_0
-} // namespace crypto
} // namespace drm
} // namespace hardware
} // namespace android
* limitations under the License.
*/
-#ifndef ANDROID_HARDWARE_DRM_CRYPTO_V1_0__CRYPTOPLUGIN_H
-#define ANDROID_HARDWARE_DRM_CRYPTO_V1_0__CRYPTOPLUGIN_H
+#ifndef ANDROID_HARDWARE_DRM_V1_0__CRYPTOPLUGIN_H
+#define ANDROID_HARDWARE_DRM_V1_0__CRYPTOPLUGIN_H
-#include <media/hardware/CryptoAPI.h>
-#include <android/hardware/drm/crypto/1.0/ICryptoPlugin.h>
+#include <android/hidl/memory/1.0/IMemory.h>
+#include <android/hardware/drm/1.0/ICryptoPlugin.h>
#include <hidl/Status.h>
+#include <media/hardware/CryptoAPI.h>
namespace android {
namespace hardware {
namespace drm {
-namespace crypto {
namespace V1_0 {
namespace implementation {
-using ::android::hardware::drm::crypto::V1_0::DestinationBuffer;
-using ::android::hardware::drm::crypto::V1_0::ICryptoPlugin;
-using ::android::hardware::drm::crypto::V1_0::Mode;
-using ::android::hardware::drm::crypto::V1_0::Pattern;
-using ::android::hardware::drm::crypto::V1_0::SubSample;
+using ::android::hardware::drm::V1_0::DestinationBuffer;
+using ::android::hardware::drm::V1_0::ICryptoPlugin;
+using ::android::hardware::drm::V1_0::Mode;
+using ::android::hardware::drm::V1_0::Pattern;
+using ::android::hardware::drm::V1_0::SubSample;
using ::android::hardware::hidl_array;
using ::android::hardware::hidl_string;
using ::android::hardware::hidl_vec;
using ::android::hardware::Return;
using ::android::hardware::Void;
+using ::android::hidl::memory::V1_0::IMemory;
using ::android::sp;
struct CryptoPlugin : public ICryptoPlugin {
~CryptoPlugin() {delete mLegacyPlugin;}
- // Methods from ::android::hardware::drm::crypto::V1_0::ICryptoPlugin
+ // Methods from ::android::hardware::drm::V1_0::ICryptoPlugin
// follow.
Return<bool> requiresSecureDecoderComponent(const hidl_string& mime)
Return<Status> setMediaDrmSession(const hidl_vec<uint8_t>& sessionId)
override;
+ Return<void> setSharedBufferBase(const ::android::hardware::hidl_memory& base)
+ override;
+
Return<void> decrypt(bool secure, const hidl_array<uint8_t, 16>& keyId,
const hidl_array<uint8_t, 16>& iv, Mode mode, const Pattern& pattern,
- const hidl_vec<SubSample>& subSamples, const hidl_memory& source,
- uint32_t offset, const DestinationBuffer& destination,
+ const hidl_vec<SubSample>& subSamples, const SharedBuffer& source,
+ uint64_t offset, const DestinationBuffer& destination,
decrypt_cb _hidl_cb) override;
private:
android::CryptoPlugin *mLegacyPlugin;
+ sp<IMemory> mSharedBufferBase;
CryptoPlugin() = delete;
CryptoPlugin(const CryptoPlugin &) = delete;
} // namespace implementation
} // namespace V1_0
-} // namespace crypto
} // namespace drm
} // namespace hardware
} // namespace android
-#endif // ANDROID_HARDWARE_DRM_CRYPTO_V1_0__CRYPTOPLUGIN_H
+#endif // ANDROID_HARDWARE_DRM_V1_0__CRYPTOPLUGIN_H
namespace android {
namespace hardware {
namespace drm {
-namespace drm {
namespace V1_0 {
namespace implementation {
loader("/vendor/lib/mediadrm", "createDrmFactory") {
}
- // Methods from ::android::hardware::drm::drm::V1_0::IDrmFactory follow.
+ // 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++) {
} // namespace implementation
} // namespace V1_0
} // namespace drm
-} // namespace drm
} // namespace hardware
} // namespace android
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#ifndef ANDROID_HARDWARE_DRM_DRM_V1_0__DRMFACTORY_H
-#define ANDROID_HARDWARE_DRM_DRM_V1_0__DRMFACTORY_H
+#ifndef ANDROID_HARDWARE_DRM_V1_0__DRMFACTORY_H
+#define ANDROID_HARDWARE_DRM_V1_0__DRMFACTORY_H
-#include <android/hardware/drm/drm/1.0/IDrmFactory.h>
+#include <android/hardware/drm/1.0/IDrmFactory.h>
#include <hidl/Status.h>
#include <media/drm/DrmAPI.h>
#include <media/PluginLoader.h>
namespace android {
namespace hardware {
namespace drm {
-namespace drm {
namespace V1_0 {
namespace implementation {
-using ::android::hardware::drm::drm::V1_0::IDrmFactory;
-using ::android::hardware::drm::drm::V1_0::IDrmPlugin;
+using ::android::hardware::drm::V1_0::IDrmFactory;
+using ::android::hardware::drm::V1_0::IDrmPlugin;
using ::android::hardware::hidl_array;
using ::android::hardware::hidl_string;
using ::android::hardware::hidl_vec;
DrmFactory();
virtual ~DrmFactory() {}
- // Methods from ::android::hardware::drm::drm::V1_0::IDrmFactory follow.
+ // Methods from ::android::hardware::drm::V1_0::IDrmFactory follow.
Return<bool> isCryptoSchemeSupported(const hidl_array<uint8_t, 16>& uuid)
override;
} // namespace implementation
} // namespace V1_0
} // namespace drm
-} // namespace drm
} // namespace hardware
} // namespace android
-#endif // ANDROID_HARDWARE_DRM_DRM_V1_0__DRMFACTORY_H
+#endif // ANDROID_HARDWARE_DRM_V1_0__DRMFACTORY_H
namespace android {
namespace hardware {
namespace drm {
-namespace drm {
namespace V1_0 {
namespace implementation {
- // Methods from ::android::hardware::drm::drm::V1_0::IDrmPlugin follow.
+ // Methods from ::android::hardware::drm::V1_0::IDrmPlugin follow.
Return<void> DrmPlugin::openSession(openSession_cb _hidl_cb) {
Vector<uint8_t> legacySessionId;
} // namespace implementation
} // namespace V1_0
} // namespace drm
-} // namespace drm
} // namespace hardware
} // namespace android
* limitations under the License.
*/
-#ifndef ANDROID_HARDWARE_DRM_DRM_V1_0__DRMPLUGIN_H
-#define ANDROID_HARDWARE_DRM_DRM_V1_0__DRMPLUGIN_H
+#ifndef ANDROID_HARDWARE_DRM_V1_0__DRMPLUGIN_H
+#define ANDROID_HARDWARE_DRM_V1_0__DRMPLUGIN_H
-#include <media/drm/DrmAPI.h>
-#include <android/hardware/drm/drm/1.0/IDrmPlugin.h>
-#include <android/hardware/drm/drm/1.0/IDrmPluginListener.h>
-#include <hidl/MQDescriptor.h>
+#include <android/hardware/drm/1.0/IDrmPlugin.h>
+#include <android/hardware/drm/1.0/IDrmPluginListener.h>
#include <hidl/Status.h>
+#include <media/drm/DrmAPI.h>
namespace android {
namespace hardware {
namespace drm {
-namespace drm {
namespace V1_0 {
namespace implementation {
-using ::android::hardware::drm::drm::V1_0::EventType;
-using ::android::hardware::drm::drm::V1_0::IDrmPlugin;
-using ::android::hardware::drm::drm::V1_0::IDrmPluginListener;
-using ::android::hardware::drm::drm::V1_0::KeyRequestType;
-using ::android::hardware::drm::drm::V1_0::KeyStatus;
-using ::android::hardware::drm::drm::V1_0::KeyType;
-using ::android::hardware::drm::drm::V1_0::KeyValue;
-using ::android::hardware::drm::drm::V1_0::SecureStop;
+using ::android::hardware::drm::V1_0::EventType;
+using ::android::hardware::drm::V1_0::IDrmPlugin;
+using ::android::hardware::drm::V1_0::IDrmPluginListener;
+using ::android::hardware::drm::V1_0::KeyRequestType;
+using ::android::hardware::drm::V1_0::KeyStatus;
+using ::android::hardware::drm::V1_0::KeyType;
+using ::android::hardware::drm::V1_0::KeyValue;
+using ::android::hardware::drm::V1_0::SecureStop;
using ::android::hardware::hidl_array;
using ::android::hardware::hidl_string;
using ::android::hardware::hidl_vec;
DrmPlugin(android::DrmPlugin *plugin) : mLegacyPlugin(plugin) {}
~DrmPlugin() {delete mLegacyPlugin;}
- // Methods from ::android::hardware::drm::drm::V1_0::IDrmPlugin follow.
+ // Methods from ::android::hardware::drm::V1_0::IDrmPlugin follow.
Return<void> openSession(openSession_cb _hidl_cb) override;
} // namespace implementation
} // namespace V1_0
} // namespace drm
-} // namespace drm
} // namespace hardware
} // namespace android
-#endif // ANDROID_HARDWARE_DRM_DRM_V1_0__DRMPLUGIN_H
+#endif // ANDROID_HARDWARE_DRM_V1_0__DRMPLUGIN_H
namespace android {
namespace hardware {
namespace drm {
-namespace drm {
namespace V1_0 {
namespace implementation {
case android::ERROR_DRM_RESOURCE_BUSY:
status = Status::ERROR_DRM_RESOURCE_BUSY;
break;
+ case android::ERROR_DRM_INSUFFICIENT_OUTPUT_PROTECTION:
+ status = Status::ERROR_DRM_INSUFFICIENT_OUTPUT_PROTECTION;
+ break;
case android::ERROR_DRM_DEVICE_REVOKED:
status = Status::ERROR_DRM_DEVICE_REVOKED;
break;
} // namespace implementation
} // namespace V1_0
} // namespace drm
-} // namespace drm
} // namespace hardware
} // namespace android
* limitations under the License.
*/
-#ifndef ANDROID_HARDWARE_DRM_CRYPTO_V1_0_TYPECONVERT
-#define ANDROID_HARDWARE_DRM_CRYPTO_V1_0_TYPECONVERT
+#ifndef ANDROID_HARDWARE_DRM_V1_0_TYPECONVERT
+#define ANDROID_HARDWARE_DRM_V1_0_TYPECONVERT
-#include <utils/Vector.h>
+#include <android/hardware/drm/1.0/types.h>
#include <media/stagefright/MediaErrors.h>
-#include <media/hardware/CryptoAPI.h>
-
-#include <hidl/MQDescriptor.h>
-#include <android/hardware/drm/crypto/1.0/types.h>
+#include <utils/Vector.h>
namespace android {
namespace hardware {
namespace drm {
-namespace crypto {
namespace V1_0 {
namespace implementation {
} // namespace implementation
} // namespace V1_0
-} // namespace crypto
} // namespace drm
} // namespace hardware
} // namespace android
-#endif // ANDROID_HARDWARE_DRM_CRYPTO_V1_0_TYPECONVERT
+#endif // ANDROID_HARDWARE_DRM_V1_0_TYPECONVERT
#define LOG_TAG "android.hardware.drm@1.0-service"
-#include <crypto/1.0/default/CryptoFactory.h>
-#include <drm/1.0/default/DrmFactory.h>
+#include <1.0/default/CryptoFactory.h>
+#include <1.0/default/DrmFactory.h>
#include <hidl/HidlTransportSupport.h>
#include <hidl/LegacySupport.h>
using android::hardware::joinRpcThreadpool;
using android::hardware::registerPassthroughServiceImplementation;
-using android::hardware::drm::crypto::V1_0::ICryptoFactory;
-using android::hardware::drm::drm::V1_0::IDrmFactory;
+using android::hardware::drm::V1_0::ICryptoFactory;
+using android::hardware::drm::V1_0::IDrmFactory;
int main() {
ALOGD("android.hardware.drm@1.0-service starting...");
* limitations under the License.
*/
-package android.hardware.drm.drm@1.0;
+package android.hardware.drm@1.0;
enum Status : uint32_t {
/**
ERROR_DRM_INVALID_STATE,
/**
- * The Drm plugin must return BAD_VALUE whenever an illegal parameter is
+ * The DRM plugin must return BAD_VALUE whenever an illegal parameter is
* passed to one of the interface functions.
*/
BAD_VALUE,
ERROR_DRM_RESOURCE_BUSY,
/**
- * The Drm Plugin must return ERROR_DRM_DEVICE_REVOKED from
+ * The DRM Plugin must return ERROR_DRM_INSUFFICIENT_OUTPUT_PROTECTION
+ * when the output protection level enabled on the device is not
+ * sufficient to meet the requirements in the license policy. HDCP is an
+ * example of a form of output protection.
+ */
+ ERROR_DRM_INSUFFICIENT_OUTPUT_PROTECTION,
+
+ /**
+ * The DRM Plugin must return ERROR_DRM_DEVICE_REVOKED from
* provideProvisionResponse and provideKeyResponse if the response indicates
* that the device has been revoked. Device revocation means that the device
* is no longer permitted to play content.
};
typedef vec<uint8_t> SecureStopId;
+
+
+/**
+ * Enumerate the supported crypto modes
+ */
+enum Mode : uint32_t {
+ UNENCRYPTED = 0, // Samples are unencrypted
+ AES_CTR = 1, // Samples are encrypted with AES CTR mode
+ AES_CBC_CTS = 2, // Samples are encrypted with AES CBC CTS mode
+ AES_CBC = 3, // Samples are encrypted with AES CBC mode
+};
+
+/**
+ * A subsample consists of some number of bytes of clear (unencrypted)
+ * data followed by a number of bytes of encrypted data.
+ */
+struct SubSample {
+ uint32_t numBytesOfClearData;
+ uint32_t numBytesOfEncryptedData;
+};
+
+/**
+ * A crypto Pattern is a repeating sequence of encrypted and clear blocks
+ * occuring within the bytes indicated by mNumBytesOfEncryptedDatad bytes
+ * of a subsample. Patterns are used to reduce the CPU overhead of
+ * decrypting samples. As an example, HLS uses 1:9 patterns where every
+ * 10th block is encrypted.
+ */
+struct Pattern {
+ /**
+ * The number of blocks to be encrypted in the pattern. If zero,
+ * pattern encryption is inoperative.
+ */
+ uint32_t encryptBlocks;
+
+ /**
+ * The number of blocks to be skipped (left clear) in the pattern. If
+ * zero, pattern encryption is inoperative.
+ */
+ uint32_t skipBlocks;
+};
+
+enum BufferType : uint32_t {
+ SHARED_MEMORY = 0,
+ NATIVE_HANDLE = 1,
+};
+
+/**
+ * A SharedBuffer describes a decrypt buffer which is defined by an offset and
+ * a size. The offset is relative to the shared memory base which is established
+ * using setSharedMemoryBase().
+ */
+struct SharedBuffer {
+ /**
+ * The offset from the shared memory base
+ */
+ uint64_t offset;
+
+ /**
+ * The size of the shared buffer in bytes
+ */
+ uint64_t size;
+};
+
+
+/**
+ * A decrypt destination buffer can be either normal user-space shared
+ * memory for the non-secure decrypt case, or it can be a secure buffer
+ * which is referenced by a native-handle. The native handle is allocated
+ * by the vendor's buffer allocator.
+ */
+struct DestinationBuffer {
+ /**
+ * The type of the buffer
+ */
+ BufferType type;
+
+ /**
+ * If type == SHARED_MEMORY, the decrypted data must be written
+ * to user-space non-secure shared memory.
+ */
+ SharedBuffer nonsecureMemory;
+
+ /**
+ * If type == NATIVE_HANDLE, the decrypted data must be written
+ * to secure memory referenced by the vendor's buffer allocator.
+ */
+ handle secureMemory;
+};
// This is an autogenerated file, do not edit.
subdirs = [
- "crypto/1.0",
- "drm/1.0",
+ "1.0",
]
+++ /dev/null
-// This file is autogenerated by hidl-gen. Do not edit manually.
-
-genrule {
- name: "android.hardware.drm.crypto@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.crypto@1.0",
- srcs: [
- "types.hal",
- "ICryptoFactory.hal",
- "ICryptoPlugin.hal",
- ],
- out: [
- "android/hardware/drm/crypto/1.0/types.cpp",
- "android/hardware/drm/crypto/1.0/CryptoFactoryAll.cpp",
- "android/hardware/drm/crypto/1.0/CryptoPluginAll.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.drm.crypto@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.drm.crypto@1.0",
- srcs: [
- "types.hal",
- "ICryptoFactory.hal",
- "ICryptoPlugin.hal",
- ],
- out: [
- "android/hardware/drm/crypto/1.0/types.h",
- "android/hardware/drm/crypto/1.0/ICryptoFactory.h",
- "android/hardware/drm/crypto/1.0/IHwCryptoFactory.h",
- "android/hardware/drm/crypto/1.0/BnHwCryptoFactory.h",
- "android/hardware/drm/crypto/1.0/BpHwCryptoFactory.h",
- "android/hardware/drm/crypto/1.0/BsCryptoFactory.h",
- "android/hardware/drm/crypto/1.0/ICryptoPlugin.h",
- "android/hardware/drm/crypto/1.0/IHwCryptoPlugin.h",
- "android/hardware/drm/crypto/1.0/BnHwCryptoPlugin.h",
- "android/hardware/drm/crypto/1.0/BpHwCryptoPlugin.h",
- "android/hardware/drm/crypto/1.0/BsCryptoPlugin.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.drm.crypto@1.0",
- generated_sources: ["android.hardware.drm.crypto@1.0_genc++"],
- generated_headers: ["android.hardware.drm.crypto@1.0_genc++_headers"],
- export_generated_headers: ["android.hardware.drm.crypto@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",
- ],
-}
+++ /dev/null
-# 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 := android.hardware.drm.crypto@1.0-impl
-LOCAL_MODULE_RELATIVE_PATH := hw
-LOCAL_SRC_FILES := \
- CryptoFactory.cpp \
- CryptoPlugin.cpp \
- TypeConvert.cpp \
-
-LOCAL_SHARED_LIBRARIES := \
- libhidlbase \
- libhidltransport \
- libhwbinder \
- libhidlmemory \
- libutils \
- liblog \
- libmediadrm \
- libstagefright_foundation \
- android.hardware.drm.crypto@1.0 \
- android.hidl.memory@1.0 \
-
-LOCAL_C_INCLUDES := \
- frameworks/native/include \
- frameworks/av/include
-
-# TODO: The legacy DRM plugins only support 32-bit. They need
-# to be migrated to 64-bit (b/18948909)
-LOCAL_32_BIT_ONLY := true
-
-
-include $(BUILD_SHARED_LIBRARY)
+++ /dev/null
-/*
- * 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 "TypeConvert.h"
-
-namespace android {
-namespace hardware {
-namespace drm {
-namespace crypto {
-namespace V1_0 {
-namespace implementation {
-
-Status toStatus(status_t legacyStatus) {
- Status status;
- switch(legacyStatus) {
- case android::OK:
- status = Status::OK;
- break;
- case android::ERROR_DRM_NO_LICENSE:
- status = Status::ERROR_DRM_NO_LICENSE;
- break;
- case android::ERROR_DRM_LICENSE_EXPIRED:
- status = Status::ERROR_DRM_LICENSE_EXPIRED;
- break;
- case android::ERROR_DRM_RESOURCE_BUSY:
- status = Status::ERROR_DRM_RESOURCE_BUSY;
- break;
- case android::ERROR_DRM_INSUFFICIENT_OUTPUT_PROTECTION:
- status = Status::ERROR_DRM_INSUFFICIENT_OUTPUT_PROTECTION;
- break;
- case android::ERROR_DRM_SESSION_NOT_OPENED:
- status = Status::ERROR_DRM_SESSION_NOT_OPENED;
- break;
- case android::ERROR_DRM_CANNOT_HANDLE:
- case android::BAD_VALUE:
- status = Status::ERROR_DRM_CANNOT_HANDLE;
- break;
- default:
- ALOGW("Unable to convert legacy status: %d, defaulting to UNKNOWN",
- legacyStatus);
- status = Status::ERROR_UNKNOWN_CRYPTO_EXCEPTION;
- break;
- }
- return status;
-}
-
-} // namespace implementation
-} // namespace V1_0
-} // namespace crypto
-} // namespace drm
-} // namespace hardware
-} // namespace android
+++ /dev/null
-/*
- * 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.drm.crypto@1.0;
-
-enum Status : uint32_t {
- /**
- * The Crypto plugin must return OK when an operation completes without any
- * errors.
- */
- OK,
-
- /**
- * The Crypto Plugin must return ERROR_DRM_NO_LICENSE if decryption is
- * attempted when the license keys have not been loaded into the crypto
- * session.
- */
- ERROR_DRM_NO_LICENSE,
-
- /**
- * The Crypto Plugin must return ERROR_DRM_LICENSE_EXPIRED if decryption
- * is attempted when the license keys have expired and are no longer usable.
- */
- ERROR_DRM_LICENSE_EXPIRED,
-
- /**
- * The Crypto Plugin must return ERROR_DRM_RESOURCE_BUSY when a required
- * crypto resource cannot be allocated while attempting decryption.
- */
- ERROR_DRM_RESOURCE_BUSY,
-
- /**
- * The Crypto Plugin must return ERROR_DRM_INSUFFICIENT_OUTPUT_PROTECTION
- * when the output protection level enabled on the device is not
- * sufficient to meet the requirements in the license policy. HDCP is an
- * example of a form of output protection.
- */
- ERROR_DRM_INSUFFICIENT_OUTPUT_PROTECTION,
-
- /**
- * The Crypto Plugin must return ERROR_DRM_SESSION_NOT_OPENED when
- * decryption is attempted on a session that is not opened.
- */
- ERROR_DRM_SESSION_NOT_OPENED,
-
- /**
- * The Crypto Plugin must return ERROR_DRM_CANNOT_HANDLE when an operation
- * is attempted that cannot be supported by the crypto system of the device.
- */
- ERROR_DRM_CANNOT_HANDLE,
-
- /**
- * The Crypto Plugin must return ERROR_UNKNOWN_CRYPTO_EXCEPTION in any
- * fatal condition that is not covered by the other error messages.
- */
- ERROR_UNKNOWN_CRYPTO_EXCEPTION,
-};
-
-/**
- * Enumerate the supported crypto modes
- */
-enum Mode : uint32_t {
- UNENCRYPTED = 0, // Samples are unencrypted
- AES_CTR = 1, // Samples are encrypted with AES CTR mode
- AES_CBC_CTS = 2, // Samples are encrypted with AES CBC CTS mode
- AES_CBC = 3, // Samples are encrypted with AES CBC mode
-};
-
-/**
- * A subsample consists of some number of bytes of clear (unencrypted)
- * data followed by a number of bytes of encrypted data.
- */
-struct SubSample {
- uint32_t numBytesOfClearData;
- uint32_t numBytesOfEncryptedData;
-};
-
-/**
- * A crypto Pattern is a repeating sequence of encrypted and clear blocks
- * occuring within the bytes indicated by mNumBytesOfEncryptedDatad bytes
- * of a subsample. Patterns are used to reduce the CPU overhead of
- * decrypting samples. As an example, HLS uses 1:9 patterns where every
- * 10th block is encrypted.
- */
-struct Pattern {
- /**
- * The number of blocks to be encrypted in the pattern. If zero,
- * pattern encryption is inoperative.
- */
- uint32_t encryptBlocks;
-
- /**
- * The number of blocks to be skipped (left clear) in the pattern. If
- * zero, pattern encryption is inoperative.
- */
- uint32_t skipBlocks;
-};
-
-enum BufferType : uint32_t {
- SHARED_MEMORY = 0,
- NATIVE_HANDLE = 1,
-};
-
-
-/**
- * A decrypt destination buffer can be either normal user-space shared
- * memory for the non-secure decrypt case, or it can be a secure buffer
- * which is referenced by a native-handle. The native handle is allocated
- * by the vendor's buffer allocator.
- */
-struct DestinationBuffer {
- /**
- * The type of the buffer
- */
- BufferType type;
-
- /**
- * If type == SHARED_MEMORY, the decrypted data must be written
- * to user-space non-secure shared memory.
- */
- memory nonsecureMemory;
-
- /**
- * If type == NATIVE_HANDLE, the decrypted data must be written
- * to secure memory referenced by the vendor's buffer allocator.
- */
- handle secureMemory;
-};
+++ /dev/null
-// This file is autogenerated by hidl-gen. Do not edit manually.
-
-genrule {
- name: "android.hardware.drm.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.drm@1.0",
- srcs: [
- "types.hal",
- "IDrmFactory.hal",
- "IDrmPlugin.hal",
- "IDrmPluginListener.hal",
- ],
- out: [
- "android/hardware/drm/drm/1.0/types.cpp",
- "android/hardware/drm/drm/1.0/DrmFactoryAll.cpp",
- "android/hardware/drm/drm/1.0/DrmPluginAll.cpp",
- "android/hardware/drm/drm/1.0/DrmPluginListenerAll.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.drm.drm@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.drm.drm@1.0",
- srcs: [
- "types.hal",
- "IDrmFactory.hal",
- "IDrmPlugin.hal",
- "IDrmPluginListener.hal",
- ],
- out: [
- "android/hardware/drm/drm/1.0/types.h",
- "android/hardware/drm/drm/1.0/IDrmFactory.h",
- "android/hardware/drm/drm/1.0/IHwDrmFactory.h",
- "android/hardware/drm/drm/1.0/BnHwDrmFactory.h",
- "android/hardware/drm/drm/1.0/BpHwDrmFactory.h",
- "android/hardware/drm/drm/1.0/BsDrmFactory.h",
- "android/hardware/drm/drm/1.0/IDrmPlugin.h",
- "android/hardware/drm/drm/1.0/IHwDrmPlugin.h",
- "android/hardware/drm/drm/1.0/BnHwDrmPlugin.h",
- "android/hardware/drm/drm/1.0/BpHwDrmPlugin.h",
- "android/hardware/drm/drm/1.0/BsDrmPlugin.h",
- "android/hardware/drm/drm/1.0/IDrmPluginListener.h",
- "android/hardware/drm/drm/1.0/IHwDrmPluginListener.h",
- "android/hardware/drm/drm/1.0/BnHwDrmPluginListener.h",
- "android/hardware/drm/drm/1.0/BpHwDrmPluginListener.h",
- "android/hardware/drm/drm/1.0/BsDrmPluginListener.h",
- ],
-}
-
-cc_library_shared {
- name: "android.hardware.drm.drm@1.0",
- generated_sources: ["android.hardware.drm.drm@1.0_genc++"],
- generated_headers: ["android.hardware.drm.drm@1.0_genc++_headers"],
- export_generated_headers: ["android.hardware.drm.drm@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",
- ],
-}
+++ /dev/null
-# 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 := android.hardware.drm.drm@1.0-impl
-LOCAL_MODULE_RELATIVE_PATH := hw
-LOCAL_SRC_FILES := \
- DrmFactory.cpp \
- DrmPlugin.cpp \
- TypeConvert.cpp \
-
-LOCAL_SHARED_LIBRARIES := \
- libhidlbase \
- libhidltransport \
- libhwbinder \
- libutils \
- liblog \
- libmediadrm \
- libstagefright_foundation \
- android.hardware.drm.drm@1.0 \
-
-LOCAL_C_INCLUDES := \
- frameworks/native/include \
- frameworks/av/include
-
-# TODO: The legacy DRM plugins only support 32-bit. They need
-# to be migrated to 64-bit (b/18948909)
-LOCAL_32_BIT_ONLY := true
-
-include $(BUILD_SHARED_LIBRARY)
+++ /dev/null
-/*
- * 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_DRM_DRM_V1_0_TYPECONVERT
-#define ANDROID_HARDWARE_DRM_DRM_V1_0_TYPECONVERT
-
-#include <utils/Vector.h>
-#include <media/stagefright/MediaErrors.h>
-#include <media/drm/DrmAPI.h>
-
-#include <hidl/MQDescriptor.h>
-#include <android/hardware/drm/drm/1.0/types.h>
-
-namespace android {
-namespace hardware {
-namespace drm {
-namespace drm {
-namespace V1_0 {
-namespace implementation {
-
-using ::android::hardware::hidl_vec;
-
-template<typename T> const hidl_vec<T> toHidlVec(const Vector<T> &Vector) {
- hidl_vec<T> vec;
- vec.setToExternal(const_cast<T *>(Vector.array()), Vector.size());
- return vec;
-}
-
-template<typename T> hidl_vec<T> toHidlVec(Vector<T> &Vector) {
- hidl_vec<T> vec;
- vec.setToExternal(Vector.editArray(), Vector.size());
- return vec;
-}
-
-template<typename T> const Vector<T> toVector(const hidl_vec<T> & vec) {
- Vector<T> vector;
- vector.appendArray(vec.data(), vec.size());
- return *const_cast<const Vector<T> *>(&vector);
-}
-
-template<typename T> Vector<T> toVector(hidl_vec<T> &vec) {
- Vector<T> vector;
- vector.appendArray(vec.data(), vec.size());
- return vector;
-}
-
-Status toStatus(status_t legacyStatus);
-
-} // namespace implementation
-} // namespace V1_0
-} // namespace drm
-} // namespace drm
-} // namespace hardware
-} // namespace android
-
-#endif // ANDROID_HARDWARE_DRM_DRM_V1_0_TYPECONVERT
* Extended interface for AGNSS support.
*/
interface IAGnss {
+ @export(name="", value_prefix="APN_IP_")
enum ApnIpType : uint8_t {
INVALID = 0,
IPV4 = 1,
/** Callback structure for the AGNSS interface. */
interface IAGnssCallback {
/** AGNSS type **/
+ @export(name="", value_prefix="AGPS_")
enum AGnssType : uint8_t {
TYPE_SUPL = 1,
TYPE_C2K = 2
};
+ @export(name="", value_prefix="GNSS_")
enum AGnssStatusValue : uint8_t {
/** GNSS requests data connection for AGNSS. */
REQUEST_AGNSS_DATA_CONN = 1,
/*
* Represents the status of AGNSS augmented to support IPv4.
*/
+ @export(name="", value_prefix="GPS_")
struct AGnssStatusIpV4 {
AGnssType type;
AGnssStatusValue status;
* location, unique subscriber ID, phone number string and network availability changes.
*/
interface IAGnssRil {
+ @export(name="", value_prefix="AGPS_SETID_TYPE_")
enum SetIDType : uint8_t {
NONE = 0,
IMSI = 1,
MSISDM = 2
};
+ @export(name="", value_prefix="AGPS_RIL_NETWORK_TYPE_")
enum NetworkType : uint8_t {
MOBILE = 0,
WIFI = 1,
WIMAX = 6,
};
+ @export(name="", value_prefix="AGPS_REF_LOCATION_TYPE_")
enum AGnssRefLocationType : uint8_t {
GSM_CELLID = 1,
UMTS_CELLID = 2,
*/
interface IAGnssRilCallback {
/* Kinds of SET ID that can be requested */
+ @export(name="", value_prefix="AGPS_RIL_REQUEST_SETID_")
enum ID : uint32_t {
IMSI = 1 << 0L,
MSISDN = 1 << 1L,
import IGnssNi;
import IGnssXtra;
-/* Represents the standard GNSS interface. */
+/* Represents the standard GNSS (Global Navigation Satellite System) interface. */
interface IGnss {
/* Requested operational mode for GNSS operation. */
+ @export(name="", value_prefix="GPS_POSITION_MODE_")
enum GnssPositionMode : uint8_t {
/** Mode for running GNSS standalone (no assistance). */
STANDALONE = 0,
};
/* Requested recurrence mode for GNSS operation. */
+ @export(name="", value_prefix="GPS_POSITION_")
enum GnssPositionRecurrence : uint32_t {
/** Receive GNSS fixes on a recurring basis at a specified period. */
RECURRENCE_PERIODIC = 0,
* Flags used to specify which aiding data to delete when calling
* deleteAidingData().
*/
+ @export(name="", value_prefix="GPS_")
enum GnssAidingData : uint16_t {
DELETE_EPHEMERIS = 0x0001,
DELETE_ALMANAC = 0x0002,
/*
* Enum which holds the bit masks for batching control.
*/
+ @export(name="", value_prefix="FLP_BATCH_")
enum Flag : uint8_t {
/*
* If this flag is set, the hardware implementation
*/
interface IGnssCallback {
/* Flags for the gnssSetCapabilities callback. */
+ @export(name="", value_prefix="GPS_CAPABILITY_")
enum Capabilities : uint32_t {
/*
* GNSS HAL schedules fixes for RECURRENCE_PERIODIC mode.
};
/* GNSS status event values. */
+ @export(name="", value_prefix="GPS_STATUS_")
enum GnssStatusValue : uint8_t {
/** GNSS status unknown. */
NONE = 0,
/*
* Flags that indicate information about the satellite
*/
+ @export(name="", value_prefix="GNSS_SV_FLAGS_")
enum GnssSvFlags : uint8_t {
NONE = 0,
HAS_EPHEMERIS_DATA = 1 << 0,
/*
* Carrier frequency of the signal tracked, for example it can be the
- * GPS L1 = 1.57542e9 Hz, or L2, L5, varying GLO channels, etc. If
- * the field is not set, it is the primary common use frequency,
- * e.g. L1 for GPS.
+ * GPS central frequency for L1 = 1575.45 MHz, or L2 = 1227.60 MHz, L5 =
+ * 1176.45 MHz, varying GLO channels, etc. If the field is not set, it
+ * is the primary common use central frequency, e.g. L1 = 1575.45 MHz
+ * for GPS.
+ *
+ * For an L1, L5 receiver tracking a satellite on L1 and L5 at the same
+ * time, two GnssSvInfo structs must be reported for this same
+ * satellite, in one of the structs, all the values related
+ * to L1 must be filled, and in the other all of the values related to
+ * L5 must be filled.
*
* If the data is available, gnssClockFlags must contain
* HAS_CARRIER_FREQUENCY.
*/
interface IGnssGeofenceCallback {
+ @export(name="", value_prefix="GPS_GEOFENCE_")
enum GeofenceTransition : int32_t {
ENTERED = (1 << 0L),
EXITED = (1 << 1L),
UNCERTAIN = (1 << 2L),
};
+ @export(name="", value_prefix="GPS_GEOFENCE_")
enum GeofenceAvailability : int32_t {
UNAVAILABLE = (1 << 0L),
AVAILABLE = (1 << 1L),
};
+ @export(name="", value_prefix="GPS_GEOFENCE_")
enum GeofenceStatus : int32_t {
OPERATION_SUCCESS = 0,
ERROR_TOO_MANY_GEOFENCES = -100,
* Extended interface for GNSS Measurements support.
*/
interface IGnssMeasurement {
+ @export(name="", value_prefix="GPS_MEASUREMENT_")
enum GnssMeasurementStatus : int32_t {
SUCCESS = 0,
ERROR_ALREADY_INIT = -100,
/*
* Flags to indicate what fields in GnssClock are valid.
*/
+ @export(name="", value_prefix="GNSS_CLOCK_")
enum GnssClockFlags : uint16_t {
/** A valid 'leap second' is stored in the data structure. */
HAS_LEAP_SECOND = 1 << 0,
/*
* Flags to indicate what fields in GnssMeasurement are valid.
*/
+ @export(name="", value_prefix="GNSS_MEASUREMENT_")
enum GnssMeasurementFlags : uint32_t {
/** A valid 'snr' is stored in the data structure. */
HAS_SNR = 1 << 0,
* Enumeration of available values for the GNSS Measurement's multipath
* indicator.
*/
+ @export(name="", value_prefix="GNSS_MULTIPATH_")
enum GnssMultipathIndicator : uint8_t {
/** The indicator is not available or unknown. */
INDICATOR_UNKNOWN = 0,
* If GNSS is still searching for a satellite, the corresponding state must be
* set to STATE_UNKNOWN(0).
*/
+ @export(name="", value_prefix="GNSS_MEASUREMENT_")
enum GnssMeasurementState : uint32_t {
STATE_UNKNOWN = 0,
STATE_CODE_LOCK = 1 << 0,
/*
* Flags indicating the Accumulated Delta Range's states.
*/
+ @export(name="", value_prefix="GNSS_")
enum GnssAccumulatedDeltaRangeState : uint16_t {
ADR_STATE_UNKNOWN = 0,
ADR_STATE_VALID = 1 << 0,
/*
* Carrier frequency of the signal tracked, for example it can be the
- * GPS L1 = 1.57542e9 Hz, or L2, L5, varying GLO channels, etc. If the
- * field is not set, it is the primary common use frequency,
- * e.g. L1 for GPS.
+ * GPS central frequency for L1 = 1575.45 MHz, or L2 = 1227.60 MHz, L5 =
+ * 1176.45 MHz, varying GLO channels, etc. If the field is not set, it
+ * is the primary common use central frequency, e.g. L1 = 1575.45 MHz
+ * for GPS.
+ *
+ * For an L1, L5 receiver tracking a satellite on L1 and L5 at the same
+ * time, two raw measurement structs must be reported for this same
+ * satellite, in one of the measurement structs, all the values related
+ * to L1 must be filled, and in the other all of the values related to
+ * L5 must be filled.
*
* If the data is available, gnssClockFlags must contain
* HAS_CARRIER_FREQUENCY.
/*
* Automatic gain control (AGC) level. AGC acts as a variable gain
- * amplifier adjusting the power of the incoming signal to minimize the
- * quantization losses. The AGC level may be used to indicate potential
- * interference. When AGC is at a nominal level, this value
- * must be set as 0. Higher gain (and/or lower input power) must be
- * output as a positive number. Hence in cases of strong jamming, in the
- * band of this signal, this value must go more negative.
+ * amplifier adjusting the power of the incoming signal. The AGC level
+ * may be used to indicate potential interference. When AGC is at a
+ * nominal level, this value must be set as 0. Higher gain (and/or lower
+ * input power) must be output as a positive number. Hence in cases of
+ * strong jamming, in the band of this signal, this value must go more
+ * negative.
*
* Note: Different hardware designs (e.g. antenna, pre-amplification, or
* other RF HW components) may also affect the typical output of of this
* Extended interface for GNSS navigation message reporting support.
*/
interface IGnssNavigationMessage {
+ @export(name="", value_prefix="GPS_NAVIGATION_MESSAGE_")
enum GnssNavigationMessageStatus : int32_t {
SUCCESS = 0,
ERROR_ALREADY_INIT = -100,
* For convenience, first byte is the GnssConstellationType on which that signal
* is typically transmitted.
*/
+ @export(name="", value_prefix="GNSS_NAVIGATION_MESSAGE_TYPE_")
enum GnssNavigationMessageType : int16_t {
UNKNOWN = 0,
/** GNSS L1 C/A message contained in the structure. */
* No need to send any navigation message that contains words with parity error
* and cannot be corrected.
*/
+ @export(name="navigation_message_status", value_prefix="NAV_MESSAGE_STATUS_")
enum NavigationMessageStatus : uint16_t {
PARITY_PASSED = (1 << 0),
PARITY_REBUILT = (1 << 1),
/*
* GnssNiType constants
*/
+ @export(name="", value_prefix="GPS_NI_TYPE_")
enum GnssNiType : uint8_t {
VOICE = 1,
UMTS_SUPL = 2,
/*
* GnssNiNotifyFlags constants
*/
+ @export(name="", value_prefix="GPS_NI_")
enum GnssNiNotifyFlags : uint32_t {
/** NI requires notification */
NEED_NOTIFY = 0x0001,
* GNSS NI responses, used to define the response in
* NI structures
*/
+ @export(name="", value_prefix="GPS_NI_")
enum GnssUserResponseType : uint8_t {
RESPONSE_ACCEPT = 1,
RESPONSE_DENY = 2,
/*
* NI data encoding scheme
*/
+ @export(name="", value_prefix="GPS_")
enum GnssNiEncodingType : int32_t {
ENC_NONE = 0,
ENC_SUPL_GSM_DEFAULT = 1,
package android.hardware.gnss@1.0;
+@export(name="", value_prefix="GNSS_MAX_")
enum GnssMax : uint32_t {
/** Maximum number of SVs for gnssSvStatusCb(). */
SVS_COUNT = 64,
/*
* Constellation type of GnssSvInfo
*/
+
+@export(name="", value_prefix="GNSS_CONSTELLATION_")
enum GnssConstellationType : uint8_t {
UNKNOWN = 0,
GPS = 1,
};
/** Bit mask to indicate which values are valid in a GnssLocation object. */
+@export(name="", value_prefix="GPS_LOCATION_")
enum GnssLocationFlags : uint16_t {
/** GnssLocation has valid latitude and longitude. */
HAS_LAT_LONG = 0x0001,
* red 0.680 0.320
* white (D65) 0.3127 0.3290
*
- * Gamma: 2.2
+ * Gamma: 2.6
*/
DCI_P3 = 6,
*
* Gamma: 2.2
*/
- ADOBE_RGB = 8
+ ADOBE_RGB = 8,
+
+ /*
+ * DISPLAY_P3 is a color space that uses the DCI_P3 primaries,
+ * the D65 white point and the SRGB transfer functions.
+ * Rendering Intent: Colorimetric
+ * Primaries:
+ * x y
+ * green 0.265 0.690
+ * blue 0.150 0.060
+ * red 0.680 0.320
+ * white (D65) 0.3127 0.3290
+ *
+ * PC/Internet (sRGB) Gamma Correction (GC):
+ *
+ * if Vlinear ≤ 0.0031308
+ * Vnonlinear = 12.92 * Vlinear
+ * else
+ * Vnonlinear = 1.055 * (Vlinear)^(1/2.4) – 0.055
+ */
+ DISPLAY_P3 = 9
};
/*
if (outDescriptor) {
hidl_cb(Error::NONE, *outDescriptor);
} else {
- hidl_cb(Error::NO_RESOURCES, MQDescriptorSync<uint32_t>());
+ hidl_cb(Error::NO_RESOURCES, CommandQueueType::Descriptor());
}
return Void();
bool HwcClient::CommandReader::parseSelectDisplay(uint16_t length)
{
- if (length != CommandWriter::kSelectDisplayLength) {
+ if (length != CommandWriterBase::kSelectDisplayLength) {
return false;
}
bool HwcClient::CommandReader::parseSelectLayer(uint16_t length)
{
- if (length != CommandWriter::kSelectLayerLength) {
+ if (length != CommandWriterBase::kSelectLayerLength) {
return false;
}
bool HwcClient::CommandReader::parseSetColorTransform(uint16_t length)
{
- if (length != CommandWriter::kSetColorTransformLength) {
+ if (length != CommandWriterBase::kSetColorTransformLength) {
return false;
}
bool HwcClient::CommandReader::parseSetOutputBuffer(uint16_t length)
{
- if (length != CommandWriter::kSetOutputBufferLength) {
+ if (length != CommandWriterBase::kSetOutputBufferLength) {
return false;
}
bool HwcClient::CommandReader::parseValidateDisplay(uint16_t length)
{
- if (length != CommandWriter::kValidateDisplayLength) {
+ if (length != CommandWriterBase::kValidateDisplayLength) {
return false;
}
bool HwcClient::CommandReader::parseAcceptDisplayChanges(uint16_t length)
{
- if (length != CommandWriter::kAcceptDisplayChangesLength) {
+ if (length != CommandWriterBase::kAcceptDisplayChangesLength) {
return false;
}
bool HwcClient::CommandReader::parsePresentDisplay(uint16_t length)
{
- if (length != CommandWriter::kPresentDisplayLength) {
+ if (length != CommandWriterBase::kPresentDisplayLength) {
return false;
}
bool HwcClient::CommandReader::parseSetLayerCursorPosition(uint16_t length)
{
- if (length != CommandWriter::kSetLayerCursorPositionLength) {
+ if (length != CommandWriterBase::kSetLayerCursorPositionLength) {
return false;
}
bool HwcClient::CommandReader::parseSetLayerBuffer(uint16_t length)
{
- if (length != CommandWriter::kSetLayerBufferLength) {
+ if (length != CommandWriterBase::kSetLayerBufferLength) {
return false;
}
bool HwcClient::CommandReader::parseSetLayerBlendMode(uint16_t length)
{
- if (length != CommandWriter::kSetLayerBlendModeLength) {
+ if (length != CommandWriterBase::kSetLayerBlendModeLength) {
return false;
}
bool HwcClient::CommandReader::parseSetLayerColor(uint16_t length)
{
- if (length != CommandWriter::kSetLayerColorLength) {
+ if (length != CommandWriterBase::kSetLayerColorLength) {
return false;
}
bool HwcClient::CommandReader::parseSetLayerCompositionType(uint16_t length)
{
- if (length != CommandWriter::kSetLayerCompositionTypeLength) {
+ if (length != CommandWriterBase::kSetLayerCompositionTypeLength) {
return false;
}
bool HwcClient::CommandReader::parseSetLayerDataspace(uint16_t length)
{
- if (length != CommandWriter::kSetLayerDataspaceLength) {
+ if (length != CommandWriterBase::kSetLayerDataspaceLength) {
return false;
}
bool HwcClient::CommandReader::parseSetLayerDisplayFrame(uint16_t length)
{
- if (length != CommandWriter::kSetLayerDisplayFrameLength) {
+ if (length != CommandWriterBase::kSetLayerDisplayFrameLength) {
return false;
}
bool HwcClient::CommandReader::parseSetLayerPlaneAlpha(uint16_t length)
{
- if (length != CommandWriter::kSetLayerPlaneAlphaLength) {
+ if (length != CommandWriterBase::kSetLayerPlaneAlphaLength) {
return false;
}
bool HwcClient::CommandReader::parseSetLayerSidebandStream(uint16_t length)
{
- if (length != CommandWriter::kSetLayerSidebandStreamLength) {
+ if (length != CommandWriterBase::kSetLayerSidebandStreamLength) {
return false;
}
bool HwcClient::CommandReader::parseSetLayerSourceCrop(uint16_t length)
{
- if (length != CommandWriter::kSetLayerSourceCropLength) {
+ if (length != CommandWriterBase::kSetLayerSourceCropLength) {
return false;
}
bool HwcClient::CommandReader::parseSetLayerTransform(uint16_t length)
{
- if (length != CommandWriter::kSetLayerTransformLength) {
+ if (length != CommandWriterBase::kSetLayerTransformLength) {
return false;
}
bool HwcClient::CommandReader::parseSetLayerZOrder(uint16_t length)
{
- if (length != CommandWriter::kSetLayerZOrderLength) {
+ if (length != CommandWriterBase::kSetLayerZOrderLength) {
return false;
}
HwcClient& mClient;
HwcHal& mHal;
- CommandWriter& mWriter;
+ CommandWriterBase& mWriter;
Display mDisplay;
Layer mLayer;
64 * 1024 / sizeof(uint32_t) - 16;
std::mutex mCommandMutex;
CommandReader mReader;
- CommandWriter mWriter;
+ CommandWriterBase mWriter;
sp<IComposerCallback> mCallback;
// This class helps build a command queue. Note that all sizes/lengths are in
// units of uint32_t's.
-class CommandWriter {
+class CommandWriterBase {
public:
- CommandWriter(uint32_t initialMaxSize)
+ CommandWriterBase(uint32_t initialMaxSize)
: mDataMaxSize(initialMaxSize)
{
mData = std::make_unique<uint32_t[]>(mDataMaxSize);
reset();
}
- ~CommandWriter()
+ virtual ~CommandWriterBase()
{
reset();
}
"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",
+ ],
+}
--- /dev/null
+#
+# 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
--- /dev/null
+component_class: HAL_HIDL
+component_type_version: 1.0
+component_name: "IConsumerIr"
+
+package: "android.hardware.ir"
+
+import: "android.hardware.ir@1.0::types"
+
+interface: {
+ api: {
+ name: "transmit"
+ return_type_hidl: {
+ type: TYPE_SCALAR
+ scalar_type: "bool_t"
+ }
+ arg: {
+ type: TYPE_SCALAR
+ scalar_type: "int32_t"
+ }
+ arg: {
+ type: TYPE_VECTOR
+ vector_value: {
+ type: TYPE_SCALAR
+ scalar_type: "int32_t"
+ }
+ }
+ }
+
+ api: {
+ name: "getCarrierFreqs"
+ return_type_hidl: {
+ type: TYPE_SCALAR
+ scalar_type: "bool_t"
+ }
+ return_type_hidl: {
+ type: TYPE_VECTOR
+ vector_value: {
+ type: TYPE_STRUCT
+ predefined_type: "::android::hardware::ir::V1_0::ConsumerIrFreqRange"
+ }
+ }
+ }
+
+}
--- /dev/null
+//
+// 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: "ir_hidl_hal_test",
+ gtest: true,
+ srcs: ["ir_hidl_hal_test.cpp"],
+ shared_libs: [
+ "libbase",
+ "liblog",
+ "libcutils",
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "libutils",
+ "android.hardware.ir@1.0",
+ ],
+ static_libs: ["libgtest"],
+ cflags: [
+ "--coverage",
+ "-O0",
+ "-g",
+ ],
+ ldflags: [
+ "--coverage"
+ ]
+}
--- /dev/null
+/*
+ * 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 "ir_hidl_hal_test"
+
+#include <android-base/logging.h>
+
+#include <android/hardware/ir/1.0/IConsumerIr.h>
+#include <android/hardware/ir/1.0/types.h>
+
+#include <gtest/gtest.h>
+#include <algorithm>
+
+using ::android::hardware::ir::V1_0::IConsumerIr;
+using ::android::hardware::ir::V1_0::ConsumerIrFreqRange;
+using ::android::hardware::hidl_vec;
+using ::android::hardware::Return;
+using ::android::sp;
+
+// The main test class for IR HIDL HAL.
+class ConsumerIrHidlTest : public ::testing::Test {
+ public:
+ virtual void SetUp() override {
+ ir = IConsumerIr::getService(false);
+ ASSERT_NE(ir, nullptr);
+ }
+
+ virtual void TearDown() override {}
+
+ sp<IConsumerIr> ir;
+};
+
+// Test transmit() for the min and max frequency of every available range
+TEST_F(ConsumerIrHidlTest, TransmitTest) {
+ int32_t freqs;
+ bool success;
+ hidl_vec<ConsumerIrFreqRange> ranges;
+ auto cb = [&](bool s, hidl_vec<ConsumerIrFreqRange> v) {
+ ranges = v;
+ success = s;
+ };
+ Return<void> ret = ir->getCarrierFreqs(cb);
+ ASSERT_TRUE(ret.isOk());
+ ASSERT_TRUE(success);
+
+ if (ranges.size() > 0) {
+ uint32_t len = 16;
+ hidl_vec<int32_t> vec;
+ vec.resize(len);
+ std::fill(vec.begin(), vec.end(), 1);
+ for (auto range = ranges.begin(); range != ranges.end(); range++) {
+ EXPECT_TRUE(ir->transmit(range->min, vec));
+ EXPECT_TRUE(ir->transmit(range->max, vec));
+ }
+ }
+}
+
+// Test transmit() when called with invalid frequencies
+TEST_F(ConsumerIrHidlTest, BadFreqTest) {
+ uint32_t len = 16;
+ hidl_vec<int32_t> vec;
+ vec.resize(len);
+ std::fill(vec.begin(), vec.end(), 1);
+ EXPECT_FALSE(ir->transmit(-1, vec));
+ EXPECT_FALSE(ir->transmit(0, vec));
+}
+
+int main(int argc, char **argv) {
+ ::testing::InitGoogleTest(&argc, argv);
+ int status = RUN_ALL_TESTS();
+ LOG(INFO) << "Test result = " << status;
+ return status;
+}
--- /dev/null
+#
+# 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
--- /dev/null
+<?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>
--- /dev/null
+component_class: HAL_HIDL
+component_type_version: 1.0
+component_name: "types"
+
+package: "android.hardware.ir"
+
+
+attribute: {
+ name: "::android::hardware::ir::V1_0::ConsumerIrFreqRange"
+ type: TYPE_STRUCT
+ struct_value: {
+ name: "min"
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+ struct_value: {
+ name: "max"
+ type: TYPE_SCALAR
+ scalar_type: "uint32_t"
+ }
+}
\ No newline at end of file
subdirs = [
"1.0",
"1.0/default",
+ "1.0/vts/functional",
]
--- /dev/null
+#
+# 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)
using android::hardware::defaultPassthroughServiceImplementation;
int main() {
- return defaultPassthroughServiceImplementation<ILight>("light");
+ return defaultPassthroughServiceImplementation<ILight>();
}
using ::android::hardware::Void;
using ::android::sp;
-#define LIGHT_SERVICE_NAME "light"
-
#define ASSERT_OK(ret) ASSERT_TRUE(ret.isOk())
#define EXPECT_OK(ret) EXPECT_TRUE(ret.isOk())
class LightHidlTest : public ::testing::Test {
public:
virtual void SetUp() override {
- light = ILight::getService(LIGHT_SERVICE_NAME);
+ light = ILight::getService();
ASSERT_NE(light, nullptr);
LOG(INFO) << "Test is remote " << light->isRemote();
namespace V1_0 {
namespace implementation {
-Memtrack::Memtrack(memtrack_module_t *module) : mModule(module) {
+Memtrack::Memtrack(const memtrack_module_t *module) : mModule(module) {
if (mModule)
mModule->init(mModule);
}
IMemtrack* HIDL_FETCH_IMemtrack(const char* name) {
- int ret = 0;
- const hw_module_t* hw_module = NULL;
- memtrack_module_t *memtrack_module = NULL;
+ const hw_module_t* hw_module = nullptr;
+ const memtrack_module_t* memtrack_module = nullptr;
+ int err = hw_get_module(name, &hw_module);
+ if (err) {
+ ALOGE ("hw_get_module %s failed: %d", name, err);
+ return nullptr;
+ }
- ret = hw_get_module(name, &hw_module);
- if (ret == 0 && hw_module->methods->open > 0)
- {
- ret = hw_module->methods->open(hw_module, name,
- reinterpret_cast<hw_device_t**>(&memtrack_module));
- if (ret == 0)
- return new Memtrack(memtrack_module);
- else {
+ if (!hw_module->methods || !hw_module->methods->open) {
+ memtrack_module = reinterpret_cast<const memtrack_module_t*>(hw_module);
+ } else {
+ err = hw_module->methods->open(hw_module, name,
+ reinterpret_cast<hw_device_t**>(const_cast<memtrack_module_t**>(&memtrack_module)));
+ if (err) {
ALOGE("Passthrough failed to load legacy HAL.");
+ return nullptr;
}
}
- else {
- ALOGE ("hw_get_module %s failed: %d", name, ret);
- }
- return nullptr;
+ return new Memtrack(memtrack_module);
}
} // namespace implementation
using ::android::sp;
struct Memtrack : public IMemtrack {
- Memtrack(memtrack_module_t* module);
+ Memtrack(const memtrack_module_t* module);
~Memtrack();
Return<void> getMemory(int32_t pid, MemtrackType type, getMemory_cb _hidl_cb) override;
private:
- memtrack_module_t* mModule;
+ const memtrack_module_t* mModule;
};
extern "C" IMemtrack* HIDL_FETCH_IMemtrack(const char* name);
// Methods from ::android::hardware::power::V1_0::IPower follow.
Return<void> Power::setInteractive(bool interactive) {
- if (mModule->setInteractive > 0)
+ if (mModule->setInteractive)
mModule->setInteractive(mModule, interactive ? 1 : 0);
return Void();
}
Return<void> Power::powerHint(PowerHint hint, int32_t data) {
int32_t param = data;
- if (mModule->powerHint > 0) {
+ if (mModule->powerHint) {
if (data)
mModule->powerHint(mModule, static_cast<power_hint_t>(hint), ¶m);
else
}
Return<void> Power::setFeature(Feature feature, bool activate) {
- if (mModule->setFeature > 0)
+ if (mModule->setFeature)
mModule->setFeature(mModule, static_cast<feature_t>(feature),
activate ? 1 : 0);
return Void();
}
number_platform_modes = mModule->get_number_of_platform_modes(mModule);
- if (number_platform_modes > 0)
+ if (number_platform_modes)
{
if (SIZE_MAX / sizeof(size_t) <= number_platform_modes) // overflow
goto done;
const hw_module_t* hw_module = NULL;
power_module_t *power_module;
ret = hw_get_module(name, &hw_module);
- if (ret == 0 && hw_module->methods->open > 0) {
+ if (ret == 0 && hw_module->methods->open) {
ret = hw_module->methods->open(hw_module, name,
reinterpret_cast<hw_device_t**>(&power_module));
if (ret == 0) {
INVALID_SMSC_ADDRESS = 58, // SMSC address specified is invalid
NO_SUCH_ENTRY = 59, // No such entry present to perform the request
NETWORK_NOT_READY = 60, // Network is not ready to perform the request
- NOT_PROVISIONED = 61, // Device doesnot have this value provisioned
- NO_SUBSCRIPTION = 62, // Device doesnot have subscription
+ NOT_PROVISIONED = 61, // Device does not have this value provisioned
+ NO_SUBSCRIPTION = 62, // Device does not have subscription
NO_NETWORK_FOUND = 63, // Network cannot be found
DEVICE_IN_USE = 64, // Operation cannot be performed because the device
// is currently in use
RUIM_CORPORATE,
RUIM_SERVICE_PROVIDER,
RUIM_RUIM,
- RUIM_NETWORK1_PUK, // The corresponding perso lock is blocked
+ RUIM_NETWORK1_PUK, // The corresponding perso lock is blocked
RUIM_NETWORK2_PUK,
RUIM_HRPD_PUK,
RUIM_CORPORATE_PUK,
};
enum RadioState : int32_t {
- OFF = 0, // Radio explictly powered off (eg CFUN=0)
+ OFF = 0, // Radio explicitly powered off (eg CFUN=0)
UNAVAILABLE = 1, // Radio unavailable (eg, resetting or not booted)
ON = 10, // Radio is ON
};
CONNECT_FAILURE,
MSG_SIZE_TOO_LARGE,
MSG_SIZE_TOO_SMALL,
- CONNECT_OK_CALL_ONGOING
+ CONNECT_OK_CALL_ONGOING,
};
enum SapDisconnectType : int32_t {
GRACEFUL,
- IMMEDIATE
+ IMMEDIATE,
};
enum SapApduType : int32_t {
APDU,
- APDU7816
+ APDU7816,
};
enum SapResultCode : int32_t {
CARD_REMOVED,
CARD_ALREADY_POWERED_ON,
DATA_NOT_AVAILABLE,
- NOT_SUPPORTED
+ NOT_SUPPORTED,
};
enum SapStatus : int32_t {
CARD_NOT_ACCESSIBLE,
CARD_REMOVED,
CARD_INSERTED,
- RECOVERED
+ RECOVERED,
};
enum SapTransferProtocol : int32_t {
T0,
- T1
+ T1,
};
enum CallState : int32_t {
ACTIVE,
HOLDING,
- DIALING, // MO call only
- ALERTING, // MO call only
- INCOMING, // MT call only
- WAITING, // MT call only
+ DIALING, // MO call only
+ ALERTING, // MO call only
+ INCOMING, // MT call only
+ WAITING, // MT call only
};
/*
USP, // User specified protocol
OSIHLP, // OSI higher layer protocol
X244, // X.244
- RMCF, // Reserved for system mangement convergence function
+ RMCF, // Reserved for system management convergence function
IA5C, // IA5 characters
};
};
enum Clir : int32_t {
- DEFAULT, // "use subscription default value"
- INVOCATION, // restrict CLI presentation
- SUPPRESSION, // allow CLI presentation
+ DEFAULT, // "use subscription default value"
+ INVOCATION, // restrict CLI presentation
+ SUPPRESSION, // allow CLI presentation
};
enum LastCallFailCause : int32_t {
// emergency calls are enabled.
REG_DENIED_EM, // Same as REG_DENIED but indicates that
// emergency calls are enabled.
- UNKNOWN_EM // Same as UNKNOWN but indicates that
+ UNKNOWN_EM, // Same as UNKNOWN but indicates that
// emergency calls are enabled.
};
EVDO_B = 12,
EHRPD = 13,
LTE = 14,
- HSPAP = 15, // HSPA+
- GSM = 16, // Only supports voice
+ HSPAP = 15, // HSPA+
+ GSM = 16, // Only supports voice
TD_SCDMA = 17,
IWLAN = 18,
LTE_CA = 19,
};
enum SmsAcknowledgeFailCause : int32_t {
- MEMORY_CAPAPCITY_EXCEEDED = 0xD3,
+ MEMORY_CAPACITY_EXCEEDED = 0xD3,
UNSPECIFIED_ERROR = 0XFF,
};
enum ClipStatus : int32_t {
CLIP_PROVISIONED, // CLIP provisioned
CLIP_UNPROVISIONED, // CLIP not provisioned
- UNKOWN, // unknown, e.g. no network etc
+ UNKNOWN, // unknown, e.g. no network etc
};
enum SmsWriteArgsStatus : int32_t {
enum NvItem : int32_t {
// CDMA radio and account information (items 1-10)
- CDMA_MEID = 1, // CDMA MEID (hex)
- CDMA_MIN = 2, // CDMA MIN (MSID)
- CDMA_MDN = 3, // CDMA MDN
- CDMA_ACCOLC = 4, // CDMA access overload control
+ CDMA_MEID = 1, // CDMA MEID (hex)
+ CDMA_MIN = 2, // CDMA MIN (MSID)
+ CDMA_MDN = 3, // CDMA MDN
+ CDMA_ACCOLC = 4, // CDMA access overload control
// Carrier device provisioning (items 11-30)
- DEVICE_MSL = 11, // device MSL
- RTN_RECONDITIONED_STATUS = 12, // RTN reconditioned status
- RTN_ACTIVATION_DATE = 13, // RTN activation date
- RTN_LIFE_TIMER = 14, // RTN life timer
- RTN_LIFE_CALLS = 15, // RTN life calls
- RTN_LIFE_DATA_TX = 16, // RTN life data TX
- RTN_LIFE_DATA_RX = 17, // RTN life data RX
- OMADM_HFA_LEVEL = 18, // HFA in progress
+ DEVICE_MSL = 11, // device MSL
+ RTN_RECONDITIONED_STATUS = 12, // RTN reconditioned status
+ RTN_ACTIVATION_DATE = 13, // RTN activation date
+ RTN_LIFE_TIMER = 14, // RTN life timer
+ RTN_LIFE_CALLS = 15, // RTN life calls
+ RTN_LIFE_DATA_TX = 16, // RTN life data TX
+ RTN_LIFE_DATA_RX = 17, // RTN life data RX
+ OMADM_HFA_LEVEL = 18, // HFA in progress
// Mobile IP profile information (items 31-50)
- MIP_PROFILE_NAI = 31, // NAI realm
- MIP_PROFILE_HOME_ADDRESS = 32, // MIP home address
- MIP_PROFILE_AAA_AUTH = 33, // AAA auth
- MIP_PROFILE_HA_AUTH = 34, // HA auth
- MIP_PROFILE_PRI_HA_ADDR = 35, // primary HA address
- MIP_PROFILE_SEC_HA_ADDR = 36, // secondary HA address
- MIP_PROFILE_REV_TUN_PREF = 37, // reverse TUN preference
- MIP_PROFILE_HA_SPI = 38, // HA SPI
- MIP_PROFILE_AAA_SPI = 39, // AAA SPI
- MIP_PROFILE_MN_HA_SS = 40, // HA shared secret
- MIP_PROFILE_MN_AAA_SS = 41, // AAA shared secret
+ MIP_PROFILE_NAI = 31, // NAI realm
+ MIP_PROFILE_HOME_ADDRESS = 32, // MIP home address
+ MIP_PROFILE_AAA_AUTH = 33, // AAA auth
+ MIP_PROFILE_HA_AUTH = 34, // HA auth
+ MIP_PROFILE_PRI_HA_ADDR = 35, // primary HA address
+ MIP_PROFILE_SEC_HA_ADDR = 36, // secondary HA address
+ MIP_PROFILE_REV_TUN_PREF = 37, // reverse TUN preference
+ MIP_PROFILE_HA_SPI = 38, // HA SPI
+ MIP_PROFILE_AAA_SPI = 39, // AAA SPI
+ MIP_PROFILE_MN_HA_SS = 40, // HA shared secret
+ MIP_PROFILE_MN_AAA_SS = 41, // AAA shared secret
// CDMA network and band config (items 51-70)
- CDMA_PRL_VERSION = 51, // CDMA PRL version
- CDMA_BC10 = 52, // CDMA band class 10
- CDMA_BC14 = 53, // CDMA band class 14
- CDMA_SO68 = 54, // CDMA SO68
- CDMA_SO73_COP0 = 55, // CDMA SO73 COP0
- CDMA_SO73_COP1TO7 = 56, // CDMA SO73 COP1-7
- CDMA_1X_ADVANCED_ENABLED = 57, // CDMA 1X Advanced enabled
- CDMA_EHRPD_ENABLED = 58, // CDMA eHRPD enabled
- CDMA_EHRPD_FORCED = 59, // CDMA eHRPD forced
+ CDMA_PRL_VERSION = 51, // CDMA PRL version
+ CDMA_BC10 = 52, // CDMA band class 10
+ CDMA_BC14 = 53, // CDMA band class 14
+ CDMA_SO68 = 54, // CDMA SO68
+ CDMA_SO73_COP0 = 55, // CDMA SO73 COP0
+ CDMA_SO73_COP1TO7 = 56, // CDMA SO73 COP1-7
+ CDMA_1X_ADVANCED_ENABLED = 57, // CDMA 1X Advanced enabled
+ CDMA_EHRPD_ENABLED = 58, // CDMA eHRPD enabled
+ CDMA_EHRPD_FORCED = 59, // CDMA eHRPD forced
// LTE network and band config (items 71-90)
- LTE_BAND_ENABLE_25 = 71, // LTE band 25 enable
- LTE_BAND_ENABLE_26 = 72, // LTE band 26 enable
- LTE_BAND_ENABLE_41 = 73, // LTE band 41 enable
+ LTE_BAND_ENABLE_25 = 71, // LTE band 25 enable
+ LTE_BAND_ENABLE_26 = 72, // LTE band 26 enable
+ LTE_BAND_ENABLE_41 = 73, // LTE band 41 enable
- LTE_SCAN_PRIORITY_25 = 74, // LTE band 25 scan priority
- LTE_SCAN_PRIORITY_26 = 75, // LTE band 26 scan priority
- LTE_SCAN_PRIORITY_41 = 76, // LTE band 41 scan priority
+ LTE_SCAN_PRIORITY_25 = 74, // LTE band 25 scan priority
+ LTE_SCAN_PRIORITY_26 = 75, // LTE band 26 scan priority
+ LTE_SCAN_PRIORITY_41 = 76, // LTE band 41 scan priority
- LTE_HIDDEN_BAND_PRIORITY_25 = 77, // LTE hidden band 25 priority
- LTE_HIDDEN_BAND_PRIORITY_26 = 78, // LTE hidden band 26 priority
- LTE_HIDDEN_BAND_PRIORITY_41 = 79, // LTE hidden band 41 priority
+ LTE_HIDDEN_BAND_PRIORITY_25 = 77, // LTE hidden band 25 priority
+ LTE_HIDDEN_BAND_PRIORITY_26 = 78, // LTE hidden band 26 priority
+ LTE_HIDDEN_BAND_PRIORITY_41 = 79, // LTE hidden band 41 priority
};
enum ResetNvType : int32_t {
- RELOAD, // reload all NV items
- ERASE, // erase NV reset (SCRTN)
- FACORY_RESET, // factory reset (RTN)
+ RELOAD, // reload all NV items
+ ERASE, // erase NV reset (SCRTN)
+ FACTORY_RESET, // factory reset (RTN)
};
enum HardwareConfigType : int32_t {
};
enum CarrierMatchType : int32_t {
- ALL = 0, // Apply to all carriers with the same mcc/mnc
- SPN = 1, // Use SPN and mcc/mnc to identify the carrier
- IMSI_PREFIX = 2, // Use IMSI prefix and mcc/mnc to identify the carrier
- GID1 = 3, // Use GID1 and mcc/mnc to identify the carrier
- GID2 = 4, // Use GID2 and mcc/mnc to identify the carrier
+ ALL = 0, // Apply to all carriers with the same mcc/mnc
+ SPN = 1, // Use SPN and mcc/mnc to identify the carrier
+ IMSI_PREFIX = 2, // Use IMSI prefix and mcc/mnc to identify the carrier
+ GID1 = 3, // Use GID1 and mcc/mnc to identify the carrier
+ GID2 = 4, // Use GID2 and mcc/mnc to identify the carrier
};
struct NeighboringCell {
};
enum CdmaSmsSubaddressType : int32_t {
- NSAP, // CCITT X.213 or ISO 8348 AD2
- USER_SPECIFIED, // e.g. X.25
+ NSAP, // CCITT X.213 or ISO 8348 AD2
+ USER_SPECIFIED, // e.g. X.25
};
enum CdmaSmsErrorClass : int32_t {
};
enum RadioCapabilityPhase : int32_t {
- CONFIGURED = 0, // Logical Modem's (LM) initial value
- // and value after FINISH completes
- START = 1, // START is sent before APPLY and indicates that an
- // APPLY is forthcoming with these same parameters
- APPLY = 2, // APPLY is sent after all LM's receive START and returned
- // RadioCapability.status = 0. If any START's fail, hal
- // implementation must not send APPLY.
- UNSOL_RSP = 3, // UNSOL_RSP is sent with unsol radioCapability()
- FINISH = 4 // FINISH is sent after all commands have completed. If an
- // error occurs in any previous command, the
- // RadioAccessesFamily and logicalModemUuid fields must be
- // the prior configuration thus restoring the configuration
- // to the previous value. An error returned by FINISH
- // will generally be ignored or may cause that logical
- // modem to be removed from service.
+ CONFIGURED = 0, // Logical Modem's (LM) initial value
+ // and value after FINISH completes
+ START = 1, // START is sent before APPLY and indicates that an
+ // APPLY is forthcoming with these same parameters
+ APPLY = 2, // APPLY is sent after all LM's receive START and returned
+ // RadioCapability.status = 0. If any START's fail, hal
+ // implementation must not send APPLY.
+ UNSOL_RSP = 3, // UNSOL_RSP is sent with unsolicited radioCapability()
+ FINISH = 4 // FINISH is sent after all commands have completed. If an
+ // error occurs in any previous command, the
+ // RadioAccessesFamily and logicalModemUuid fields must be
+ // the prior configuration thus restoring the
+ // configuration to the previous value. An error returned
+ // by FINISH will generally be ignored or may cause that
+ // logical modem to be removed from service.
};
enum RadioCapabilityStatus : int32_t {
- NONE = 0, // This parameter has no meaning with
- // RadioCapabilityPhase:START, RadioCapabilityPhase:APPLY
- SUCCESS = 1, // Tell modem the action transaction of set radio
- // capability was success with RadioCapabilityPhase:FINISH
- FAIL = 2, // Tell modem the action transaction of set radio
- // capability is fail with RadioCapabilityPhase:FINISH.
+ NONE = 0, // This parameter has no meaning with
+ // RadioCapabilityPhase:START, RadioCapabilityPhase:APPLY
+ SUCCESS = 1, // Tell modem the action transaction of set radio
+ // capability was success with RadioCapabilityPhase:FINISH
+ FAIL = 2, // Tell modem the action transaction of set radio
+ // capability is fail with RadioCapabilityPhase:FINISH.
};
enum RadioAccessFamily : int32_t {
};
enum UssdModeType : int32_t {
- NOTIFY, // USSD-Notify
- REQUEST, // USSD-Request
- NW_RELEASE, // Session terminated by network
- LOCAL_CLIENT, // other local client (eg, SIM Toolkit) has responded
- NOT_SUPPORTED, // Operation not supported
- NW_TIMEOUT, // Network timeout
+ NOTIFY, // USSD-Notify
+ REQUEST, // USSD-Request
+ NW_RELEASE, // Session terminated by network
+ LOCAL_CLIENT, // other local client (eg, SIM Toolkit) has responded
+ NOT_SUPPORTED, // Operation not supported
+ NW_TIMEOUT, // Network timeout
};
enum SimRefreshType : int32_t {
- SIM_FILE_UPDATE = 0, // A file on SIM has been updated.
- SIM_INIT = 1, // SIM initialized. All files should be re-read.
- SIM_RESET = 2 // SIM reset. SIM power required, SIM may be locked a
- // nd all files must be re-read.
+ SIM_FILE_UPDATE = 0, // A file on SIM has been updated.
+ SIM_INIT = 1, // SIM initialized. All files should be re-read.
+ SIM_RESET = 2 // SIM reset. SIM power required, SIM may be locked a
+ // nd all files must be re-read.
};
enum SrvccState :int32_t {
};
enum PhoneRestrictedState : int32_t {
- NONE = 0x00, // No restriction at all including voice/SMS/USSD/SS/AV64
- // and packet data
- CS_EMERGENCY = 0x01, // Block emergency call due to restriction. But allow all
- // normal voice/SMS/USSD/SS/AV64.
- CS_NORMAL = 0x02, // Block all normal voice/SMS/USSD/SS/AV64 due to
- // restriction. Only Emergency call allowed.
- CS_ALL = 0x04, // Block all voice/SMS/USSD/SS/AV64 including emergency
- // call due to restriction.
- PS_ALL = 0x10 // Block packet data access due to restriction.
+ NONE = 0x00, // No restriction at all including voice/SMS/USSD/SS/AV64
+ // and packet data
+ CS_EMERGENCY = 0x01, // Block emergency call due to restriction. But allow all
+ // normal voice/SMS/USSD/SS/AV64.
+ CS_NORMAL = 0x02, // Block all normal voice/SMS/USSD/SS/AV64 due to
+ // restriction. Only Emergency call allowed.
+ CS_ALL = 0x04, // Block all voice/SMS/USSD/SS/AV64 including emergency
+ // call due to restriction.
+ PS_ALL = 0x10 // Block packet data access due to restriction.
};
enum CdmaCallWaitingNumberPresentation : int32_t {
};
struct TdScdmaSignalStrength {
- uint32_t rscp; // The Received Signal Code Power in dBm multipled by -1.
+ uint32_t rscp; // The Received Signal Code Power in dBm multiplied by -1.
// Range : 25 to 120
// INT_MAX: 0x7FFFFFFF denotes invalid value.
// Reference: 3GPP TS 25.123, section 9.1.1.1
int32_t suggestedRetryTime; // If status != 0, this fields indicates the suggested
// retry back-off timer value RIL wants to override the
// one pre-configured in FW.
- // The unit is miliseconds.
+ // The unit is milliseconds.
// The value < 0 means no value is suggested.
// The value 0 means retry must be done ASAP.
// The value of INT_MAX(0x7fffffff) means no retry.
int32_t command; // one of the commands listed for TS 27.007 +CRSM
int32_t fileId; // EF id
string path; // "pathid" from TS 27.007 +CRSM command.
- // Path is in hex asciii format eg "7f205f70"
+ // Path is in hex ascii format eg "7f205f70"
// Path must always be provided.
int32_t p1; // Values of p1, p2 and p3 defined as per 3GPP TS 51.011
int32_t p2;
int32_t reasonDataDenied; // if registration state is 3 (Registration
// denied) this is an enumerated reason why
// registration was denied. See 3GPP TS 24.008,
- // Annex G.6 "Additonal cause codes for GMM".
+ // Annex G.6 "Additional cause codes for GMM".
// 7 == GPRS services not allowed
// 8 == GPRS services and non-GPRS services not allowed
// 9 == MS identity cannot be derived by the network
int32_t serviceClass; // From 27.007 +CCFC/+CLCK "class"
// See table for Android mapping from
// MMI service code
- // 0 means user doesnt input class
+ // 0 means user doesn't input class
int32_t toa; // "type" from TS 27.007 7.11
string number; // "number" from TS 27.007 7.11.
int32_t timeSeconds;
};
struct CdmaSmsAddress {
- CdmaSmsDigitMode digitMode; // CdmaSmsDigitMode is of two types : 4 bit and 8 bit.
- // For 4-bit type, only "digits" field defined below in
- // this struct is used.
- CdmaSmsNumberMode numberMode; // Used only when digitMode is 8-bit
- CdmaSmsNumberType numberType; // Used only when digitMode is 8-bit.
- // To specify an international address, use the following:
- // digitMode = CdmaSmsDigitMode:EIGHT_BIT:
- // numberMode = CdmaSmsNumberMode:NOT_DATA_NETWORK
- // numberType = CdmaSmsNumberType:INTERNATIONAL_OR_DATA_IP
- // numberPlan = CdmaSmsNumberPlan:TELEPHONY
- // numberOfDigits = number of digits
- // digits = ASCII digits, e.g. '1', '2', '3', '4', and '5'
- CdmaSmsNumberPlan numberPlan; // Used only when digitMode is 8-bit
- vec<uint8_t> digits; // Each byte in this array represents a 4 bit or 8-bit digit
- // of address data
+ CdmaSmsDigitMode digitMode; // CdmaSmsDigitMode is of two types : 4 bit and 8 bit.
+ // For 4-bit type, only "digits" field defined below in
+ // this struct is used.
+ CdmaSmsNumberMode numberMode; // Used only when digitMode is 8-bit
+ CdmaSmsNumberType numberType; // Used only when digitMode is 8-bit.
+ // To specify an international address, use the following:
+ // digitMode = CdmaSmsDigitMode:EIGHT_BIT:
+ // numberMode = CdmaSmsNumberMode:NOT_DATA_NETWORK
+ // numberType = CdmaSmsNumberType:INTERNATIONAL_OR_DATA_IP
+ // numberPlan = CdmaSmsNumberPlan:TELEPHONY
+ // numberOfDigits = number of digits
+ // digits = ASCII digits, e.g. '1', '2', '3', '4', and '5'
+ CdmaSmsNumberPlan numberPlan; // Used only when digitMode is 8-bit
+ vec<uint8_t> digits; // Each byte in this array represents a 4 bit or 8-bit
+ // digit of address data
};
struct CdmaSmsSubaddress {
CdmaSmsSubaddressType subaddressType;
- bool odd; // true means the last byte's lower 4 bits must be ignored
- vec<uint8_t> digits; // Each byte respresents an 8-bit digit of subaddress data
+ bool odd; // true means the last byte's lower 4 bits must be ignored
+ vec<uint8_t> digits; // Each byte represents an 8-bit digit of subaddress data
};
struct CdmaSmsMessage {
int32_t serviceCategory;
CdmaSmsAddress address;
CdmaSmsSubaddress subAddress;
- vec<uint8_t> bearerData; // 3GPP2 C.S0015-B, v2.0,
+ vec<uint8_t> bearerData; // 3GPP2 C.S0015-B, v2.0,
};
struct CdmaSmsAck {
CdmaSmsErrorClass errorClass;
- int32_t smsCauseCode; // As defined in N.S00005, 6.5.2.125.
- // Currently, only 35 (resource shortage) and
- // 39 (other terminal problem) are reported.
+ int32_t smsCauseCode; // As defined in N.S00005, 6.5.2.125.
+ // Currently, only 35 (resource shortage) and
+ // 39 (other terminal problem) are reported.
};
struct CdmaBroadcastSmsConfigInfo {
- int32_t serviceCategory; // serviceCategory defines a Broadcast message identifier
- // whose value is 0x0000 - 0xFFFF as defined in
- // C.R1001G 9.3.1 and 9.3.2.
- int32_t language; // language code of Broadcast Message
- // whose value is 0x00 - 0x07 as defined in C.R1001G 9.2.
- bool selected; // selected false means message types specified in
- // serviceCategory are not accepted, while true means
- // accepted.
+ int32_t serviceCategory; // serviceCategory defines a Broadcast message identifier
+ // whose value is 0x0000 - 0xFFFF as defined in
+ // C.R1001G 9.3.1 and 9.3.2.
+ int32_t language; // language code of Broadcast Message
+ // whose value is 0x00 - 0x07 as defined in C.R1001G 9.2.
+ bool selected; // selected false means message types specified in
+ // serviceCategory are not accepted, while true means
+ // accepted.
};
struct CdmaSmsWriteArgs {
- CdmaSmsWriteArgsStatus status; // Status of message. See TS 27.005 3.1
+ CdmaSmsWriteArgsStatus status; // Status of message. See TS 27.005 3.1
CdmaSmsMessage message;
};
};
struct CellIdentityGsm {
- string mcc; // 3-digit Mobile Country Code, 0..999, INT_MAX if unknown
- string mnc; // 2 or 3-digit Mobile Network Code, 0..999, INT_MAX if
- // unknown
- int32_t lac; // 16-bit Location Area Code, 0..65535, INT_MAX if unknown
- int32_t cid; // 16-bit GSM Cell Identity described in
- // TS 27.007, 0..65535, INT_MAX if unknown
- int32_t arfcn; // 16-bit GSM Absolute RF channel number, INT_MAX if
- // unknown
- uint8_t bsic; // 6-bit Base Station Identity Code, 0xFF if unknown
+ string mcc; // 3-digit Mobile Country Code, 0..999, INT_MAX if unknown
+ string mnc; // 2 or 3-digit Mobile Network Code, 0..999, INT_MAX if
+ // unknown
+ int32_t lac; // 16-bit Location Area Code, 0..65535, INT_MAX if unknown
+ int32_t cid; // 16-bit GSM Cell Identity described in
+ // TS 27.007, 0..65535, INT_MAX if unknown
+ int32_t arfcn; // 16-bit GSM Absolute RF channel number, INT_MAX if
+ // unknown
+ uint8_t bsic; // 6-bit Base Station Identity Code, 0xFF if unknown
};
struct CellIdentityWcdma {
- string mcc; // 3-digit Mobile Country Code, 0..999, INT_MAX if unknown
- string mnc; // 2 or 3-digit Mobile Network Code, 0..999, INT_MAX
- // if unknown
- int32_t lac; // 16-bit Location Area Code, 0..65535, INT_MAX if unknown
- int32_t cid; // 28-bit UMTS Cell Identity described in
- // TS 25.331, 0..268435455, INT_MAX if unknown
- int32_t psc; // 9-bit UMTS Primary Scrambling Code described in
- // TS 25.331, 0..511, INT_MAX if unknown
- int32_t uarfcn; // 16-bit UMTS Absolute RF Channel Number, INT_MAX if
- // unknown
+ string mcc; // 3-digit Mobile Country Code, 0..999, INT_MAX if unknown
+ string mnc; // 2 or 3-digit Mobile Network Code, 0..999, INT_MAX
+ // if unknown
+ int32_t lac; // 16-bit Location Area Code, 0..65535, INT_MAX if unknown
+ int32_t cid; // 28-bit UMTS Cell Identity described in
+ // TS 25.331, 0..268435455, INT_MAX if unknown
+ int32_t psc; // 9-bit UMTS Primary Scrambling Code described in
+ // TS 25.331, 0..511, INT_MAX if unknown
+ int32_t uarfcn; // 16-bit UMTS Absolute RF Channel Number, INT_MAX if
+ // unknown
};
struct CellIdentityCdma {
- int32_t networkId; // Network Id 0..65535, INT_MAX if unknown
- int32_t systemId; // CDMA System Id 0..32767, INT_MAX if unknown
- int32_t basestationId; // Base Station Id 0..65535, INT_MAX if unknown
- int32_t longitude; // Longitude is a decimal number as specified in
- // 3GPP2 C.S0005-A v6.0. It is represented in units of
- // 0.25 seconds and ranges from -2592000 to 2592000,
- // both values inclusive (corresponding to a range of -180
- // to +180 degrees). INT_MAX if unknown
- int32_t latitude; // Latitude is a decimal number as specified in
- // 3GPP2 C.S0005-A v6.0. It is represented in units of
- // 0.25 seconds and ranges from -1296000 to 1296000,
- // both values inclusive (corresponding to a range of -90
- // to +90 degrees). INT_MAX if unknown
+ int32_t networkId; // Network Id 0..65535, INT_MAX if unknown
+ int32_t systemId; // CDMA System Id 0..32767, INT_MAX if unknown
+ int32_t baseStationId; // Base Station Id 0..65535, INT_MAX if unknown
+ int32_t longitude; // Longitude is a decimal number as specified in
+ // 3GPP2 C.S0005-A v6.0. It is represented in units of
+ // 0.25 seconds and ranges from -2592000 to 2592000,
+ // both values inclusive (corresponding to a range of -180
+ // to +180 degrees). INT_MAX if unknown
+ int32_t latitude; // Latitude is a decimal number as specified in
+ // 3GPP2 C.S0005-A v6.0. It is represented in units of
+ // 0.25 seconds and ranges from -1296000 to 1296000,
+ // both values inclusive (corresponding to a range of -90
+ // to +90 degrees). INT_MAX if unknown
};
struct CellIdentityLte {
- string mcc; // 3-digit Mobile Country Code, 0..999, INT_MAX if unknown
- string mnc; // 2 or 3-digit Mobile Network Code, 0..999, INT_MAX if
- // unknown
- int32_t ci; // 28-bit Cell Identity described in TS TS 27.007, INT_MAX
- // if unknown
- int32_t pci; // physical cell id 0..503, INT_MAX if unknown
- int32_t tac; // 16-bit tracking area code, INT_MAX if unknown
- int32_t earfcn; // 18-bit LTE Absolute RC Channel Number, INT_MAX if
- // unknown
+ string mcc; // 3-digit Mobile Country Code, 0..999, INT_MAX if unknown
+ string mnc; // 2 or 3-digit Mobile Network Code, 0..999, INT_MAX if
+ // unknown
+ int32_t ci; // 28-bit Cell Identity described in TS TS 27.007, INT_MAX
+ // if unknown
+ int32_t pci; // physical cell id 0..503, INT_MAX if unknown
+ int32_t tac; // 16-bit tracking area code, INT_MAX if unknown
+ int32_t earfcn; // 18-bit LTE Absolute RC Channel Number, INT_MAX if
+ // unknown
};
struct CellIdentityTdscdma {
- string mcc; // 3-digit Mobile Country Code, 0..999, INT_MAX if unknown
- string mnc; // 2 or 3-digit Mobile Network Code, 0..999, INT_MAX if
- // unknown
- int32_t lac; // 16-bit Location Area Code, 0..65535, INT_MAX if
- // unknown
- int32_t cid; // 28-bit UMTS Cell Identity described in
- // TS 25.331, 0..268435455, INT_MAX if unknown
- int32_t cpid; // 8-bit Cell Parameters ID described in
- // TS 25.331, 0..127, INT_MAX if unknown
+ string mcc; // 3-digit Mobile Country Code, 0..999, INT_MAX if unknown
+ string mnc; // 2 or 3-digit Mobile Network Code, 0..999, INT_MAX if
+ // unknown
+ int32_t lac; // 16-bit Location Area Code, 0..65535, INT_MAX if
+ // unknown
+ int32_t cid; // 28-bit UMTS Cell Identity described in
+ // TS 25.331, 0..268435455, INT_MAX if unknown
+ int32_t cpid; // 8-bit Cell Parameters ID described in
+ // TS 25.331, 0..127, INT_MAX if unknown
};
struct CellInfoGsm {
};
struct CellInfo {
- CellInfoType cellInfoType; // cell type for selecting from union CellInfo
- bool registered; // true if this cell is registered false if not registered
- TimeStampType timeStampType; // type of time stamp represented by timeStamp
- uint64_t timeStamp; // Time in nanos as returned by ril_nano_time
+ CellInfoType cellInfoType; // cell type for selecting from union CellInfo
+ bool registered; // true if this cell is registered false if not registered
+ TimeStampType timeStampType; // type of time stamp represented by timeStamp
+ uint64_t timeStamp; // Time in nanos as returned by ril_nano_time
// Only one of the below vectors must be of size 1 based on the CellInfoType and others must be
// of size 0
- vec<CellInfoGsm> gsm; // Valid only if type = gsm and size = 1 else must be empty
- vec<CellInfoCdma> cdma; // Valid only if type = cdma and size = 1 else must be
- // empty
- vec<CellInfoLte> lte; // Valid only if type = lte and size = 1 else must be
- // empty
- vec<CellInfoWcdma> wcdma; // Valid only if type = wcdma and size = 1 else must be
- // empty
- vec<CellInfoTdscdma> tdscdma; // Valid only if type = tdscdma and size = 1 else must be
- // empty
+ vec<CellInfoGsm> gsm; // Valid only if type = gsm and size = 1 else must be
+ // empty
+ vec<CellInfoCdma> cdma; // Valid only if type = cdma and size = 1 else must be
+ // empty
+ vec<CellInfoLte> lte; // Valid only if type = lte and size = 1 else must be
+ // empty
+ vec<CellInfoWcdma> wcdma; // Valid only if type = wcdma and size = 1 else must be
+ // empty
+ vec<CellInfoTdscdma> tdscdma; // Valid only if type = tdscdma and size = 1 else must be
+ // empty
};
struct GsmSmsMessage {
- string smscPdu; // SMSC address in GSM BCD format prefixed by a length
- // byte (as expected by TS 27.005) or empty string for
- // default SMSC
- string pdu; // SMS in PDU format as an ASCII hex string less the
- // SMSC address. TP-Layer-Length is be "strlen(pdu)/2
+ string smscPdu; // SMSC address in GSM BCD format prefixed by a length
+ // byte (as expected by TS 27.005) or empty string for
+ // default SMSC
+ string pdu; // SMS in PDU format as an ASCII hex string less the
+ // SMSC address. TP-Layer-Length is be "strlen(pdu)/2
};
struct ImsSmsMessage {
RadioTechnologyFamily tech;
- bool retry; // false == not retry, true == retry */
- int32_t messageRef; // Valid field if retry is set to true.
- // Contains messageRef from SendSmsResult stuct
- // corresponding to failed MO SMS.
+ bool retry; // false == not retry, true == retry */
+ int32_t messageRef; // Valid field if retry is set to true.
+ // Contains messageRef from SendSmsResult struct
+ // corresponding to failed MO SMS.
// Only one of the below vectors must be of size 1 based on the RadioTechnologyFamily and others
// must be of size 0
- vec<CdmaSmsMessage> cdmaMessage; // Valid field if tech is 3GPP2 and size = 1 else must be
- // empty
- vec<GsmSmsMessage> gsmMessage; // Valid field if tech is 3GPP and size = 1 else must be
- // empty
+ vec<CdmaSmsMessage> cdmaMessage; // Valid field if tech is 3GPP2 and size = 1 else must be
+ // empty
+ vec<GsmSmsMessage> gsmMessage; // Valid field if tech is 3GPP and size = 1 else must be
+ // empty
};
struct SimApdu {
- int32_t sessionId; // "sessionid" from TS 27.007 +CGLA command. Must be
- // ignored for +CSIM command.
+ int32_t sessionId; // "sessionid" from TS 27.007 +CGLA command. Must be
+ // ignored for +CSIM command.
// Following fields are used to derive the APDU ("command" and "length"
// values in TS 27.007 +CSIM and +CGLA commands).
int32_t cla;
int32_t instruction;
int32_t p1;
int32_t p2;
- int32_t p3; // A negative P3 implies a 4 byte APDU.
- string data; // In hex string format ([a-fA-F0-9]*).
+ int32_t p3; // A negative P3 implies a 4 byte APDU.
+ string data; // In hex string format ([a-fA-F0-9]*).
};
struct NvWriteItem {
struct SelectUiccSub {
int32_t slot;
- int32_t appIndex; // array subscriptor from
- // applications[RadioConst:CARD_MAX_APPS] in
- // getIccCardStatus()
+ int32_t appIndex; // array subscriptor from
+ // applications[RadioConst:CARD_MAX_APPS] in
+ // getIccCardStatus()
SubscriptionType subType;
UiccSubActStatus actStatus;
};
struct HardwareConfigModem {
int32_t rilModel;
- uint32_t rat; // bitset - ref. RadioTechnology.
+ uint32_t rat; // bitset - ref. RadioTechnology.
int32_t maxVoice;
int32_t maxData;
int32_t maxStandby;
};
struct HardwareConfigSim {
- string modemUuid; // RadioConst:MAX_UUID_LENGTH is max length of the
- // string
+ string modemUuid; // RadioConst:MAX_UUID_LENGTH is max length of the string
};
struct HardwareConfig {
HardwareConfigType type;
- string uuid; // RadioConst:MAX_UUID_LENGTH is max length of the
- // string
+ string uuid; // RadioConst:MAX_UUID_LENGTH is max length of the string
HardwareConfigState state;
+
// Only one of the below vectors must have size = 1 based on the HardwareConfigType and other
// must have size = 0.
- vec<HardwareConfigModem> modem; // Valid only if type is Modem and size = 1 else must be
- // empty
- vec<HardwareConfigSim> sim; // Valid only if type is SIM or else emptyand size = 1
- // else must be empty
+ vec<HardwareConfigModem> modem; // Valid only if type is Modem and size = 1 else must be
+ // empty
+ vec<HardwareConfigSim> sim; // Valid only if type is SIM or else empty and size = 1
+ // else must be empty
};
struct DataProfileInfo {
- int32_t 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".
+ int32_t 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 user; // The username for APN, or empty string
- string password; // The password for APN, or empty string
+ string user; // The username for APN, or empty string
+ string password; // The password for APN, or empty string
DataProfileInfoType 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
- // initiated disconnect of a given PDN connection before
- // the device can send a new PDN connection request for
- // that given PDN
- bool enabled; // True to enable the profile, false to disable
+ 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
+ // initiated disconnect of a given PDN connection before
+ // the device can send a new PDN connection request for
+ // that given PDN
+ bool enabled; // True to enable the profile, false to disable
};
struct RadioCapability {
- int32_t session; // Unique session value defined by framework returned in
- // all "responses/unsol"
+ int32_t session; // Unique session value defined by framework returned in
+ // all "responses/unsol"
RadioCapabilityPhase phase;
- RadioAccessFamily raf;
- string logicalModemUuid; // A UUID typically "com.xxxx.lmX where X is the logical
- // modem. RadioConst:MAX_UUID_LENGTH is the max
- // length
+ bitfield<RadioAccessFamily> raf; // 32-bit bitmap of RadioAccessFamily
+ string logicalModemUuid; // A UUID typically "com.xxxx.lmX where X is the logical
+ // modem. RadioConst:MAX_UUID_LENGTH is the max
+ // length
RadioCapabilityStatus status;
};
struct LceStatusInfo {
LceStatus lceStatus;
- uint8_t actualIntervalMs; // actual LCE reporting interval,
- // meaningful only if LceStatus = ACTIVE.
+ uint8_t actualIntervalMs; // actual LCE reporting interval,
+ // meaningful only if LceStatus = ACTIVE.
};
struct LceDataInfo {
- uint32_t lastHopCapacityKbps; // last-hop cellular capacity: kilobits/second.
- uint8_t confidenceLevel; // capacity estimate confidence: 0-100
- bool lceSuspended; // LCE report going to be suspended? (e.g., radio
- // moves to inactive state or network type change)
- // true = suspended;
- // false = not suspended.
+ uint32_t lastHopCapacityKbps; // last-hop cellular capacity: kilobits/second.
+ uint8_t confidenceLevel; // capacity estimate confidence: 0-100
+ bool lceSuspended; // LCE report going to be suspended? (e.g., radio
+ // moves to inactive state or network type change)
+ // true = suspended;
+ // false = not suspended.
};
struct ActivityStatsInfo {
- uint32_t sleepModeTimeMs; // total time (in ms) when modem is in a low power or
- // sleep state
- uint32_t idleModeTimeMs; // total time (in ms) when modem is awake but neither
- // the transmitter nor receiver are active/awake
+ uint32_t sleepModeTimeMs; // total time (in ms) when modem is in a low power or
+ // sleep state
+ uint32_t idleModeTimeMs; // total time (in ms) when modem is awake but neither
+ // the transmitter nor receiver are active/awake
uint32_t[RadioConst:NUM_TX_POWER_LEVELS] txmModetimeMs;
- // Each index represent total time (in ms) during which
- // the transmitter is active/awake for a particular
- // power range as shown below.
- // index 0 = tx_power < 0dBm
- // index 1 = 0dBm < tx_power < 5dBm
- // index 2 = 5dBm < tx_power < 15dBm
- // index 3 = 15dBm < tx_power < 20dBm
- // index 4 = tx_power > 20dBm
- uint32_t rxModeTimeMs; // total time (in ms) for which receiver is
- // active/awake and the transmitter is inactive
+ // Each index represent total time (in ms) during which
+ // the transmitter is active/awake for a particular
+ // power range as shown below.
+ // index 0 = tx_power < 0dBm
+ // index 1 = 0dBm < tx_power < 5dBm
+ // index 2 = 5dBm < tx_power < 15dBm
+ // index 3 = 15dBm < tx_power < 20dBm
+ // index 4 = tx_power > 20dBm
+ uint32_t rxModeTimeMs; // total time (in ms) for which receiver is
+ // active/awake and the transmitter is inactive
};
struct Carrier {
string mcc;
string mnc;
- CarrierMatchType matchType; // Specify match type for the carrier.
- // If it’s ALL, matchData is empty string;
- // otherwise, matchData is the value for the match type.
+ CarrierMatchType matchType; // Specify match type for the carrier.
+ // If it’s ALL, matchData is empty string;
+ // otherwise, matchData is the value for the match type.
string matchData;
};
struct CarrierRestrictions {
- vec<Carrier> allowedCarriers; // whitelist for allowed carriers
- vec<Carrier> excludedCarriers; // blacklist for explicitly excluded carriers
- // which match allowed_carriers. Eg. allowedCarriers
- // match mcc/mnc, excludedCarriers has same mcc/mnc and
- // gid1 is ABCD. It means except the carrier whose gid1
- // is ABCD, all carriers with the same mcc/mnc are
- // allowed.
+ vec<Carrier> allowedCarriers; // whitelist for allowed carriers
+ vec<Carrier> excludedCarriers; // blacklist for explicitly excluded carriers
+ // which match allowed_carriers. Eg. allowedCarriers
+ // match mcc/mnc, excludedCarriers has same mcc/mnc and
+ // gid1 is ABCD. It means except the carrier whose gid1
+ // is ABCD, all carriers with the same mcc/mnc are
+ // allowed.
};
struct SuppSvcNotification {
- bool isMT; // notification type
- // false = MO intermediate result code
- // true = MT unsolicited result code
- int32_t code; // result code. See 27.007 7.17.
- int32_t index; // CUG index. See 27.007 7.17.
- int32_t type; // "type" from 27.007 7.17 (MT only).
- string number; // "number" from 27.007 7.17
- // (MT only, may be empty string).
+ bool isMT; // notification type
+ // false = MO intermediate result code
+ // true = MT unsolicited result code
+ int32_t code; // result code. See 27.007 7.17.
+ int32_t index; // CUG index. See 27.007 7.17.
+ int32_t type; // "type" from 27.007 7.17 (MT only).
+ string number; // "number" from 27.007 7.17
+ // (MT only, may be empty string).
};
struct SimRefreshResult {
SimRefreshType type;
- int32_t efId; // is the EFID of the updated file if the result is
- // SIM_FILE_UPDATE or 0 for any other result.
- string aid; // is AID(application ID) of the card application
- // See ETSI 102.221 8.1 and 101.220 4
- // For SIM_FILE_UPDATE result it must be set to AID of
- // application in which updated EF resides or it must be
- // empty string if EF is outside of an application.
- // For SIM_INIT result this field is set to AID of
- // application that caused REFRESH
- // For SIM_RESET result it is empty string.
+ int32_t efId; // is the EFID of the updated file if the result is
+ // SIM_FILE_UPDATE or 0 for any other result.
+ string aid; // is AID(application ID) of the card application
+ // See ETSI 102.221 8.1 and 101.220 4
+ // For SIM_FILE_UPDATE result it must be set to AID of
+ // application in which updated EF resides or it must be
+ // empty string if EF is outside of an application.
+ // For SIM_INIT result this field is set to AID of
+ // application that caused REFRESH
+ // For SIM_RESET result it is empty string.
};
/* CDMA Signal Information Record as defined in C.S0005 section 3.7.5.5 */
struct CdmaSignalInfoRecord {
- bool isPresent; // true if signal information record is present
- int8_t signalType; // as defined 3.7.5.5-1
- int8_t alertPitch; // as defined 3.7.5.5-2
- int8_t signal; // as defined 3.7.5.5-3, 3.7.5.5-4 or 3.7.5.5-5
+ bool isPresent; // true if signal information record is present
+ int8_t signalType; // as defined 3.7.5.5-1
+ int8_t alertPitch; // as defined 3.7.5.5-2
+ int8_t signal; // as defined 3.7.5.5-3, 3.7.5.5-4 or 3.7.5.5-5
};
struct CdmaCallWaiting {
- string number; // Remote party number
+ string number; // Remote party number
CdmaCallWaitingNumberPresentation numberPresentation;
- string name; // Remote party name
+ string name; // Remote party name
CdmaSignalInfoRecord signalInfoRecord;
// Number type/Number plan required to support International Call Waiting
- CdmaCallWaitingNumberType numbertype;
+ CdmaCallWaitingNumberType numberType;
CdmaCallWaitingNumberPlan numberPlan;
};
* The display_tag, display_len and chari fields are all 1 byte.
*/
struct CdmaDisplayInfoRecord {
- string alphaBuf; // Max length = RadioConst:CDMA_ALPHA_INFO_BUFFER_LENGTH
+ string alphaBuf; // Max length = RadioConst:CDMA_ALPHA_INFO_BUFFER_LENGTH
};
/*
* Connected Number Info Rec as defined in C.S0005 section 3.7.5.4
*/
struct CdmaNumberInfoRecord {
- string number; // Max length = RADIP_CDMA_NUMBER_INFO_BUFFER_LENGTH
+ string number; // Max length = RADIP_CDMA_NUMBER_INFO_BUFFER_LENGTH
uint8_t numberType;
uint8_t numberPlan;
uint8_t pi;
CdmaInfoRecName name;
// Only one of the below vectors must have size = 1 based on the
// CdmaInfoRecName. All other vectors must have size 0.
- vec<CdmaDisplayInfoRecord> display; // Display and Extended Display Info Rec
- vec<CdmaNumberInfoRecord> number; // Called Party Number, Calling Party Number, Connected
- // number Info Rec
- vec<CdmaSignalInfoRecord> signal; // Signal Info Rec
+ vec<CdmaDisplayInfoRecord> display; // Display and Extended Display Info Rec
+ vec<CdmaNumberInfoRecord> number; // Called Party Number, Calling Party Number, Connected
+ // number Info Rec
+ vec<CdmaSignalInfoRecord> signal; // Signal Info Rec
vec<CdmaRedirectingNumberInfoRecord> redir; // Redirecting Number Info Rec
vec<CdmaLineControlInfoRecord> lineCtrl; // Line Control Info Rec
- vec<CdmaT53ClirInfoRecord> clir; // T53 CLIR Info Rec
+ vec<CdmaT53ClirInfoRecord> clir; // T53 CLIR Info Rec
vec<CdmaT53AudioControlInfoRecord> audioCtrl; // T53 Audio Control Info Rec
};
struct CdmaInformationRecords {
- vec<CdmaInformationRecord> infoRec; // Max length = RadioConst:CDMA_MAX_NUMBER_OF_INFO_RECS
+ vec<CdmaInformationRecord> infoRec; // Max length = RadioConst:CDMA_MAX_NUMBER_OF_INFO_RECS
};
struct CfData {
- vec<CallForwardInfo> cfInfo; // This is the response data
- // for SS request to query call
- // forward status. see getCallForwardStatus()
- // Max size = RadioConst:NUM_SERVICE_CLASSES
+ vec<CallForwardInfo> cfInfo; // This is the response data
+ // for SS request to query call
+ // forward status. see getCallForwardStatus()
+ // Max size = RadioConst:NUM_SERVICE_CLASSES
};
struct SsInfoData {
- vec<int32_t> ssInfo; // This is the response data for all of the SS GET/SET
- // Radio requests. E.g. IRadio.getClir() returns
- // two ints, so first two values of ssInfo[] will be
- // used for response if serviceType is SS_CLIR and
- // requestType is SS_INTERROGATION
- // Max size = RadioConst:SS_INFO_MAX
+ vec<int32_t> ssInfo; // This is the response data for all of the SS GET/SET
+ // Radio requests. E.g. IRadio.getClir() returns
+ // two ints, so first two values of ssInfo[] will be
+ // used for response if serviceType is SS_CLIR and
+ // requestType is SS_INTERROGATION
+ // Max size = RadioConst:SS_INFO_MAX
};
struct StkCcUnsolSsResult {
SsServiceType serviceType;
SsRequestType requestType;
SsTeleserviceType teleserviceType;
- SuppServiceClass serviceClass;
+ bitfield<SuppServiceClass> serviceClass;
RadioError result;
// Only one of the below vectors may contain values and other must be empty
- vec<SsInfoData> ssInfo; // Valid only for all SsserviceType except
- // SsServiceType:CF_* else empty.
- vec<CfData> cfData; // Valid for SsServiceType:CF_* else empty
+ vec<SsInfoData> ssInfo; // Valid only for all SsServiceType except
+ // SsServiceType:CF_* else empty.
+ vec<CfData> cfData; // Valid for SsServiceType:CF_* else empty
};
struct PcoDataInfo {
- int32_t cid; // Context ID, uniquely identifies this call
- string bearerProto; // One of the PDP_type values in TS 27.007 section 10.1.1.
- // For example, "IP", "IPV6", "IPV4V6"
- int32_t pcoId; // The protocol ID for this box. Note that only IDs from
- // FF00H - FFFFH are accepted. If more than one is
- // included from the network, multiple calls must be made
- // 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
+ int32_t cid; // Context ID, uniquely identifies this call
+ string bearerProto; // One of the PDP_type values in TS 27.007 section 10.1.1.
+ // For example, "IP", "IPV6", "IPV4V6"
+ int32_t pcoId; // The protocol ID for this box. Note that only IDs from
+ // FF00H - FFFFH are accepted. If more than one is
+ // included from the network, multiple calls must be made
+ // 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
};
* limitations under the License.
*/
-#define LOG_TAG "android.hardware.nfc@1.0-service"
+#define LOG_TAG "android.hardware.sensors@1.0-service"
#include <android/hardware/sensors/1.0/ISensors.h>
#include <hidl/LegacySupport.h>
using android::hardware::defaultPassthroughServiceImplementation;
int main() {
- return defaultPassthroughServiceImplementation<ISensors>("sensors");
+ return defaultPassthroughServiceImplementation<ISensors>();
}
using ::android::sp;
using namespace ::android::hardware::sensors::V1_0;
-#define SENSORS_SERVICE_NAME "sensors"
-
// Test environment for sensors
class SensorsHidlEnvironment : public ::testing::Environment {
public:
};
void SensorsHidlEnvironment::SetUp() {
- sensors = ISensors::getService(SENSORS_SERVICE_NAME, false);
+ sensors = ISensors::getService();
ALOGI_IF(sensors, "sensors is not nullptr, %p", sensors.get());
ASSERT_NE(sensors, nullptr);
return type != TV_STREAM_TYPE_BUFFER_PRODUCER;
}
-ITvInput* HIDL_FETCH_ITvInput(const char* name) {
+ITvInput* HIDL_FETCH_ITvInput(const char* /* name */) {
int ret = 0;
const hw_module_t* hw_module = nullptr;
tv_input_device_t* input_device;
}
}
else {
- LOG(ERROR) << "hw_get_module " << name << " failed: " << ret;
+ LOG(ERROR) << "hw_get_module " << TV_INPUT_HARDWARE_MODULE_ID
+ << " failed: " << ret;
return nullptr;
}
}
using android::hardware::defaultPassthroughServiceImplementation;
int main() {
- return defaultPassthroughServiceImplementation<ITvInput>("tv.input");
+ return defaultPassthroughServiceImplementation<ITvInput>();
}
target_version=1.0,
target_package="android.hardware.tv.input",
target_component_name="ITvInput",
- hw_binder_service_name="tv-input-1-0",
bits=64 if self.dut.is64Bit else 32)
self.dut.shell.InvokeTerminal("one")
hidl-gen $options \
-o hardware/libhardware/include/hardware/nfc-base.h \
android.hardware.nfc@1.0
+hidl-gen $options \
+ -o hardware/libhardware/include/hardware/gnss-base.h \
+ android.hardware.gnss@1.0
# system/core
hidl-gen $options \
TEST_F(VehicleHalManagerTest, get_NegativeCases) {
// Write-only property must fail.
invokeGet(VehicleProperty::HVAC_SEAT_TEMPERATURE, 0);
- ASSERT_EQ(StatusCode::INVALID_ARG, actualStatusCode);
+ ASSERT_EQ(StatusCode::ACCESS_DENIED, actualStatusCode);
// Unknown property must fail.
invokeGet(VehicleProperty::MIRROR_Z_MOVE, 0);
}
if (!checkReadPermission(*config, getCaller())) {
- _hidl_cb(StatusCode::INVALID_ARG, kEmptyValue);
+ _hidl_cb(StatusCode::ACCESS_DENIED, kEmptyValue);
return Void();
}
}
if (!checkWritePermission(*config, getCaller())) {
- return StatusCode::INVALID_ARG;
+ return StatusCode::ACCESS_DENIED;
}
handlePropertySetEvent(value);
const sp<IVehicleCallback> &callback,
const hidl_vec<SubscribeOptions> &options) {
hidl_vec<SubscribeOptions> verifiedOptions(options);
+ auto caller = getCaller();
for (size_t i = 0; i < verifiedOptions.size(); i++) {
SubscribeOptions& ops = verifiedOptions[i];
VehicleProperty prop = ops.propId;
return StatusCode::INVALID_ARG;
}
+ if (!checkAcl(caller.uid, config->prop, VehiclePropertyAccess::READ)) {
+ return StatusCode::ACCESS_DENIED;
+ }
+
if (!isSubscribable(*config, ops.flags)) {
ALOGE("Failed to subscribe: property 0x%x is not subscribable",
prop);
return true;
}
-bool checkAcl(const PropertyAclMap& aclMap,
- uid_t callerUid,
- VehicleProperty propertyId,
- VehiclePropertyAccess requiredAccess) {
+bool VehicleHalManager::checkAcl(uid_t callerUid, VehicleProperty propertyId,
+ VehiclePropertyAccess requiredAccess) const {
if (callerUid == AID_SYSTEM && isSystemProperty(propertyId)) {
return true;
}
- auto range = aclMap.equal_range(propertyId);
+ auto range = mPropertyAclMap.equal_range(propertyId);
for (auto it = range.first; it != range.second; ++it) {
auto& acl = it->second;
if (acl.uid == callerUid && (acl.access & requiredAccess)) {
ALOGW("Property 0%x has no write access", config.prop);
return false;
}
- return checkAcl(mPropertyAclMap, caller.uid, config.prop,
- VehiclePropertyAccess::WRITE);
+ return checkAcl(caller.uid, config.prop, VehiclePropertyAccess::WRITE);
}
bool VehicleHalManager::checkReadPermission(const VehiclePropConfig &config,
return false;
}
- return checkAcl(mPropertyAclMap, caller.uid, config.prop,
- VehiclePropertyAccess::READ);
+ return checkAcl(caller.uid, config.prop, VehiclePropertyAccess::READ);
}
void VehicleHalManager::handlePropertySetEvent(const VehiclePropValue& value) {
const Caller& callee) const;
bool checkReadPermission(const VehiclePropConfig &config,
const Caller& caller) const;
+ bool checkAcl(uid_t callerUid,
+ VehicleProperty propertyId,
+ VehiclePropertyAccess requiredAccess) const;
static bool isSubscribable(const VehiclePropConfig& config,
SubscribeFlags flags);
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 test_runner
from vts.utils.python.controllers import android_device
from vts.utils.python.profiling import profiling_utils
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)
+
self.dut.hal.InitHidlHal(
target_type="vehicle",
target_basepaths=self.dut.libPaths,
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)
return Status::OK;
}
-IVibrator* HIDL_FETCH_IVibrator(const char *hal) {
+IVibrator* HIDL_FETCH_IVibrator(const char * /*hal*/) {
vibrator_device_t *vib_device;
const hw_module_t *hw_module = nullptr;
- int ret = hw_get_module(hal, &hw_module);
+ int ret = hw_get_module(VIBRATOR_HARDWARE_MODULE_ID, &hw_module);
if (ret == 0) {
ret = vibrator_open(hw_module, &vib_device);
if (ret != 0) {
- ALOGE("vibrator_open %s failed: %d", hal, ret);
+ ALOGE("vibrator_open failed: %d", ret);
}
} else {
- ALOGE("hw_get_module %s failed: %d", hal, ret);
+ ALOGE("hw_get_module %s failed: %d", VIBRATOR_HARDWARE_MODULE_ID, ret);
}
if (ret == 0) {
using ::android::hardware::Void;
using ::android::sp;
-#define VIBRATOR_SERVICE_NAME "vibrator"
-
// The main test class for VIBRATOR HIDL HAL.
class VibratorHidlTest : public ::testing::Test {
public:
virtual void SetUp() override {
- vibrator = IVibrator::getService(VIBRATOR_SERVICE_NAME, false);
+ vibrator = IVibrator::getService(false);
ASSERT_NE(vibrator, nullptr);
}
target_version=1.0,
target_package="android.hardware.vibrator",
target_component_name="IVibrator",
- hw_binder_service_name="vibrator",
bits=64 if self.dut.is64Bit else 32)
def tearDownClass(self):
_64bit::DATA/nativetest64/vr_hidl_hal_test/vr_hidl_hal_test,
"/>
<option name="binary-test-type" value="hal_hidl_gtest" />
- <option name="hwbinder-service" value="android.hardware.vr" />
+ <!-- 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>
-
if (!legacy_request) {
return false;
}
- memset(&legacy_request, 0, sizeof(legacy_hal::NanPublishRequest));
+ memset(legacy_request, 0, sizeof(legacy_hal::NanPublishRequest));
legacy_request->publish_id = hidl_request.baseConfigs.sessionId;
legacy_request->ttl = hidl_request.baseConfigs.ttlSec;
if (!legacy_request) {
return false;
}
- memset(&legacy_request, 0, sizeof(legacy_hal::NanSubscribeRequest));
+ memset(legacy_request, 0, sizeof(legacy_hal::NanSubscribeRequest));
legacy_request->subscribe_id = hidl_request.baseConfigs.sessionId;
legacy_request->ttl = hidl_request.baseConfigs.ttlSec;
if (!legacy_request) {
return false;
}
- memset(&legacy_request, 0, sizeof(legacy_hal::NanTransmitFollowupRequest));
+ memset(legacy_request, 0, sizeof(legacy_hal::NanTransmitFollowupRequest));
legacy_request->publish_subscribe_id = hidl_request.discoverySessionId;
legacy_request->requestor_instance_id = hidl_request.peerId;
if (!legacy_request) {
return false;
}
- memset(&legacy_request, 0, sizeof(legacy_hal::NanConfigRequest));
+ memset(legacy_request, 0, sizeof(legacy_hal::NanConfigRequest));
// TODO: b/34059183 tracks missing configurations in legacy HAL or uknown defaults
legacy_request->master_pref = hidl_request.masterPref;
if (!legacy_request) {
return false;
}
- memset(&legacy_request, 0, sizeof(legacy_hal::NanBeaconSdfPayloadRequest));
+ 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;
if (!legacy_request) {
return false;
}
- memset(&legacy_request, 0, sizeof(legacy_hal::NanDataPathInitiatorRequest));
+ memset(legacy_request, 0, sizeof(legacy_hal::NanDataPathInitiatorRequest));
legacy_request->requestor_instance_id = hidl_request.peerId;
memcpy(legacy_request->peer_disc_mac_addr, hidl_request.peerDiscMacAddr.data(), 6);
if (!legacy_request) {
return false;
}
- memset(&legacy_request, 0, sizeof(legacy_hal::NanDataPathIndicationResponse));
+ memset(legacy_request, 0, sizeof(legacy_hal::NanDataPathIndicationResponse));
legacy_request->rsp_code = hidl_request.acceptRequest ?
legacy_hal::NAN_DP_REQUEST_ACCEPT : legacy_hal::NAN_DP_REQUEST_REJECT;
// Setup hwbinder service
android::sp<android::hardware::wifi::V1_0::IWifi> service =
new android::hardware::wifi::V1_0::implementation::Wifi();
- CHECK_EQ(service->registerAsService("wifi"), android::NO_ERROR)
+ CHECK_EQ(service->registerAsService(), android::NO_ERROR)
<< "Failed to register wifi HAL";
joinRpcThreadpool();
--- /dev/null
+#
+# 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
--- /dev/null
+#
+# 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)
--- /dev/null
+#
+# 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
--- /dev/null
+<?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>
using ::android::hardware::hidl_string;
using ::android::hardware::hidl_vec;
-const char kWifiServiceName[] = "wifi";
-
void stopFramework() {
ASSERT_EQ(std::system("svc wifi disable"), 0);
sleep(5);
void startFramework() { ASSERT_EQ(std::system("svc wifi enable"), 0); }
sp<IWifi> getWifi() {
- sp<IWifi> wifi = IWifi::getService(kWifiServiceName);
+ sp<IWifi> wifi = IWifi::getService();
return wifi;
}
using ::android::wifi_system::SupplicantManager;
namespace {
-const char kSupplicantServiceName[] = "wpa_supplicant";
+const char kSupplicantServiceName[] = "default";
// Helper function to initialize the driver and firmware to STA mode.
void initilializeDriverAndFirmware() {