diff options
author | Joey Poomarin Phloyphisut <poomarin@google.com> | 2023-09-12 04:40:50 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-09-12 04:40:50 +0000 |
commit | c6a2226546fbc59c1a8023e275a707967aea60a2 (patch) | |
tree | 250821ed926524aad7ea958cc554b4b150674185 | |
parent | 20cd75db8b29199c6f03283a7c0a4486d899ecfa (diff) | |
parent | 5cfb71cccfee7a2f2feb77aada6d5afac90ab63b (diff) | |
download | pixel-c6a2226546fbc59c1a8023e275a707967aea60a2.tar.gz |
Merge "[Audio Metric]: Add obsolete fields." into udc-qpr-dev am: 5cfb71cccf
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/pixel/+/24658310
Change-Id: I5dfecb4112a790d323ffcf9f522c827fff41a386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | pixelstats/SysfsCollector.cpp | 4 | ||||
-rw-r--r-- | pixelstats/pixelatoms.proto | 28 |
2 files changed, 19 insertions, 13 deletions
diff --git a/pixelstats/SysfsCollector.cpp b/pixelstats/SysfsCollector.cpp index c7e3833b..2a5882b4 100644 --- a/pixelstats/SysfsCollector.cpp +++ b/pixelstats/SysfsCollector.cpp @@ -1136,7 +1136,7 @@ void SysfsCollector::logVendorAudioHardwareStats(const std::shared_ptr<IStats> & // Sending ams_rate, total_call, c1 and c2 { - std::vector<VendorAtomValue> values(5); + std::vector<VendorAtomValue> values(7); VendorAtomValue tmp; if (isAmsReady) { @@ -1173,7 +1173,7 @@ void SysfsCollector::logVendorAudioHardwareStats(const std::shared_ptr<IStats> & // Sending total_call, c3 and c4 { - std::vector<VendorAtomValue> values(5); + std::vector<VendorAtomValue> values(7); VendorAtomValue tmp; tmp.set<VendorAtomValue::intValue>(0); diff --git a/pixelstats/pixelatoms.proto b/pixelstats/pixelatoms.proto index adebb936..3f5e76f4 100644 --- a/pixelstats/pixelatoms.proto +++ b/pixelstats/pixelatoms.proto @@ -1313,29 +1313,35 @@ message BlockStatsReported { */ message VendorAudioHardwareStatsReported { optional string reverse_domain_name = 1; - /* The percentage of calls in a day where CCA is active. - * It represented as a fixed-point and rounded integer. - * E.g.:12.345% is represented by 12. - * CCA can only be applied under some radio bands. - */ + /* The number of calls in a day where CCA is active. + * CCA can only be applied under some radio bands. + */ optional int32 milli_rate_of_ams_per_day = 2; + // cca_active: obsoleted UI enable & algorithm is active (C1) + // replaced by cca_active_count_per_day + optional int32 rate_of_cca_active_per_day = 3 [deprecated = true]; + + // cca_enable: obsoleted UI enable & algorithm is inactive field (C2) + // replaced by cca_enable_count_per_day + optional int32 rate_of_cca_enable_per_day = 4 [deprecated = true]; + enum Source { VOIP = 0; VOICE = 1; } /* source: identify whether this atom is for voice or voip case. */ - optional Source source = 3; + optional Source source = 5; /* total_call_count_per_day: count total number of call per day. */ - optional int32 total_call_count_per_day = 4; + optional int32 total_call_count_per_day = 6; - /* cca_active: UI enable & algorithm is active */ - optional int32 cca_active_count_per_day = 5; + /* cca_active: UI enable & algorithm is active (C1 or C3) */ + optional int32 cca_active_count_per_day = 7; - /* cca_enable: UI enable & algorithm is inactive. */ - optional int32 cca_enable_count_per_day = 6; + /* cca_enable: UI enable & algorithm is inactive (C2 or C4) */ + optional int32 cca_enable_count_per_day = 8; } /** |