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

Merge "Adding proc state to wakelock logging" into udc-dev

Browse Source
This commit is contained in:
Kunal Malhotra
2023-05-09 22:32:35 +00:00
committed by Android (Google) Code Review
parent f7e5dac822 a13815ab78
commit a61baacdeb
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
services/core/java/com/android/server/power/stats/BatteryStatsImpl.java
View File

@@ -4745,17 +4745,19 @@ public class BatteryStatsImpl extends BatteryStats {
requestWakelockCpuUpdate(); requestWakelockCpuUpdate();
} }
getUidStatsLocked(mappedUid, elapsedRealtimeMs, uptimeMs) Uid uidStats = getUidStatsLocked(mappedUid, elapsedRealtimeMs, uptimeMs);
.noteStartWakeLocked(pid, name, type, elapsedRealtimeMs); uidStats.noteStartWakeLocked(pid, name, type, elapsedRealtimeMs);
int procState = uidStats.mProcessState;
if (wc != null) { if (wc != null) {
FrameworkStatsLog.write(FrameworkStatsLog.WAKELOCK_STATE_CHANGED, wc.getUids(), FrameworkStatsLog.write(FrameworkStatsLog.WAKELOCK_STATE_CHANGED, wc.getUids(),
wc.getTags(), getPowerManagerWakeLockLevel(type), name, wc.getTags(), getPowerManagerWakeLockLevel(type), name,
FrameworkStatsLog.WAKELOCK_STATE_CHANGED__STATE__ACQUIRE); FrameworkStatsLog.WAKELOCK_STATE_CHANGED__STATE__ACQUIRE, procState);
} else { } else {
FrameworkStatsLog.write_non_chained(FrameworkStatsLog.WAKELOCK_STATE_CHANGED, FrameworkStatsLog.write_non_chained(FrameworkStatsLog.WAKELOCK_STATE_CHANGED,
mapIsolatedUid(uid), null, getPowerManagerWakeLockLevel(type), name, mapIsolatedUid(uid), null, getPowerManagerWakeLockLevel(type), name,
FrameworkStatsLog.WAKELOCK_STATE_CHANGED__STATE__ACQUIRE); FrameworkStatsLog.WAKELOCK_STATE_CHANGED__STATE__ACQUIRE, procState);
} }
} }
} }
@@ -4796,16 +4798,18 @@ public class BatteryStatsImpl extends BatteryStats {
requestWakelockCpuUpdate(); requestWakelockCpuUpdate();
} }
getUidStatsLocked(mappedUid, elapsedRealtimeMs, uptimeMs) Uid uidStats = getUidStatsLocked(mappedUid, elapsedRealtimeMs, uptimeMs);
.noteStopWakeLocked(pid, name, type, elapsedRealtimeMs); uidStats.noteStopWakeLocked(pid, name, type, elapsedRealtimeMs);
int procState = uidStats.mProcessState;
if (wc != null) { if (wc != null) {
FrameworkStatsLog.write(FrameworkStatsLog.WAKELOCK_STATE_CHANGED, wc.getUids(), FrameworkStatsLog.write(FrameworkStatsLog.WAKELOCK_STATE_CHANGED, wc.getUids(),
wc.getTags(), getPowerManagerWakeLockLevel(type), name, wc.getTags(), getPowerManagerWakeLockLevel(type), name,
FrameworkStatsLog.WAKELOCK_STATE_CHANGED__STATE__RELEASE); FrameworkStatsLog.WAKELOCK_STATE_CHANGED__STATE__RELEASE, procState);
} else { } else {
FrameworkStatsLog.write_non_chained(FrameworkStatsLog.WAKELOCK_STATE_CHANGED, FrameworkStatsLog.write_non_chained(FrameworkStatsLog.WAKELOCK_STATE_CHANGED,
mapIsolatedUid(uid), null, getPowerManagerWakeLockLevel(type), name, mapIsolatedUid(uid), null, getPowerManagerWakeLockLevel(type), name,
FrameworkStatsLog.WAKELOCK_STATE_CHANGED__STATE__RELEASE); FrameworkStatsLog.WAKELOCK_STATE_CHANGED__STATE__RELEASE, procState);
} }
if (mappedUid != uid) { if (mappedUid != uid) {