summaryrefslogtreecommitdiffstats
path: root/power
diff options
context:
space:
mode:
authorBenjamin Schwartz <bsschwar@google.com>2019-01-22 10:17:03 -0800
committerBenjamin Schwartz <bsschwar@google.com>2019-01-25 08:48:36 -0800
commit6bb3b5f099500698dd3177f46e76e57eba2d016b (patch)
tree0126e0bf8486095ba499b7e5843dc59028e03ef7 /power
parent7c2fd0b19a6e5ff51d0312c9545a02994e9b1453 (diff)
downloadandroid_hardware_interfaces-6bb3b5f099500698dd3177f46e76e57eba2d016b.tar.gz
android_hardware_interfaces-6bb3b5f099500698dd3177f46e76e57eba2d016b.tar.bz2
android_hardware_interfaces-6bb3b5f099500698dd3177f46e76e57eba2d016b.zip
power.stats: Use PowerStats HAL v1.0 in cuttlefish
Bug: 122267057 Test: Build cf_x86_phone-userdebug Change-Id: I91a1b9d4db8acd2c47753e3b36ea20effd99e09a
Diffstat (limited to 'power')
-rw-r--r--power/stats/1.0/default/Android.bp3
-rw-r--r--power/stats/1.0/default/PowerStats.cpp2
-rw-r--r--power/stats/1.0/default/android.hardware.power.stats@1.0-service-mock.xml11
-rw-r--r--power/stats/1.0/default/android.hardware.power.stats@1.0-service.rc3
-rw-r--r--power/stats/1.0/default/service.cpp4
5 files changed, 19 insertions, 4 deletions
diff --git a/power/stats/1.0/default/Android.bp b/power/stats/1.0/default/Android.bp
index b57466d18..7a096391b 100644
--- a/power/stats/1.0/default/Android.bp
+++ b/power/stats/1.0/default/Android.bp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
cc_binary {
- name: "android.hardware.power.stats@1.0-service",
+ name: "android.hardware.power.stats@1.0-service.mock",
relative_install_path: "hw",
init_rc: ["android.hardware.power.stats@1.0-service.rc"],
srcs: ["service.cpp", "PowerStats.cpp"],
@@ -31,4 +31,5 @@ cc_binary {
"android.hardware.power.stats@1.0",
],
vendor: true,
+ vintf_fragments: ["android.hardware.power.stats@1.0-service-mock.xml"],
}
diff --git a/power/stats/1.0/default/PowerStats.cpp b/power/stats/1.0/default/PowerStats.cpp
index 350aa623e..78766f2a1 100644
--- a/power/stats/1.0/default/PowerStats.cpp
+++ b/power/stats/1.0/default/PowerStats.cpp
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+#define LOG_TAG "android.hardware.power.stats@1.0-service-mock"
+
#include "PowerStats.h"
#include <android-base/file.h>
#include <android-base/logging.h>
diff --git a/power/stats/1.0/default/android.hardware.power.stats@1.0-service-mock.xml b/power/stats/1.0/default/android.hardware.power.stats@1.0-service-mock.xml
new file mode 100644
index 000000000..dc52f6651
--- /dev/null
+++ b/power/stats/1.0/default/android.hardware.power.stats@1.0-service-mock.xml
@@ -0,0 +1,11 @@
+<manifest version="1.0" type="device">
+ <hal format="hidl">
+ <name>android.hardware.power.stats</name>
+ <transport>hwbinder</transport>
+ <version>1.0</version>
+ <interface>
+ <name>IPowerStats</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+</manifest> \ No newline at end of file
diff --git a/power/stats/1.0/default/android.hardware.power.stats@1.0-service.rc b/power/stats/1.0/default/android.hardware.power.stats@1.0-service.rc
index d7e546b75..9377fc23f 100644
--- a/power/stats/1.0/default/android.hardware.power.stats@1.0-service.rc
+++ b/power/stats/1.0/default/android.hardware.power.stats@1.0-service.rc
@@ -1,4 +1,5 @@
-service vendor.power.stats-hal-1-0 /vendor/bin/hw/android.hardware.power.stats@1.0-service
+service vendor.power.stats-hal-1-0-mock /vendor/bin/hw/android.hardware.power.stats@1.0-service.mock
+ interface android.hardware.power.stats@1.0::IPowerStats default
class hal
user system
group system
diff --git a/power/stats/1.0/default/service.cpp b/power/stats/1.0/default/service.cpp
index a516536d1..8eb53e8d9 100644
--- a/power/stats/1.0/default/service.cpp
+++ b/power/stats/1.0/default/service.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define LOG_TAG "android.hardware.power.stats@1.0-service"
+#define LOG_TAG "android.hardware.power.stats@1.0-service-mock"
#include <android/log.h>
#include <hidl/HidlTransportSupport.h>
@@ -82,7 +82,7 @@ class DefaultStateResidencyDataProvider : public IStateResidencyDataProvider {
};
int main(int /* argc */, char** /* argv */) {
- ALOGI("power.stats service 1.0 is starting.");
+ ALOGI("power.stats service 1.0 mock is starting.");
PowerStats* service = new PowerStats();
if (service == nullptr) {