Delete unused power manager functionality.

timeSinceScreenWasLastOn() was used by Watchdog previously but is no
longer so we can remove it.

Change-Id: I91c324b6c98c1aeb85f64b0296a41240e6c2ef4f
This commit is contained in:
Jeff Brown
2014-01-15 20:41:26 -08:00
parent 7d86d6b5a7
commit 02cc684e42

View File

@@ -232,9 +232,6 @@ public final class PowerManagerService extends IPowerManager.Stub
// requested because it is updated asynchronously by the display power controller. // requested because it is updated asynchronously by the display power controller.
private final DisplayPowerRequest mDisplayPowerRequest = new DisplayPowerRequest(); private final DisplayPowerRequest mDisplayPowerRequest = new DisplayPowerRequest();
// The time the screen was last turned off, in elapsedRealtime() timebase.
private long mLastScreenOffEventElapsedRealTime;
// True if the display power state has been fully applied, which means the display // True if the display power state has been fully applied, which means the display
// is actually on or actually off or whatever was requested. // is actually on or actually off or whatever was requested.
private boolean mDisplayReady; private boolean mDisplayReady;
@@ -1657,12 +1654,6 @@ public final class PowerManagerService extends IPowerManager.Stub
| DIRTY_SETTINGS | DIRTY_SCREEN_ON_BLOCKER_RELEASED)) != 0) { | DIRTY_SETTINGS | DIRTY_SCREEN_ON_BLOCKER_RELEASED)) != 0) {
int newScreenState = getDesiredScreenPowerStateLocked(); int newScreenState = getDesiredScreenPowerStateLocked();
if (newScreenState != mDisplayPowerRequest.screenState) { if (newScreenState != mDisplayPowerRequest.screenState) {
if (newScreenState == DisplayPowerRequest.SCREEN_STATE_OFF
&& mDisplayPowerRequest.screenState
!= DisplayPowerRequest.SCREEN_STATE_OFF) {
mLastScreenOffEventElapsedRealTime = SystemClock.elapsedRealtime();
}
mDisplayPowerRequest.screenState = newScreenState; mDisplayPowerRequest.screenState = newScreenState;
nativeSetPowerState( nativeSetPowerState(
newScreenState != DisplayPowerRequest.SCREEN_STATE_OFF, newScreenState != DisplayPowerRequest.SCREEN_STATE_OFF,
@@ -2074,18 +2065,6 @@ public final class PowerManagerService extends IPowerManager.Stub
light.setFlashing(color, Light.LIGHT_FLASH_HARDWARE, (on ? 3 : 0), 0); light.setFlashing(color, Light.LIGHT_FLASH_HARDWARE, (on ? 3 : 0), 0);
} }
/**
* Used by the Watchdog.
*/
public long timeSinceScreenWasLastOn() {
synchronized (mLock) {
if (mDisplayPowerRequest.screenState != DisplayPowerRequest.SCREEN_STATE_OFF) {
return 0;
}
return SystemClock.elapsedRealtime() - mLastScreenOffEventElapsedRealTime;
}
}
/** /**
* Used by the window manager to override the screen brightness based on the * Used by the window manager to override the screen brightness based on the
* current foreground activity. * current foreground activity.