From bcd9053514181b6150a67f5940f6630dd45ec4e3 Mon Sep 17 00:00:00 2001 From: Benjamin Schwartz Date: Mon, 5 Oct 2020 09:20:16 -0700 Subject: [PATCH] power/stats: Move PowerStats HAL 2.0 to power/stats Bug: 169864180 Test: dumpsys android.hardware.powerstats.IPowerStats/default Change-Id: Icbadece98b09505efb2f6d0863f15d4b77a29df2 --- {powerstats => power/stats}/aidl/Android.bp | 0 .../current/android/hardware/powerstats/ChannelInfo.aidl | 0 .../current/android/hardware/powerstats/EnergyConsumerId.aidl | 0 .../current/android/hardware/powerstats/EnergyConsumerResult.aidl | 0 .../current/android/hardware/powerstats/EnergyMeasurement.aidl | 0 .../current/android/hardware/powerstats/IPowerStats.aidl | 0 .../current/android/hardware/powerstats/PowerEntityInfo.aidl | 0 .../current/android/hardware/powerstats/StateInfo.aidl | 0 .../current/android/hardware/powerstats/StateResidency.aidl | 0 .../current/android/hardware/powerstats/StateResidencyResult.aidl | 0 .../stats}/aidl/android/hardware/powerstats/ChannelInfo.aidl | 0 .../stats}/aidl/android/hardware/powerstats/EnergyConsumerId.aidl | 0 .../aidl/android/hardware/powerstats/EnergyConsumerResult.aidl | 0 .../aidl/android/hardware/powerstats/EnergyMeasurement.aidl | 0 .../stats}/aidl/android/hardware/powerstats/IPowerStats.aidl | 0 .../stats}/aidl/android/hardware/powerstats/PowerEntityInfo.aidl | 0 .../stats}/aidl/android/hardware/powerstats/StateInfo.aidl | 0 .../stats}/aidl/android/hardware/powerstats/StateResidency.aidl | 0 .../aidl/android/hardware/powerstats/StateResidencyResult.aidl | 0 {powerstats => power/stats}/aidl/default/Android.bp | 0 {powerstats => power/stats}/aidl/default/PowerStats.cpp | 0 {powerstats => power/stats}/aidl/default/PowerStats.h | 0 {powerstats => power/stats}/aidl/default/main.cpp | 0 {powerstats => power/stats}/aidl/default/powerstats-default.rc | 0 {powerstats => power/stats}/aidl/default/powerstats-default.xml | 0 {powerstats => power/stats}/aidl/vts/Android.bp | 0 .../stats}/aidl/vts/VtsHalPowerStatsTargetTest.cpp | 0 27 files changed, 0 insertions(+), 0 deletions(-) rename {powerstats => power/stats}/aidl/Android.bp (100%) rename {powerstats => power/stats}/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/ChannelInfo.aidl (100%) rename {powerstats => power/stats}/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/EnergyConsumerId.aidl (100%) rename {powerstats => power/stats}/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/EnergyConsumerResult.aidl (100%) rename {powerstats => power/stats}/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/EnergyMeasurement.aidl (100%) rename {powerstats => power/stats}/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/IPowerStats.aidl (100%) rename {powerstats => power/stats}/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/PowerEntityInfo.aidl (100%) rename {powerstats => power/stats}/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/StateInfo.aidl (100%) rename {powerstats => power/stats}/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/StateResidency.aidl (100%) rename {powerstats => power/stats}/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/StateResidencyResult.aidl (100%) rename {powerstats => power/stats}/aidl/android/hardware/powerstats/ChannelInfo.aidl (100%) rename {powerstats => power/stats}/aidl/android/hardware/powerstats/EnergyConsumerId.aidl (100%) rename {powerstats => power/stats}/aidl/android/hardware/powerstats/EnergyConsumerResult.aidl (100%) rename {powerstats => power/stats}/aidl/android/hardware/powerstats/EnergyMeasurement.aidl (100%) rename {powerstats => power/stats}/aidl/android/hardware/powerstats/IPowerStats.aidl (100%) rename {powerstats => power/stats}/aidl/android/hardware/powerstats/PowerEntityInfo.aidl (100%) rename {powerstats => power/stats}/aidl/android/hardware/powerstats/StateInfo.aidl (100%) rename {powerstats => power/stats}/aidl/android/hardware/powerstats/StateResidency.aidl (100%) rename {powerstats => power/stats}/aidl/android/hardware/powerstats/StateResidencyResult.aidl (100%) rename {powerstats => power/stats}/aidl/default/Android.bp (100%) rename {powerstats => power/stats}/aidl/default/PowerStats.cpp (100%) rename {powerstats => power/stats}/aidl/default/PowerStats.h (100%) rename {powerstats => power/stats}/aidl/default/main.cpp (100%) rename {powerstats => power/stats}/aidl/default/powerstats-default.rc (100%) rename {powerstats => power/stats}/aidl/default/powerstats-default.xml (100%) rename {powerstats => power/stats}/aidl/vts/Android.bp (100%) rename {powerstats => power/stats}/aidl/vts/VtsHalPowerStatsTargetTest.cpp (100%) diff --git a/powerstats/aidl/Android.bp b/power/stats/aidl/Android.bp similarity index 100% rename from powerstats/aidl/Android.bp rename to power/stats/aidl/Android.bp diff --git a/powerstats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/ChannelInfo.aidl b/power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/ChannelInfo.aidl similarity index 100% rename from powerstats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/ChannelInfo.aidl rename to power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/ChannelInfo.aidl diff --git a/powerstats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/EnergyConsumerId.aidl b/power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/EnergyConsumerId.aidl similarity index 100% rename from powerstats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/EnergyConsumerId.aidl rename to power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/EnergyConsumerId.aidl diff --git a/powerstats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/EnergyConsumerResult.aidl b/power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/EnergyConsumerResult.aidl similarity index 100% rename from powerstats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/EnergyConsumerResult.aidl rename to power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/EnergyConsumerResult.aidl diff --git a/powerstats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/EnergyMeasurement.aidl b/power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/EnergyMeasurement.aidl similarity index 100% rename from powerstats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/EnergyMeasurement.aidl rename to power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/EnergyMeasurement.aidl diff --git a/powerstats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/IPowerStats.aidl b/power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/IPowerStats.aidl similarity index 100% rename from powerstats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/IPowerStats.aidl rename to power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/IPowerStats.aidl diff --git a/powerstats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/PowerEntityInfo.aidl b/power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/PowerEntityInfo.aidl similarity index 100% rename from powerstats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/PowerEntityInfo.aidl rename to power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/PowerEntityInfo.aidl diff --git a/powerstats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/StateInfo.aidl b/power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/StateInfo.aidl similarity index 100% rename from powerstats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/StateInfo.aidl rename to power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/StateInfo.aidl diff --git a/powerstats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/StateResidency.aidl b/power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/StateResidency.aidl similarity index 100% rename from powerstats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/StateResidency.aidl rename to power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/StateResidency.aidl diff --git a/powerstats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/StateResidencyResult.aidl b/power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/StateResidencyResult.aidl similarity index 100% rename from powerstats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/StateResidencyResult.aidl rename to power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/StateResidencyResult.aidl diff --git a/powerstats/aidl/android/hardware/powerstats/ChannelInfo.aidl b/power/stats/aidl/android/hardware/powerstats/ChannelInfo.aidl similarity index 100% rename from powerstats/aidl/android/hardware/powerstats/ChannelInfo.aidl rename to power/stats/aidl/android/hardware/powerstats/ChannelInfo.aidl diff --git a/powerstats/aidl/android/hardware/powerstats/EnergyConsumerId.aidl b/power/stats/aidl/android/hardware/powerstats/EnergyConsumerId.aidl similarity index 100% rename from powerstats/aidl/android/hardware/powerstats/EnergyConsumerId.aidl rename to power/stats/aidl/android/hardware/powerstats/EnergyConsumerId.aidl diff --git a/powerstats/aidl/android/hardware/powerstats/EnergyConsumerResult.aidl b/power/stats/aidl/android/hardware/powerstats/EnergyConsumerResult.aidl similarity index 100% rename from powerstats/aidl/android/hardware/powerstats/EnergyConsumerResult.aidl rename to power/stats/aidl/android/hardware/powerstats/EnergyConsumerResult.aidl diff --git a/powerstats/aidl/android/hardware/powerstats/EnergyMeasurement.aidl b/power/stats/aidl/android/hardware/powerstats/EnergyMeasurement.aidl similarity index 100% rename from powerstats/aidl/android/hardware/powerstats/EnergyMeasurement.aidl rename to power/stats/aidl/android/hardware/powerstats/EnergyMeasurement.aidl diff --git a/powerstats/aidl/android/hardware/powerstats/IPowerStats.aidl b/power/stats/aidl/android/hardware/powerstats/IPowerStats.aidl similarity index 100% rename from powerstats/aidl/android/hardware/powerstats/IPowerStats.aidl rename to power/stats/aidl/android/hardware/powerstats/IPowerStats.aidl diff --git a/powerstats/aidl/android/hardware/powerstats/PowerEntityInfo.aidl b/power/stats/aidl/android/hardware/powerstats/PowerEntityInfo.aidl similarity index 100% rename from powerstats/aidl/android/hardware/powerstats/PowerEntityInfo.aidl rename to power/stats/aidl/android/hardware/powerstats/PowerEntityInfo.aidl diff --git a/powerstats/aidl/android/hardware/powerstats/StateInfo.aidl b/power/stats/aidl/android/hardware/powerstats/StateInfo.aidl similarity index 100% rename from powerstats/aidl/android/hardware/powerstats/StateInfo.aidl rename to power/stats/aidl/android/hardware/powerstats/StateInfo.aidl diff --git a/powerstats/aidl/android/hardware/powerstats/StateResidency.aidl b/power/stats/aidl/android/hardware/powerstats/StateResidency.aidl similarity index 100% rename from powerstats/aidl/android/hardware/powerstats/StateResidency.aidl rename to power/stats/aidl/android/hardware/powerstats/StateResidency.aidl diff --git a/powerstats/aidl/android/hardware/powerstats/StateResidencyResult.aidl b/power/stats/aidl/android/hardware/powerstats/StateResidencyResult.aidl similarity index 100% rename from powerstats/aidl/android/hardware/powerstats/StateResidencyResult.aidl rename to power/stats/aidl/android/hardware/powerstats/StateResidencyResult.aidl diff --git a/powerstats/aidl/default/Android.bp b/power/stats/aidl/default/Android.bp similarity index 100% rename from powerstats/aidl/default/Android.bp rename to power/stats/aidl/default/Android.bp diff --git a/powerstats/aidl/default/PowerStats.cpp b/power/stats/aidl/default/PowerStats.cpp similarity index 100% rename from powerstats/aidl/default/PowerStats.cpp rename to power/stats/aidl/default/PowerStats.cpp diff --git a/powerstats/aidl/default/PowerStats.h b/power/stats/aidl/default/PowerStats.h similarity index 100% rename from powerstats/aidl/default/PowerStats.h rename to power/stats/aidl/default/PowerStats.h diff --git a/powerstats/aidl/default/main.cpp b/power/stats/aidl/default/main.cpp similarity index 100% rename from powerstats/aidl/default/main.cpp rename to power/stats/aidl/default/main.cpp diff --git a/powerstats/aidl/default/powerstats-default.rc b/power/stats/aidl/default/powerstats-default.rc similarity index 100% rename from powerstats/aidl/default/powerstats-default.rc rename to power/stats/aidl/default/powerstats-default.rc diff --git a/powerstats/aidl/default/powerstats-default.xml b/power/stats/aidl/default/powerstats-default.xml similarity index 100% rename from powerstats/aidl/default/powerstats-default.xml rename to power/stats/aidl/default/powerstats-default.xml diff --git a/powerstats/aidl/vts/Android.bp b/power/stats/aidl/vts/Android.bp similarity index 100% rename from powerstats/aidl/vts/Android.bp rename to power/stats/aidl/vts/Android.bp diff --git a/powerstats/aidl/vts/VtsHalPowerStatsTargetTest.cpp b/power/stats/aidl/vts/VtsHalPowerStatsTargetTest.cpp similarity index 100% rename from powerstats/aidl/vts/VtsHalPowerStatsTargetTest.cpp rename to power/stats/aidl/vts/VtsHalPowerStatsTargetTest.cpp