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

resolved conflicts for merge of 33264596 to ics-aah

Browse Source 
Change-Id: I1b0b2c3a63d97d49940666ceec71293bdbab4e2e
This commit is contained in:
Jason Simmons
2011-08-25 09:57:48 -07:00
parent cbb8b45088 332645960c
commit df6bb0a7ee
11 changed files with 331 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -163,6 +163,7 @@ public class PowerManagerService extends IPowerManager.Stub
private int mStayOnConditions = 0;
private final int[] mBroadcastQueue = new int[] { -1, -1, -1 };
private final int[] mBroadcastWhy = new int[3];
private boolean mBroadcastingScreenOff = false;
private int mPartialCount = 0;
private int mPowerState;
// mScreenOffReason can be WindowManagerPolicy.OFF_BECAUSE_OF_USER,
@@ -1345,6 +1346,10 @@ public class PowerManagerService extends IPowerManager.Stub
mBroadcastWakeLock.release();
}
// The broadcast queue has changed; make sure the screen is on if it
// is now possible for it to be.
updateNativePowerStateLocked();
// Now send the message.
if (index >= 0) {
// Acquire the broadcast wake lock before changing the power
@@ -1373,6 +1378,9 @@ public class PowerManagerService extends IPowerManager.Stub
mBroadcastWhy[i] = mBroadcastWhy[i+1];
}
policy = getPolicyLocked();
if (value == 0) {
mBroadcastingScreenOff = true;
}
}
if (value == 1) {
mScreenOnStart = SystemClock.uptimeMillis();
@@ -1415,6 +1423,8 @@ public class PowerManagerService extends IPowerManager.Stub
synchronized (mLocks) {
EventLog.writeEvent(EventLogTags.POWER_SCREEN_BROADCAST_STOP, 3,
mBroadcastWakeLock.mCount);
mBroadcastingScreenOff = false;
updateNativePowerStateLocked();
mBroadcastWakeLock.release();
}
}
@@ -1445,6 +1455,10 @@ public class PowerManagerService extends IPowerManager.Stub
synchronized (mLocks) {
EventLog.writeEvent(EventLogTags.POWER_SCREEN_BROADCAST_DONE, 0,
SystemClock.uptimeMillis() - mScreenOffStart, mBroadcastWakeLock.mCount);
synchronized (mLocks) {
mBroadcastingScreenOff = false;
updateNativePowerStateLocked();
}
mBroadcastWakeLock.release();
}
}
@@ -1771,6 +1785,22 @@ public class PowerManagerService extends IPowerManager.Stub
}
private void updateNativePowerStateLocked() {
if ((mPowerState & SCREEN_ON_BIT) != 0) {
// Don't turn screen on if we are currently reporting a screen off.
// This is to avoid letting the screen go on before things like the
// lock screen have been displayed due to it going off.
if (mBroadcastingScreenOff) {
// Currently broadcasting that the screen is off. Don't
// allow screen to go on until that is done.
return;
}
for (int i=0; i<mBroadcastQueue.length; i++) {
if (mBroadcastQueue[i] == 0) {
// A screen off is currently enqueued.
return;
}
}
}
if (!mHeadless) {
nativeSetPowerState(
(mPowerState & SCREEN_ON_BIT) != 0,