Merge "Update power HAL to version 1.3." into pi-dev
This commit is contained in:
commit
d8725d1521
7 changed files with 176 additions and 1 deletions
|
@ -290,7 +290,7 @@
|
|||
</hal>
|
||||
<hal format="hidl" optional="true">
|
||||
<name>android.hardware.power</name>
|
||||
<version>1.0-2</version>
|
||||
<version>1.0-3</version>
|
||||
<interface>
|
||||
<name>IPower</name>
|
||||
<instance>default</instance>
|
||||
|
|
|
@ -348,6 +348,8 @@ e85f566698d2a2c28100e264fcf2c691a066756ddf8dd341d009ff50cfe10614 android.hardwar
|
|||
5e278fcaa3287d397d8eebe1c22aaa28150f5caae1cf9381cd6dc32cb37899c5 android.hardware.nfc@1.1::types
|
||||
163e115e833fc1d77cdd4a8cf0c833bb8b8d74fe35c880fe693101d17774926f android.hardware.power@1.2::IPower
|
||||
7899b9305587b2d5cd74a3cc87e9090f58bf4ae74256ce3ee36e7ec011822840 android.hardware.power@1.2::types
|
||||
5a464e6db53fad223986d655028a18185b73db8e2bfa9663f9042c9623eb0aa0 android.hardware.power@1.3::IPower
|
||||
a54a28d39b892d27a3cb06829181c038edcdd9e8eef359543b01e4313ae59aa0 android.hardware.power@1.3::types
|
||||
ab132c990a62f0aca35871c092c22fb9c85d478e22124ef6a4d0a2302da76a9f android.hardware.radio@1.2::IRadio
|
||||
cda752aeabaabc20486a82ac57a3dd107785c006094a349bc5e224e8aa22a17c android.hardware.radio@1.2::IRadioIndication
|
||||
da8c6ae991c6a4b284cc6e445332e064e28ee8a09482ed5afff9d159ec6694b7 android.hardware.radio@1.2::IRadioResponse
|
||||
|
|
21
power/1.3/Android.bp
Normal file
21
power/1.3/Android.bp
Normal file
|
@ -0,0 +1,21 @@
|
|||
// This file is autogenerated by hidl-gen -Landroidbp.
|
||||
|
||||
hidl_interface {
|
||||
name: "android.hardware.power@1.3",
|
||||
root: "android.hardware",
|
||||
srcs: [
|
||||
"types.hal",
|
||||
"IPower.hal",
|
||||
],
|
||||
interfaces: [
|
||||
"android.hardware.power@1.0",
|
||||
"android.hardware.power@1.1",
|
||||
"android.hardware.power@1.2",
|
||||
"android.hidl.base@1.0",
|
||||
],
|
||||
types: [
|
||||
"PowerHint",
|
||||
],
|
||||
gen_java: true,
|
||||
}
|
||||
|
33
power/1.3/IPower.hal
Normal file
33
power/1.3/IPower.hal
Normal file
|
@ -0,0 +1,33 @@
|
|||
/*
|
||||
* Copyright (C) 2018 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.power@1.3;
|
||||
|
||||
import @1.2::IPower;
|
||||
|
||||
interface IPower extends @1.2::IPower {
|
||||
/**
|
||||
* Called to pass hints on power requirements which
|
||||
* may result in adjustment of power/performance parameters of the
|
||||
* cpufreq governor and other controls.
|
||||
*
|
||||
* A particular platform may choose to ignore any hint.
|
||||
*
|
||||
* @param hint PowerHint which is passed
|
||||
* @param data contains additional information about the hint
|
||||
* and is described along with the comments for each of the hints.
|
||||
*/
|
||||
oneway powerHintAsync_1_3(PowerHint hint, int32_t data);
|
||||
};
|
28
power/1.3/types.hal
Normal file
28
power/1.3/types.hal
Normal file
|
@ -0,0 +1,28 @@
|
|||
/*
|
||||
* Copyright (C) 2018 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.power@1.3;
|
||||
|
||||
import @1.2::PowerHint;
|
||||
|
||||
/** Power hint identifiers passed to powerHintAsync_1_3() */
|
||||
enum PowerHint : @1.2::PowerHint {
|
||||
/**
|
||||
* This hint indicates that the device is about to enter a period of expensive rendering, and
|
||||
* the GPU should be configured accordingly. The data parameter is always 1 when entering this
|
||||
* state and 0 when leaving it.
|
||||
*/
|
||||
EXPENSIVE_RENDERING,
|
||||
};
|
27
power/1.3/vts/functional/Android.bp
Normal file
27
power/1.3/vts/functional/Android.bp
Normal file
|
@ -0,0 +1,27 @@
|
|||
//
|
||||
// Copyright (C) 2018 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: "VtsHalPowerV1_3TargetTest",
|
||||
defaults: ["VtsHalTargetTestDefaults"],
|
||||
srcs: ["VtsHalPowerV1_3TargetTest.cpp"],
|
||||
static_libs: [
|
||||
"android.hardware.power@1.0",
|
||||
"android.hardware.power@1.1",
|
||||
"android.hardware.power@1.2",
|
||||
"android.hardware.power@1.3",
|
||||
],
|
||||
}
|
64
power/1.3/vts/functional/VtsHalPowerV1_3TargetTest.cpp
Normal file
64
power/1.3/vts/functional/VtsHalPowerV1_3TargetTest.cpp
Normal file
|
@ -0,0 +1,64 @@
|
|||
/*
|
||||
* Copyright (C) 2018 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 "power_hidl_hal_test"
|
||||
#include <android-base/logging.h>
|
||||
#include <android/hardware/power/1.3/IPower.h>
|
||||
|
||||
#include <VtsHalHidlTargetTestBase.h>
|
||||
#include <VtsHalHidlTargetTestEnvBase.h>
|
||||
|
||||
using ::android::sp;
|
||||
using ::android::hardware::hidl_vec;
|
||||
using ::android::hardware::Return;
|
||||
using ::android::hardware::power::V1_3::IPower;
|
||||
using ::android::hardware::power::V1_3::PowerHint;
|
||||
|
||||
// Test environment for Power HIDL HAL.
|
||||
class PowerHidlEnvironment : public ::testing::VtsHalHidlTargetTestEnvBase {
|
||||
public:
|
||||
// get the test environment singleton
|
||||
static PowerHidlEnvironment* Instance() {
|
||||
static PowerHidlEnvironment* instance = new PowerHidlEnvironment;
|
||||
return instance;
|
||||
}
|
||||
|
||||
virtual void registerTestServices() override { registerTestService<IPower>(); }
|
||||
};
|
||||
|
||||
class PowerHidlTest : public ::testing::VtsHalHidlTargetTestBase {
|
||||
public:
|
||||
virtual void SetUp() override {
|
||||
power = ::testing::VtsHalHidlTargetTestBase::getService<IPower>(
|
||||
PowerHidlEnvironment::Instance()->getServiceName<IPower>());
|
||||
ASSERT_NE(power, nullptr);
|
||||
}
|
||||
|
||||
sp<IPower> power;
|
||||
};
|
||||
|
||||
TEST_F(PowerHidlTest, PowerHintAsync_1_3) {
|
||||
ASSERT_TRUE(power->powerHintAsync_1_3(PowerHint::EXPENSIVE_RENDERING, 0).isOk());
|
||||
}
|
||||
|
||||
int main(int argc, char** argv) {
|
||||
::testing::AddGlobalTestEnvironment(PowerHidlEnvironment::Instance());
|
||||
::testing::InitGoogleTest(&argc, argv);
|
||||
PowerHidlEnvironment::Instance()->init(&argc, argv);
|
||||
int status = RUN_ALL_TESTS();
|
||||
LOG(INFO) << "Test result = " << status;
|
||||
return status;
|
||||
}
|
Loading…
Reference in a new issue