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

Merge "AppIdleHistory: Only write screen on durations during regular sync" into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-08-18 01:14:31 +00:00
committed by Android (Google) Code Review
parent 669a153531 f2d87eba75
commit 1af694510d
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/tests/servicestests/src/com/android/server/usage/AppIdleHistoryTests.java
View File

@@ -67,7 +67,7 @@ public class AppIdleHistoryTests extends AndroidTestCase {
// Screen on time should not keep progressing with screen is off // Screen on time should not keep progressing with screen is off
assertEquals(aih.getScreenOnTimeLocked(7000), 3000); assertEquals(aih.getScreenOnTimeLocked(7000), 3000);
assertEquals(aih.getScreenOnTimeLocked(8000), 3000); assertEquals(aih.getScreenOnTimeLocked(8000), 3000);
aih.writeElapsedTimeLocked(); aih.writeAppIdleDurationsLocked();
// Check if the screen on time is persisted across instantiations // Check if the screen on time is persisted across instantiations
AppIdleHistory aih2 = new AppIdleHistory(mStorageDir, 0); AppIdleHistory aih2 = new AppIdleHistory(mStorageDir, 0);

3
services/usage/java/com/android/server/usage/AppIdleHistory.java
View File

@@ -118,7 +118,6 @@ public class AppIdleHistory {
} else { } else {
mScreenOnDuration += elapsedRealtime - mScreenOnSnapshot; mScreenOnDuration += elapsedRealtime - mScreenOnSnapshot;
mElapsedDuration += elapsedRealtime - mElapsedSnapshot; mElapsedDuration += elapsedRealtime - mElapsedSnapshot;
writeScreenOnTimeLocked();
mElapsedSnapshot = elapsedRealtime; mElapsedSnapshot = elapsedRealtime;
} }
} }
@@ -167,7 +166,7 @@ public class AppIdleHistory {
/** /**
* To be called periodically to keep track of elapsed time when app idle times are written * To be called periodically to keep track of elapsed time when app idle times are written
*/ */
public void writeElapsedTimeLocked() { public void writeAppIdleDurationsLocked() {
final long elapsedRealtime = SystemClock.elapsedRealtime(); final long elapsedRealtime = SystemClock.elapsedRealtime();
// Only bump up and snapshot the elapsed time. Don't change screen on duration. // Only bump up and snapshot the elapsed time. Don't change screen on duration.
mElapsedDuration += elapsedRealtime - mElapsedSnapshot; mElapsedDuration += elapsedRealtime - mElapsedSnapshot;

10
services/usage/java/com/android/server/usage/UsageStatsService.java
View File

@@ -304,9 +304,9 @@ public class UsageStatsService extends SystemService implements
@Override public void onDisplayChanged(int displayId) { @Override public void onDisplayChanged(int displayId) {
if (displayId == Display.DEFAULT_DISPLAY) { if (displayId == Display.DEFAULT_DISPLAY) {
final boolean displayOn = isDisplayOn();
synchronized (UsageStatsService.this.mLock) { synchronized (UsageStatsService.this.mLock) {
mAppIdleHistory.updateDisplayLocked(isDisplayOn(), mAppIdleHistory.updateDisplayLocked(displayOn, SystemClock.elapsedRealtime());
SystemClock.elapsedRealtime());
} }
} }
} }
@@ -1005,9 +1005,9 @@ public class UsageStatsService extends SystemService implements
service.persistActiveStats(); service.persistActiveStats();
mAppIdleHistory.writeAppIdleTimesLocked(mUserState.keyAt(i)); mAppIdleHistory.writeAppIdleTimesLocked(mUserState.keyAt(i));
} }
// Persist elapsed time periodically, in case screen doesn't get toggled // Persist elapsed and screen on time. If this fails for whatever reason, the apps will be
// until the next boot // considered not-idle, which is the safest outcome in such an event.
mAppIdleHistory.writeElapsedTimeLocked(); mAppIdleHistory.writeAppIdleDurationsLocked();
mHandler.removeMessages(MSG_FLUSH_TO_DISK); mHandler.removeMessages(MSG_FLUSH_TO_DISK);
} }