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

Commit 6a110951 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

[conflict] Merge "Replace deprecated atoms.proto file path" am: ca39b91f am:... 

[conflict] Merge "Replace deprecated atoms.proto file path" am: ca39b91f am: 7c90c68f am: eb969394

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/19212169



Change-Id: I92376ef8a686ae680b1ec09594920c791d3f2298
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a5f9f5bf eb969394

services/mediametrics/include/mediametricsservice/AudioPowerUsage.h

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ public: 
     */

    std::pair<std::string, int32_t> dump(int32_t lines = INT32_MAX) const;



    // align with message AudioUsageDataReported in frameworks/base/cmds/statsd/src/atoms.proto

    // align with message AudioPowerUsageDataReported in frameworks/proto_logging/stats/atoms.proto

    enum AudioType {

        UNKNOWN_TYPE = 0,

        VOICE_CALL_TYPE = 1,            // voice call