From 71c6f8ba6f31222b4036a074d08d314c95d5f4aa Mon Sep 17 00:00:00 2001 From: Benjamin Schwartz Date: Mon, 5 Oct 2020 15:44:19 -0700 Subject: [PATCH] power/stats: Rename PowerStats HAL Bug: 169864180 Test: m Change-Id: I6abacd82d9bcbc5957dcad891ae5c742bc307316 --- .../compatibility_matrix.current.xml | 2 +- power/stats/aidl/Android.bp | 4 ++-- .../android/hardware/power/stats}/ChannelInfo.aidl | 2 +- .../hardware/power/stats}/EnergyConsumerId.aidl | 2 +- .../power/stats}/EnergyConsumerResult.aidl | 4 ++-- .../hardware/power/stats}/EnergyMeasurement.aidl | 2 +- .../android/hardware/power/stats}/IPowerStats.aidl | 14 +++++++------- .../hardware/power/stats}/PowerEntityInfo.aidl | 4 ++-- .../android/hardware/power/stats}/StateInfo.aidl | 2 +- .../hardware/power/stats}/StateResidency.aidl | 2 +- .../power/stats}/StateResidencyResult.aidl | 4 ++-- .../{powerstats => power/stats}/ChannelInfo.aidl | 2 +- .../stats}/EnergyConsumerId.aidl | 2 +- .../stats}/EnergyConsumerResult.aidl | 4 ++-- .../stats}/EnergyMeasurement.aidl | 2 +- .../{powerstats => power/stats}/IPowerStats.aidl | 14 +++++++------- .../stats}/PowerEntityInfo.aidl | 4 ++-- .../{powerstats => power/stats}/StateInfo.aidl | 2 +- .../stats}/StateResidency.aidl | 2 +- .../stats}/StateResidencyResult.aidl | 4 ++-- power/stats/aidl/default/Android.bp | 8 ++++---- power/stats/aidl/default/PowerStats.cpp | 6 ++++-- power/stats/aidl/default/PowerStats.h | 10 ++++++---- power/stats/aidl/default/main.cpp | 2 +- power/stats/aidl/default/power.stats-default.rc | 4 ++++ ...erstats-default.xml => power.stats-default.xml} | 2 +- power/stats/aidl/default/powerstats-default.rc | 4 ---- power/stats/aidl/vts/Android.bp | 2 +- .../stats/aidl/vts/VtsHalPowerStatsTargetTest.cpp | 12 ++++++------ 29 files changed, 66 insertions(+), 62 deletions(-) rename power/stats/aidl/aidl_api/{android.hardware.powerstats/current/android/hardware/powerstats => android.hardware.power.stats/current/android/hardware/power/stats}/ChannelInfo.aidl (96%) rename power/stats/aidl/aidl_api/{android.hardware.powerstats/current/android/hardware/powerstats => android.hardware.power.stats/current/android/hardware/power/stats}/EnergyConsumerId.aidl (96%) rename power/stats/aidl/aidl_api/{android.hardware.powerstats/current/android/hardware/powerstats => android.hardware.power.stats/current/android/hardware/power/stats}/EnergyConsumerResult.aidl (91%) rename power/stats/aidl/aidl_api/{android.hardware.powerstats/current/android/hardware/powerstats => android.hardware.power.stats/current/android/hardware/power/stats}/EnergyMeasurement.aidl (96%) rename power/stats/aidl/aidl_api/{android.hardware.powerstats/current/android/hardware/powerstats => android.hardware.power.stats/current/android/hardware/power/stats}/IPowerStats.aidl (65%) rename power/stats/aidl/aidl_api/{android.hardware.powerstats/current/android/hardware/powerstats => android.hardware.power.stats/current/android/hardware/power/stats}/PowerEntityInfo.aidl (92%) rename power/stats/aidl/aidl_api/{android.hardware.powerstats/current/android/hardware/powerstats => android.hardware.power.stats/current/android/hardware/power/stats}/StateInfo.aidl (96%) rename power/stats/aidl/aidl_api/{android.hardware.powerstats/current/android/hardware/powerstats => android.hardware.power.stats/current/android/hardware/power/stats}/StateResidency.aidl (96%) rename power/stats/aidl/aidl_api/{android.hardware.powerstats/current/android/hardware/powerstats => android.hardware.power.stats/current/android/hardware/power/stats}/StateResidencyResult.aidl (91%) rename power/stats/aidl/android/hardware/{powerstats => power/stats}/ChannelInfo.aidl (95%) rename power/stats/aidl/android/hardware/{powerstats => power/stats}/EnergyConsumerId.aidl (94%) rename power/stats/aidl/android/hardware/{powerstats => power/stats}/EnergyConsumerResult.aidl (91%) rename power/stats/aidl/android/hardware/{powerstats => power/stats}/EnergyMeasurement.aidl (96%) rename power/stats/aidl/android/hardware/{powerstats => power/stats}/IPowerStats.aidl (92%) rename power/stats/aidl/android/hardware/{powerstats => power/stats}/PowerEntityInfo.aidl (92%) rename power/stats/aidl/android/hardware/{powerstats => power/stats}/StateInfo.aidl (96%) rename power/stats/aidl/android/hardware/{powerstats => power/stats}/StateResidency.aidl (96%) rename power/stats/aidl/android/hardware/{powerstats => power/stats}/StateResidencyResult.aidl (90%) create mode 100644 power/stats/aidl/default/power.stats-default.rc rename power/stats/aidl/default/{powerstats-default.xml => power.stats-default.xml} (72%) delete mode 100644 power/stats/aidl/default/powerstats-default.rc diff --git a/compatibility_matrices/compatibility_matrix.current.xml b/compatibility_matrices/compatibility_matrix.current.xml index 9400543e7f..375d9c7ed9 100644 --- a/compatibility_matrices/compatibility_matrix.current.xml +++ b/compatibility_matrices/compatibility_matrix.current.xml @@ -381,7 +381,7 @@ - android.hardware.powerstats + android.hardware.power.stats IPowerStats default diff --git a/power/stats/aidl/Android.bp b/power/stats/aidl/Android.bp index 1aa58cb063..1688b12d9a 100644 --- a/power/stats/aidl/Android.bp +++ b/power/stats/aidl/Android.bp @@ -13,10 +13,10 @@ // limitations under the License. aidl_interface { - name: "android.hardware.powerstats", + name: "android.hardware.power.stats", vendor_available: true, srcs: [ - "android/hardware/powerstats/*.aidl", + "android/hardware/power/stats/*.aidl", ], stability: "vintf", backend: { diff --git a/power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/ChannelInfo.aidl b/power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/ChannelInfo.aidl similarity index 96% rename from power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/ChannelInfo.aidl rename to power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/ChannelInfo.aidl index 51ac7bf442..209bec4aa7 100644 --- a/power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/ChannelInfo.aidl +++ b/power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/ChannelInfo.aidl @@ -15,7 +15,7 @@ // with such a backward incompatible change, it has a high risk of breaking // later when a module using the interface is updated, e.g., Mainline modules. -package android.hardware.powerstats; +package android.hardware.power.stats; @VintfStability parcelable ChannelInfo { int channelId; diff --git a/power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/EnergyConsumerId.aidl b/power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/EnergyConsumerId.aidl similarity index 96% rename from power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/EnergyConsumerId.aidl rename to power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/EnergyConsumerId.aidl index 21e7057684..7ca3b15ff1 100644 --- a/power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/EnergyConsumerId.aidl +++ b/power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/EnergyConsumerId.aidl @@ -15,7 +15,7 @@ // with such a backward incompatible change, it has a high risk of breaking // later when a module using the interface is updated, e.g., Mainline modules. -package android.hardware.powerstats; +package android.hardware.power.stats; @Backing(type="int") @VintfStability enum EnergyConsumerId { DISPLAY = 0, diff --git a/power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/EnergyConsumerResult.aidl b/power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/EnergyConsumerResult.aidl similarity index 91% rename from power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/EnergyConsumerResult.aidl rename to power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/EnergyConsumerResult.aidl index 47948982de..6289a08439 100644 --- a/power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/EnergyConsumerResult.aidl +++ b/power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/EnergyConsumerResult.aidl @@ -15,10 +15,10 @@ // with such a backward incompatible change, it has a high risk of breaking // later when a module using the interface is updated, e.g., Mainline modules. -package android.hardware.powerstats; +package android.hardware.power.stats; @VintfStability parcelable EnergyConsumerResult { - android.hardware.powerstats.EnergyConsumerId energyConsumerId; + android.hardware.power.stats.EnergyConsumerId energyConsumerId; long timestampMs; long energyUWs; } diff --git a/power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/EnergyMeasurement.aidl b/power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/EnergyMeasurement.aidl similarity index 96% rename from power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/EnergyMeasurement.aidl rename to power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/EnergyMeasurement.aidl index 3b1031b1a9..341909e180 100644 --- a/power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/EnergyMeasurement.aidl +++ b/power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/EnergyMeasurement.aidl @@ -15,7 +15,7 @@ // with such a backward incompatible change, it has a high risk of breaking // later when a module using the interface is updated, e.g., Mainline modules. -package android.hardware.powerstats; +package android.hardware.power.stats; @VintfStability parcelable EnergyMeasurement { int channelId; diff --git a/power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/IPowerStats.aidl b/power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/IPowerStats.aidl similarity index 65% rename from power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/IPowerStats.aidl rename to power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/IPowerStats.aidl index cc668eac44..07013b0b45 100644 --- a/power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/IPowerStats.aidl +++ b/power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/IPowerStats.aidl @@ -15,13 +15,13 @@ // with such a backward incompatible change, it has a high risk of breaking // later when a module using the interface is updated, e.g., Mainline modules. -package android.hardware.powerstats; +package android.hardware.power.stats; @VintfStability interface IPowerStats { - android.hardware.powerstats.PowerEntityInfo[] getPowerEntityInfo(); - android.hardware.powerstats.StateResidencyResult[] getStateResidency(in int[] powerEntityIds); - android.hardware.powerstats.EnergyConsumerId[] getEnergyConsumerInfo(); - android.hardware.powerstats.EnergyConsumerResult[] getEnergyConsumed(in android.hardware.powerstats.EnergyConsumerId[] energyConsumerIds); - android.hardware.powerstats.ChannelInfo[] getEnergyMeterInfo(); - android.hardware.powerstats.EnergyMeasurement[] readEnergyMeters(in int[] channelIds); + android.hardware.power.stats.PowerEntityInfo[] getPowerEntityInfo(); + android.hardware.power.stats.StateResidencyResult[] getStateResidency(in int[] powerEntityIds); + android.hardware.power.stats.EnergyConsumerId[] getEnergyConsumerInfo(); + android.hardware.power.stats.EnergyConsumerResult[] getEnergyConsumed(in android.hardware.power.stats.EnergyConsumerId[] energyConsumerIds); + android.hardware.power.stats.ChannelInfo[] getEnergyMeterInfo(); + android.hardware.power.stats.EnergyMeasurement[] readEnergyMeters(in int[] channelIds); } diff --git a/power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/PowerEntityInfo.aidl b/power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/PowerEntityInfo.aidl similarity index 92% rename from power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/PowerEntityInfo.aidl rename to power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/PowerEntityInfo.aidl index 28939a3b4c..3b16362046 100644 --- a/power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/PowerEntityInfo.aidl +++ b/power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/PowerEntityInfo.aidl @@ -15,10 +15,10 @@ // with such a backward incompatible change, it has a high risk of breaking // later when a module using the interface is updated, e.g., Mainline modules. -package android.hardware.powerstats; +package android.hardware.power.stats; @VintfStability parcelable PowerEntityInfo { int powerEntityId; @utf8InCpp String powerEntityName; - android.hardware.powerstats.StateInfo[] states; + android.hardware.power.stats.StateInfo[] states; } diff --git a/power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/StateInfo.aidl b/power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/StateInfo.aidl similarity index 96% rename from power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/StateInfo.aidl rename to power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/StateInfo.aidl index 46d89eec08..0db9ab190d 100644 --- a/power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/StateInfo.aidl +++ b/power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/StateInfo.aidl @@ -15,7 +15,7 @@ // with such a backward incompatible change, it has a high risk of breaking // later when a module using the interface is updated, e.g., Mainline modules. -package android.hardware.powerstats; +package android.hardware.power.stats; @VintfStability parcelable StateInfo { int stateId; diff --git a/power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/StateResidency.aidl b/power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/StateResidency.aidl similarity index 96% rename from power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/StateResidency.aidl rename to power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/StateResidency.aidl index c87547cc03..206c974bc5 100644 --- a/power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/StateResidency.aidl +++ b/power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/StateResidency.aidl @@ -15,7 +15,7 @@ // with such a backward incompatible change, it has a high risk of breaking // later when a module using the interface is updated, e.g., Mainline modules. -package android.hardware.powerstats; +package android.hardware.power.stats; @VintfStability parcelable StateResidency { int stateId; diff --git a/power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/StateResidencyResult.aidl b/power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/StateResidencyResult.aidl similarity index 91% rename from power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/StateResidencyResult.aidl rename to power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/StateResidencyResult.aidl index b57d965d57..dc41fef557 100644 --- a/power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/StateResidencyResult.aidl +++ b/power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/StateResidencyResult.aidl @@ -15,9 +15,9 @@ // with such a backward incompatible change, it has a high risk of breaking // later when a module using the interface is updated, e.g., Mainline modules. -package android.hardware.powerstats; +package android.hardware.power.stats; @VintfStability parcelable StateResidencyResult { int powerEntityId; - android.hardware.powerstats.StateResidency[] stateResidencyData; + android.hardware.power.stats.StateResidency[] stateResidencyData; } diff --git a/power/stats/aidl/android/hardware/powerstats/ChannelInfo.aidl b/power/stats/aidl/android/hardware/power/stats/ChannelInfo.aidl similarity index 95% rename from power/stats/aidl/android/hardware/powerstats/ChannelInfo.aidl rename to power/stats/aidl/android/hardware/power/stats/ChannelInfo.aidl index 61cce85d1c..a2ca6a63f1 100644 --- a/power/stats/aidl/android/hardware/powerstats/ChannelInfo.aidl +++ b/power/stats/aidl/android/hardware/power/stats/ChannelInfo.aidl @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.hardware.powerstats; +package android.hardware.power.stats; @VintfStability parcelable ChannelInfo { diff --git a/power/stats/aidl/android/hardware/powerstats/EnergyConsumerId.aidl b/power/stats/aidl/android/hardware/power/stats/EnergyConsumerId.aidl similarity index 94% rename from power/stats/aidl/android/hardware/powerstats/EnergyConsumerId.aidl rename to power/stats/aidl/android/hardware/power/stats/EnergyConsumerId.aidl index 2839a193fd..4a6a67724d 100644 --- a/power/stats/aidl/android/hardware/powerstats/EnergyConsumerId.aidl +++ b/power/stats/aidl/android/hardware/power/stats/EnergyConsumerId.aidl @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.hardware.powerstats; +package android.hardware.power.stats; @VintfStability @Backing(type="int") diff --git a/power/stats/aidl/android/hardware/powerstats/EnergyConsumerResult.aidl b/power/stats/aidl/android/hardware/power/stats/EnergyConsumerResult.aidl similarity index 91% rename from power/stats/aidl/android/hardware/powerstats/EnergyConsumerResult.aidl rename to power/stats/aidl/android/hardware/power/stats/EnergyConsumerResult.aidl index c52e6385a6..d2b902ae56 100644 --- a/power/stats/aidl/android/hardware/powerstats/EnergyConsumerResult.aidl +++ b/power/stats/aidl/android/hardware/power/stats/EnergyConsumerResult.aidl @@ -14,9 +14,9 @@ * limitations under the License. */ -package android.hardware.powerstats; +package android.hardware.power.stats; -import android.hardware.powerstats.EnergyConsumerId; +import android.hardware.power.stats.EnergyConsumerId; @VintfStability parcelable EnergyConsumerResult { diff --git a/power/stats/aidl/android/hardware/powerstats/EnergyMeasurement.aidl b/power/stats/aidl/android/hardware/power/stats/EnergyMeasurement.aidl similarity index 96% rename from power/stats/aidl/android/hardware/powerstats/EnergyMeasurement.aidl rename to power/stats/aidl/android/hardware/power/stats/EnergyMeasurement.aidl index 7c98646fbf..f873849303 100644 --- a/power/stats/aidl/android/hardware/powerstats/EnergyMeasurement.aidl +++ b/power/stats/aidl/android/hardware/power/stats/EnergyMeasurement.aidl @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.hardware.powerstats; +package android.hardware.power.stats; @VintfStability parcelable EnergyMeasurement { diff --git a/power/stats/aidl/android/hardware/powerstats/IPowerStats.aidl b/power/stats/aidl/android/hardware/power/stats/IPowerStats.aidl similarity index 92% rename from power/stats/aidl/android/hardware/powerstats/IPowerStats.aidl rename to power/stats/aidl/android/hardware/power/stats/IPowerStats.aidl index bb13b8e741..85a2ce0093 100644 --- a/power/stats/aidl/android/hardware/powerstats/IPowerStats.aidl +++ b/power/stats/aidl/android/hardware/power/stats/IPowerStats.aidl @@ -14,14 +14,14 @@ * limitations under the License. */ -package android.hardware.powerstats; +package android.hardware.power.stats; -import android.hardware.powerstats.ChannelInfo; -import android.hardware.powerstats.EnergyConsumerId; -import android.hardware.powerstats.EnergyConsumerResult; -import android.hardware.powerstats.EnergyMeasurement; -import android.hardware.powerstats.PowerEntityInfo; -import android.hardware.powerstats.StateResidencyResult; +import android.hardware.power.stats.ChannelInfo; +import android.hardware.power.stats.EnergyConsumerId; +import android.hardware.power.stats.EnergyConsumerResult; +import android.hardware.power.stats.EnergyMeasurement; +import android.hardware.power.stats.PowerEntityInfo; +import android.hardware.power.stats.StateResidencyResult; @VintfStability interface IPowerStats { diff --git a/power/stats/aidl/android/hardware/powerstats/PowerEntityInfo.aidl b/power/stats/aidl/android/hardware/power/stats/PowerEntityInfo.aidl similarity index 92% rename from power/stats/aidl/android/hardware/powerstats/PowerEntityInfo.aidl rename to power/stats/aidl/android/hardware/power/stats/PowerEntityInfo.aidl index bd09d66ddc..002b34376e 100644 --- a/power/stats/aidl/android/hardware/powerstats/PowerEntityInfo.aidl +++ b/power/stats/aidl/android/hardware/power/stats/PowerEntityInfo.aidl @@ -14,9 +14,9 @@ * limitations under the License. */ -package android.hardware.powerstats; +package android.hardware.power.stats; -import android.hardware.powerstats.StateInfo; +import android.hardware.power.stats.StateInfo; @VintfStability parcelable PowerEntityInfo { diff --git a/power/stats/aidl/android/hardware/powerstats/StateInfo.aidl b/power/stats/aidl/android/hardware/power/stats/StateInfo.aidl similarity index 96% rename from power/stats/aidl/android/hardware/powerstats/StateInfo.aidl rename to power/stats/aidl/android/hardware/power/stats/StateInfo.aidl index 5035f7caea..5703f1e9bd 100644 --- a/power/stats/aidl/android/hardware/powerstats/StateInfo.aidl +++ b/power/stats/aidl/android/hardware/power/stats/StateInfo.aidl @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.hardware.powerstats; +package android.hardware.power.stats; @VintfStability parcelable StateInfo { diff --git a/power/stats/aidl/android/hardware/powerstats/StateResidency.aidl b/power/stats/aidl/android/hardware/power/stats/StateResidency.aidl similarity index 96% rename from power/stats/aidl/android/hardware/powerstats/StateResidency.aidl rename to power/stats/aidl/android/hardware/power/stats/StateResidency.aidl index 2a8f541f50..a85ca33b51 100644 --- a/power/stats/aidl/android/hardware/powerstats/StateResidency.aidl +++ b/power/stats/aidl/android/hardware/power/stats/StateResidency.aidl @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.hardware.powerstats; +package android.hardware.power.stats; /** * Contains residency data for a single state diff --git a/power/stats/aidl/android/hardware/powerstats/StateResidencyResult.aidl b/power/stats/aidl/android/hardware/power/stats/StateResidencyResult.aidl similarity index 90% rename from power/stats/aidl/android/hardware/powerstats/StateResidencyResult.aidl rename to power/stats/aidl/android/hardware/power/stats/StateResidencyResult.aidl index b3a9f03d47..3356405a0a 100644 --- a/power/stats/aidl/android/hardware/powerstats/StateResidencyResult.aidl +++ b/power/stats/aidl/android/hardware/power/stats/StateResidencyResult.aidl @@ -14,9 +14,9 @@ * limitations under the License. */ -package android.hardware.powerstats; +package android.hardware.power.stats; -import android.hardware.powerstats.StateResidency; +import android.hardware.power.stats.StateResidency; @VintfStability parcelable StateResidencyResult { diff --git a/power/stats/aidl/default/Android.bp b/power/stats/aidl/default/Android.bp index caecd88ce9..40b9447b70 100644 --- a/power/stats/aidl/default/Android.bp +++ b/power/stats/aidl/default/Android.bp @@ -13,15 +13,15 @@ // limitations under the License. cc_binary { - name: "android.hardware.powerstats-service.example", + name: "android.hardware.power.stats-service.example", relative_install_path: "hw", - init_rc: ["powerstats-default.rc"], - vintf_fragments: ["powerstats-default.xml"], + init_rc: ["power.stats-default.rc"], + vintf_fragments: ["power.stats-default.xml"], vendor: true, shared_libs: [ "libbase", "libbinder_ndk", - "android.hardware.powerstats-ndk_platform", + "android.hardware.power.stats-ndk_platform", ], srcs: [ "main.cpp", diff --git a/power/stats/aidl/default/PowerStats.cpp b/power/stats/aidl/default/PowerStats.cpp index d1c97db312..367ee95201 100644 --- a/power/stats/aidl/default/PowerStats.cpp +++ b/power/stats/aidl/default/PowerStats.cpp @@ -21,7 +21,8 @@ namespace aidl { namespace android { namespace hardware { -namespace powerstats { +namespace power { +namespace stats { ndk::ScopedAStatus PowerStats::getPowerEntityInfo(std::vector* _aidl_return) { (void)_aidl_return; @@ -60,7 +61,8 @@ ndk::ScopedAStatus PowerStats::readEnergyMeters(const std::vector& in_c return ndk::ScopedAStatus::ok(); } -} // namespace powerstats +} // namespace stats +} // namespace power } // namespace hardware } // namespace android } // namespace aidl diff --git a/power/stats/aidl/default/PowerStats.h b/power/stats/aidl/default/PowerStats.h index 6d2d460001..76ab2cbd95 100644 --- a/power/stats/aidl/default/PowerStats.h +++ b/power/stats/aidl/default/PowerStats.h @@ -16,17 +16,18 @@ #pragma once -#include +#include namespace aidl { namespace android { namespace hardware { -namespace powerstats { +namespace power { +namespace stats { class PowerStats : public BnPowerStats { public: PowerStats() = default; - // Methods from aidl::android::hardware::powerstats::IPowerStats + // Methods from aidl::android::hardware::power::stats::IPowerStats ndk::ScopedAStatus getPowerEntityInfo(std::vector* _aidl_return) override; ndk::ScopedAStatus getStateResidency(const std::vector& in_powerEntityIds, std::vector* _aidl_return) override; @@ -38,7 +39,8 @@ class PowerStats : public BnPowerStats { std::vector* _aidl_return) override; }; -} // namespace powerstats +} // namespace stats +} // namespace power } // namespace hardware } // namespace android } // namespace aidl diff --git a/power/stats/aidl/default/main.cpp b/power/stats/aidl/default/main.cpp index 1496805528..0469b4c21d 100644 --- a/power/stats/aidl/default/main.cpp +++ b/power/stats/aidl/default/main.cpp @@ -20,7 +20,7 @@ #include #include -using aidl::android::hardware::powerstats::PowerStats; +using aidl::android::hardware::power::stats::PowerStats; int main() { ABinderProcess_setThreadPoolMaxThreadCount(0); diff --git a/power/stats/aidl/default/power.stats-default.rc b/power/stats/aidl/default/power.stats-default.rc new file mode 100644 index 0000000000..6ff6754bf9 --- /dev/null +++ b/power/stats/aidl/default/power.stats-default.rc @@ -0,0 +1,4 @@ +service vendor.power.stats-default /vendor/bin/hw/android.hardware.power.stats-service.example + class hal + user system + group system diff --git a/power/stats/aidl/default/powerstats-default.xml b/power/stats/aidl/default/power.stats-default.xml similarity index 72% rename from power/stats/aidl/default/powerstats-default.xml rename to power/stats/aidl/default/power.stats-default.xml index e07513d8fa..3b1a2161ca 100644 --- a/power/stats/aidl/default/powerstats-default.xml +++ b/power/stats/aidl/default/power.stats-default.xml @@ -1,6 +1,6 @@ - android.hardware.powerstats + android.hardware.power.stats IPowerStats/default diff --git a/power/stats/aidl/default/powerstats-default.rc b/power/stats/aidl/default/powerstats-default.rc deleted file mode 100644 index 9b04be374d..0000000000 --- a/power/stats/aidl/default/powerstats-default.rc +++ /dev/null @@ -1,4 +0,0 @@ -service vendor.powerstats-default /vendor/bin/hw/android.hardware.powerstats-service.example - class hal - user system - group system diff --git a/power/stats/aidl/vts/Android.bp b/power/stats/aidl/vts/Android.bp index c61022ec0a..930709f160 100644 --- a/power/stats/aidl/vts/Android.bp +++ b/power/stats/aidl/vts/Android.bp @@ -23,7 +23,7 @@ cc_test { "libbinder_ndk", ], static_libs: [ - "android.hardware.powerstats-ndk_platform", + "android.hardware.power.stats-ndk_platform", ], test_suites: [ "general-tests", diff --git a/power/stats/aidl/vts/VtsHalPowerStatsTargetTest.cpp b/power/stats/aidl/vts/VtsHalPowerStatsTargetTest.cpp index e71e4953f3..1d3082191a 100644 --- a/power/stats/aidl/vts/VtsHalPowerStatsTargetTest.cpp +++ b/power/stats/aidl/vts/VtsHalPowerStatsTargetTest.cpp @@ -16,16 +16,16 @@ #include #include -#include +#include #include #include #include -using aidl::android::hardware::powerstats::ChannelInfo; -using aidl::android::hardware::powerstats::EnergyMeasurement; -using aidl::android::hardware::powerstats::IPowerStats; -using aidl::android::hardware::powerstats::PowerEntityInfo; -using aidl::android::hardware::powerstats::StateResidencyResult; +using aidl::android::hardware::power::stats::ChannelInfo; +using aidl::android::hardware::power::stats::EnergyMeasurement; +using aidl::android::hardware::power::stats::IPowerStats; +using aidl::android::hardware::power::stats::PowerEntityInfo; +using aidl::android::hardware::power::stats::StateResidencyResult; using ndk::SpAIBinder;