Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 512e9743 authored by Benjamin Schwartz's avatar Benjamin Schwartz Committed by android-build-merger
Browse files

Merge "power.stats: Specifying opaqueness of some members" 

am: b0650fe1

Change-Id: I5b083afc23c626911e0e3ce4046a3008cc679e2e
parents eaf041cb b0650fe1

current.txt

+1 −1
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ e1c734d1545e1a4ae749ff1dd9704a8e594c59aea7c8363159dc258e93e0df3b android.hardwar 
cf7a4ba516a638f9b82a249c91fb603042c2d9ca43fd5aad9cf6c0401ed2a5d7 android.hardware.nfc@1.2::INfc

abf98c2ae08bf765db54edc8068e36d52eb558cff6706b6fd7c18c65a1f3fc18 android.hardware.nfc@1.2::types

4cb252dc6372a874aef666b92a6e9529915aa187521a700f0789065c3c702ead android.hardware.power.stats@1.0::IPowerStats

69c394e7fe3236beb6231a709865e8a882aac7a612c8dddf64f5a66028fa2c68 android.hardware.power.stats@1.0::types

2043037d5baaff604805757d06979aa861013a1e87430db745265339a8681f79 android.hardware.power.stats@1.0::types

11620ce020b6ef8f5b63eb2a39390de4a2fbbccc0a5e558b5b1a0e22e33f63cf android.hardware.radio@1.3::IRadio

e9d0f11a52715f5a29d89e2d8e2e21db1e16a43174af6b9d51a62d705cda1455 android.hardware.radio@1.3::IRadioIndication

d233f0da44f55fdef0a95db5229231412787bb67695cd1ea197ce89a3c2908b9 android.hardware.radio@1.3::IRadioResponse

power/stats/1.0/types.hal

+4 −4
Original line number Diff line number Diff line
@@ -26,9 +26,9 @@ enum Status : uint32_t { 
struct RailInfo {

    /** Index corresponding to the rail */

    uint32_t index;

    /** Name of the rail */

    /** Name of the rail (opaque to the framework) */

    string railName;

    /** Name of the subsystem to which this rail belongs */

    /** Name of the subsystem to which this rail belongs (opaque to the framework) */

    string subsysName;

    /** Hardware sampling rate */

    uint32_t samplingRate;
@@ -71,7 +71,7 @@ enum PowerEntityType : uint32_t { 
struct PowerEntityInfo {

    /** Unique ID corresponding to the PowerEntity */

    uint32_t powerEntityId;

    /** Name of the PowerEntity */

    /** Name of the PowerEntity (opaque to the framework) */

    string powerEntityName;

    /** Type of the PowerEntity */

    PowerEntityType type;
@@ -82,7 +82,7 @@ struct PowerEntityStateInfo { 
     * ID corresponding to the state. Unique for a given PowerEntityStateSpace

     */

    uint32_t powerEntityStateId;

    /** Name of the state */

    /** Name of the state (opaque to the framework) */

    string powerEntityStateName;

};