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

Merge "Change 2nd and later burn-in protection intervals to 2 mins" into cw-f-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-10-12 05:03:53 +00:00
committed by Android (Google) Code Review
parent 250262a313 3b3940d381
commit 56746f9830
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/policy/BurnInProtectionHelper.java
View File

@@ -43,7 +43,10 @@ public class BurnInProtectionHelper implements DisplayManager.DisplayListener,
// Default value when max burnin radius is not set. // Default value when max burnin radius is not set.
public static final int BURN_IN_MAX_RADIUS_DEFAULT = -1; public static final int BURN_IN_MAX_RADIUS_DEFAULT = -1;
private static final long BURNIN_PROTECTION_WAKEUP_INTERVAL_MS = TimeUnit.MINUTES.toMillis(1); private static final long BURNIN_PROTECTION_FIRST_WAKEUP_INTERVAL_MS =
TimeUnit.MINUTES.toMillis(1);
private static final long BURNIN_PROTECTION_SUBSEQUENT_WAKEUP_INTERVAL_MS =
TimeUnit.MINUTES.toMillis(2);
private static final long BURNIN_PROTECTION_MINIMAL_INTERVAL_MS = TimeUnit.SECONDS.toMillis(10); private static final long BURNIN_PROTECTION_MINIMAL_INTERVAL_MS = TimeUnit.SECONDS.toMillis(10);
private static final boolean DEBUG = false; private static final boolean DEBUG = false;
@@ -138,6 +141,9 @@ public class BurnInProtectionHelper implements DisplayManager.DisplayListener,
// We don't want to adjust offsets immediately after the device goes into ambient mode. // We don't want to adjust offsets immediately after the device goes into ambient mode.
// Instead, we want to wait until it's more likely that the user is not observing the // Instead, we want to wait until it's more likely that the user is not observing the
// screen anymore. // screen anymore.
final long interval = mFirstUpdate
? BURNIN_PROTECTION_FIRST_WAKEUP_INTERVAL_MS
: BURNIN_PROTECTION_SUBSEQUENT_WAKEUP_INTERVAL_MS;
if (mFirstUpdate) { if (mFirstUpdate) {
mFirstUpdate = false; mFirstUpdate = false;
} else { } else {
@@ -156,8 +162,7 @@ public class BurnInProtectionHelper implements DisplayManager.DisplayListener,
// Next adjustment at least ten seconds in the future. // Next adjustment at least ten seconds in the future.
long nextWall = nowWall + BURNIN_PROTECTION_MINIMAL_INTERVAL_MS; long nextWall = nowWall + BURNIN_PROTECTION_MINIMAL_INTERVAL_MS;
// And aligned to the minute. // And aligned to the minute.
nextWall = nextWall - nextWall % BURNIN_PROTECTION_WAKEUP_INTERVAL_MS nextWall = (nextWall - (nextWall % interval)) + interval;
+ BURNIN_PROTECTION_WAKEUP_INTERVAL_MS;
// Use elapsed real time that is adjusted to full minute on wall clock. // Use elapsed real time that is adjusted to full minute on wall clock.
final long nextElapsed = nowElapsed + (nextWall - nowWall); final long nextElapsed = nowElapsed + (nextWall - nowWall);
if (DEBUG) { if (DEBUG) {