| commit | eb9693943d2c9079e50405945a8bc1e59c785b62 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Jul 07 18:31:07 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 07 18:31:07 2022 +0000 |
| tree | 94f012b117435acd178c6b631e22ab3da9bdc73f | |
| parent | 8413ae850a82084a6e50779e75d3eaec97ca5982 [diff] | |
| parent | 7c90c68f1fc0004e1b9b78b6d8e69a7da63bc187 [diff] |
[conflict] Merge "Replace deprecated atoms.proto file path" am: ca39b91f0f am: 7c90c68f1f Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/19212169 Change-Id: I5d46db7310b88ac8f68c72179c28856067386a6b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/mediametrics/include/mediametricsservice/AudioPowerUsage.h b/services/mediametrics/include/mediametricsservice/AudioPowerUsage.h index b7215e6..6e5a5cf 100644 --- a/services/mediametrics/include/mediametricsservice/AudioPowerUsage.h +++ b/services/mediametrics/include/mediametricsservice/AudioPowerUsage.h
@@ -50,7 +50,7 @@ */ 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