Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Suez: change display wake reason to push atom

Browse Source 
Revert a497253
Bug: 150519505
Bug: 158506052
Eldar: 157730539/
Test: m statsd

(cherry picked from commit cbc5070fc3)
Change-Id: I8c6ac9a1bfedea76da4c4d7a2e141d7c27a05225
This commit is contained in:
Denny cy Lee
2020-05-28 18:13:07 +08:00
parent ebb7ae6679
commit 3c8bf8eec5
2 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cmds/statsd/src/atoms.proto
View File

@@ -450,13 +450,14 @@ message Atom {
TvCasSessionOpenStatus tv_cas_session_open_status =
280 [(module) = "framework"];
AssistantInvocationReported assistant_invocation_reported = 281 [(module) = "framework"];
DisplayWakeReported display_wake_reported = 282 [(module) = "framework"];
// StatsdStats tracks platform atoms with ids upto 500.
// Update StatsdStats::kMaxPushedAtomId when atom ids here approach that value.
}
// Pulled events will start at field 10000.
// Next: 10084
// Next: 10081
oneof pulled {
WifiBytesTransfer wifi_bytes_transfer = 10000 [(module) = "framework"];
WifiBytesTransferByFgBg wifi_bytes_transfer_by_fg_bg = 10001 [(module) = "framework"];
@@ -547,7 +548,7 @@ message Atom {
SimSlotState sim_slot_state = 10078 [(module) = "telephony"];
SupportedRadioAccessFamily supported_radio_access_family = 10079 [(module) = "telephony"];
SettingSnapshot setting_snapshot = 10080 [(module) = "framework"];
DisplayWakeReason display_wake_reason = 10081 [(module) = "framework"];
//10081 free for use
DataUsageBytesTransfer data_usage_bytes_transfer = 10082 [(module) = "framework"];
BytesTransferByTagAndMetered bytes_transfer_by_tag_and_metered =
10083 [(module) = "framework"];
@@ -9817,15 +9818,20 @@ message AccessibilityServiceReported {
optional android.stats.accessibility.ServiceStatus service_status = 2;
}
message DisplayWakeReason {
/**
* Logs when display wake up.
*
* Logged from:
* services/core/java/com/android/server/power/Notifier.java
*/
message DisplayWakeReported {
// Wake_up_reason code
// If LOWORD(wake_up_reason) = 0
// reference to HIWORD(wake_up_reason) PowerManager.WAKE_REASON_XXX
// else reference wake_up_reason to
// frameworks/base/services/core/java/com/android/server/power/Notifier.java#DispWakeupReason
// services/core/java/com/android/server/power/Notifier.java#onWakeUp
optional int32 wake_up_reason = 1;
// Count of wake up by reason
optional int32 wake_times = 2;
}
/**

18
services/core/java/com/android/server/stats/pull/StatsPullAtomService.java
View File

@@ -468,8 +468,6 @@ public class StatsPullAtomService extends SystemService {
return pullAttributedAppOps(atomTag, data);
case FrameworkStatsLog.SETTING_SNAPSHOT:
return pullSettingsStats(atomTag, data);
case FrameworkStatsLog.DISPLAY_WAKE_REASON:
return pullDisplayWakeStats(atomTag, data);
default:
throw new UnsupportedOperationException("Unknown tagId=" + atomTag);
}
@@ -656,7 +654,6 @@ public class StatsPullAtomService extends SystemService {
registerBatteryVoltage();
registerBatteryCycleCount();
registerSettingsStats();
registerDisplayWakeStats();
}
private void initAndRegisterNetworkStatsPullers() {
@@ -3678,21 +3675,6 @@ public class StatsPullAtomService extends SystemService {
return StatsManager.PULL_SUCCESS;
}
private void registerDisplayWakeStats() {
int tagId = FrameworkStatsLog.DISPLAY_WAKE_REASON;
mStatsManager.setPullAtomCallback(
tagId,
null, // use default PullAtomMetadata values
DIRECT_EXECUTOR,
mStatsCallbackImpl
);
}
int pullDisplayWakeStats(int atomTag, List<StatsEvent> pulledData) {
//TODO: Denny, implement read/write DisplayWakeStats, b/154172964
return 0;
}
// Thermal event received from vendor thermal management subsystem
private static final class ThermalEventListener extends IThermalEventListener.Stub {
@Override