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

am 3fee5c6b: Merge "Fix some proximity sensor bugs." into jb-mr1-dev

Browse Source 
* commit '3fee5c6bd8e13f8ef7e1ba1df3a8bf56ebb36221':
  Fix some proximity sensor bugs.
This commit is contained in:
Jeff Brown
2012-08-20 15:01:39 -07:00
committed by Android Git Automerger
parent c456bf13ac 3fee5c6bd8
commit 38f05e09bd
1 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
services/java/com/android/server/power/DisplayPowerController.java
View File

@@ -479,11 +479,13 @@ final class DisplayPowerController {
if (mPowerRequest == null) {
mPowerRequest = new DisplayPowerRequest(mPendingRequestLocked);
mWaitingForNegativeProximity = mPendingWaitForNegativeProximityLocked;
mPendingWaitForNegativeProximityLocked = false;
mPendingRequestChangedLocked = false;
mustInitialize = true;
} else if (mPendingRequestChangedLocked) {
mPowerRequest.copyFrom(mPendingRequestLocked);
mWaitingForNegativeProximity |= mPendingWaitForNegativeProximityLocked;
mPendingWaitForNegativeProximityLocked = false;
mPendingRequestChangedLocked = false;
mDisplayReadyLocked = false;
}
@@ -496,24 +498,33 @@ final class DisplayPowerController {
initialize();
}
// Clear a request to wait for negative proximity if needed.
if (mPowerRequest.screenState == DisplayPowerRequest.SCREEN_STATE_OFF
|| mProximity == PROXIMITY_NEGATIVE
|| mProximitySensor == null) {
mWaitingForNegativeProximity = false;
}
// Turn on the proximity sensor if needed.
// Apply the proximity sensor.
if (mProximitySensor != null) {
setProximitySensorEnabled(mPowerRequest.useProximitySensor
|| mWaitingForNegativeProximity);
if (mProximitySensorEnabled && mProximity == PROXIMITY_POSITIVE) {
mScreenOffBecauseOfProximity = true;
setScreenOn(false);
} else if (mScreenOffBecauseOfProximity) {
if (mPowerRequest.useProximitySensor
&& mPowerRequest.screenState != DisplayPowerRequest.SCREEN_STATE_OFF) {
setProximitySensorEnabled(true);
if (!mScreenOffBecauseOfProximity
&& mProximity == PROXIMITY_POSITIVE) {
mScreenOffBecauseOfProximity = true;
setScreenOn(false);
}
} else if (mWaitingForNegativeProximity
&& mScreenOffBecauseOfProximity
&& mProximity == PROXIMITY_POSITIVE
&& mPowerRequest.screenState != DisplayPowerRequest.SCREEN_STATE_OFF) {
setProximitySensorEnabled(true);
} else {
setProximitySensorEnabled(false);
mWaitingForNegativeProximity = false;
}
if (mScreenOffBecauseOfProximity
&& mProximity != PROXIMITY_POSITIVE) {
mScreenOffBecauseOfProximity = false;
setScreenOn(true);
sendOnProximityNegative();
}
} else {
mWaitingForNegativeProximity = false;
}
// Turn on the light sensor if needed.