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

Commit 00b49f56 authored by Kunal Malhotra's avatar Kunal Malhotra Committed by Automerger Merge Worker
Browse files

Merge "Adding proc state to wakelock logging" into udc-dev am: a61baacd am:... 

Merge "Adding proc state to wakelock logging" into udc-dev am: a61baacd am: 1ea3cbf3 am: f3297a8d am: 2c8498ae

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



Change-Id: I04d80a60d8ceb94a1f892f289bb7b2e084b402df
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 69dcac91 2c8498ae

services/core/java/com/android/server/power/stats/BatteryStatsImpl.java

+12 −8
Original line number Diff line number Diff line
@@ -4745,17 +4745,19 @@ public class BatteryStatsImpl extends BatteryStats { 
                requestWakelockCpuUpdate();

            }













            getUidStatsLocked(mappedUid, elapsedRealtimeMs, uptimeMs)













                    .noteStartWakeLocked(pid, name, type, elapsedRealtimeMs);













            Uid uidStats = getUidStatsLocked(mappedUid, elapsedRealtimeMs, uptimeMs);













            uidStats.noteStartWakeLocked(pid, name, type, elapsedRealtimeMs);

























            int procState = uidStats.mProcessState;





























            if (wc != null) {















                FrameworkStatsLog.write(FrameworkStatsLog.WAKELOCK_STATE_CHANGED, wc.getUids(),















                        wc.getTags(), getPowerManagerWakeLockLevel(type), name,













                        FrameworkStatsLog.WAKELOCK_STATE_CHANGED__STATE__ACQUIRE);













                        FrameworkStatsLog.WAKELOCK_STATE_CHANGED__STATE__ACQUIRE, procState);















            } else {















                FrameworkStatsLog.write_non_chained(FrameworkStatsLog.WAKELOCK_STATE_CHANGED,















                        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();















            }



























            getUidStatsLocked(mappedUid, elapsedRealtimeMs, uptimeMs)













                    .noteStopWakeLocked(pid, name, type, elapsedRealtimeMs);













            Uid uidStats = getUidStatsLocked(mappedUid, elapsedRealtimeMs, uptimeMs);













            uidStats.noteStopWakeLocked(pid, name, type, elapsedRealtimeMs);

























            int procState = uidStats.mProcessState;















            if (wc != null) {















                FrameworkStatsLog.write(FrameworkStatsLog.WAKELOCK_STATE_CHANGED, wc.getUids(),















                        wc.getTags(), getPowerManagerWakeLockLevel(type), name,













                        FrameworkStatsLog.WAKELOCK_STATE_CHANGED__STATE__RELEASE);













                        FrameworkStatsLog.WAKELOCK_STATE_CHANGED__STATE__RELEASE, procState);















            } else {















                FrameworkStatsLog.write_non_chained(FrameworkStatsLog.WAKELOCK_STATE_CHANGED,















                        mapIsolatedUid(uid), null, getPowerManagerWakeLockLevel(type), name,













                        FrameworkStatsLog.WAKELOCK_STATE_CHANGED__STATE__RELEASE);













                        FrameworkStatsLog.WAKELOCK_STATE_CHANGED__STATE__RELEASE, procState);















            }





























            if (mappedUid != uid) {