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

am 401a712e: IPowerManager: remove some unused methods.

Browse Source 
Merge commit '401a712e3b3b41c77e79a130d7b07d653e18bcab' into eclair-mr2-plus-aosp

* commit '401a712e3b3b41c77e79a130d7b07d653e18bcab':
  IPowerManager: remove some unused methods.
This commit is contained in:
Mike Lockwood
2009-11-20 09:56:25 -08:00
committed by Android Git Automerger
parent 12c90b0525 401a712e3b
commit 9d633968ce
3 changed files with 3 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/os/IPowerManager.aidl
View File

@@ -28,9 +28,7 @@ interface IPowerManager
void setPokeLock(int pokey, IBinder lock, String tag);
int getSupportedWakeLockFlags();
void setStayOnSetting(int val);
long getScreenOnTime();
void preventScreenOn(boolean prevent);
void setScreenBrightnessOverride(int brightness);
boolean isScreenOn();
void reboot(String reason);

4
core/java/android/os/LocalPowerManager.java
View File

@@ -44,7 +44,9 @@ public interface LocalPowerManager {
void enableUserActivity(boolean enabled);
// the same as the method on PowerManager
public void userActivity(long time, boolean noChangeLights, int eventType);
void userActivity(long time, boolean noChangeLights, int eventType);
boolean isScreenOn();
void setScreenBrightnessOverride(int brightness);
}

24
services/java/com/android/server/PowerManagerService.java
View File

@@ -216,10 +216,6 @@ class PowerManagerService extends IPowerManager.Stub
private volatile boolean mPokeAwakeOnSet = false;
private volatile boolean mInitComplete = false;
private HashMap<IBinder,PokeLock> mPokeLocks = new HashMap<IBinder,PokeLock>();
// mScreenOnTime and mScreenOnStartTime are used for computing total time screen
// has been on since boot
private long mScreenOnTime;
private long mScreenOnStartTime;
// mLastScreenOnTime is the time the screen was last turned on
private long mLastScreenOnTime;
private boolean mPreventScreenOn;
@@ -417,7 +413,6 @@ class PowerManagerService extends IPowerManager.Stub
// Add ourself to the Watchdog monitors.
Watchdog.getInstance().addMonitor(this);
mScreenOnStartTime = SystemClock.elapsedRealtime();
}
private ContentQueryMap mSettings;
@@ -1470,7 +1465,6 @@ class PowerManagerService extends IPowerManager.Stub
err = 0;
}
mScreenOnStartTime = SystemClock.elapsedRealtime();
mLastTouchDown = 0;
mTotalTouchDownTime = 0;
mTouchCycles = 0;
@@ -1513,10 +1507,6 @@ class PowerManagerService extends IPowerManager.Stub
mTotalTouchDownTime, mTouchCycles);
mLastTouchDown = 0;
int err = setScreenStateLocked(false);
if (mScreenOnStartTime != 0) {
mScreenOnTime += SystemClock.elapsedRealtime() - mScreenOnStartTime;
mScreenOnStartTime = 0;
}
if (err == 0) {
int why = becauseOfUser
? WindowManagerPolicy.OFF_BECAUSE_OF_USER
@@ -2105,20 +2095,6 @@ class PowerManagerService extends IPowerManager.Stub
}
}
/**
* Returns the time the screen has been on since boot, in millis.
* @return screen on time
*/
public long getScreenOnTime() {
synchronized (mLocks) {
if (mScreenOnStartTime == 0) {
return mScreenOnTime;
} else {
return SystemClock.elapsedRealtime() - mScreenOnStartTime + mScreenOnTime;
}
}
}
private void goToSleepLocked(long time) {
if (mLastEventTime <= time) {