OSDN Git Service

DO NOT MERGE ANYWHERE: Don't change screen on time on time changes
authorAdam Lesinski <adamlesinski@google.com>
Wed, 27 Jan 2016 02:18:19 +0000 (18:18 -0800)
committerThe Android Automerger <android-build@google.com>
Wed, 24 Feb 2016 21:21:13 +0000 (13:21 -0800)
commita94ceffd7bfeaae23cf2474e9a05a17a20e25607
tree96e58b62f0104ea0bf66546d86d1d71b54da0dfd
parent2dbd40c007eaef20edd92856cf8c1652b926c77e
DO NOT MERGE ANYWHERE: Don't change screen on time on time changes

Screen on time should be measured in elapsed realtime, not wallclock.

Cause a checkIdleStates to occur when reloading stats
(on rollover and on time change).

When time changes occur in the negative direction, the new stats file
we create can overlap the previous one with regards to its end timestamp.
Use the begin timestamp to determine which of the latest stats to merge.
(b/22716352)

Bug: 26488100
Change-Id: If31b29bbbee9e98401205b5e26bce86e181286e7
core/java/android/app/usage/UsageStats.java
services/usage/java/com/android/server/usage/UsageStatsService.java
services/usage/java/com/android/server/usage/UserUsageStatsService.java