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

Merge "Report negative proximity if we lose the prox sensor" into tm-qpr-dev

Browse Source
This commit is contained in:
Piotr Wilczyński
2023-03-13 12:42:22 +00:00
committed by Android (Google) Code Review
parent 4626fa48c4 905a8d5f28
commit 257efc5ad5
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/display/DisplayPowerController.java
View File

@@ -1372,8 +1372,17 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
sendOnProximityNegativeWithWakelock(); sendOnProximityNegativeWithWakelock();
} }
} else { } else {
setProximitySensorEnabled(false);
mWaitingForNegativeProximity = false; mWaitingForNegativeProximity = false;
mIgnoreProximityUntilChanged = false; mIgnoreProximityUntilChanged = false;
if (mScreenOffBecauseOfProximity) {
// The screen *was* off due to prox being near, but now there's no prox sensor, so
// let's turn the screen back on.
mScreenOffBecauseOfProximity = false;
skipRampBecauseOfProximityChangeToNegative = true;
sendOnProximityNegativeWithWakelock();
}
} }
if (!mIsEnabled if (!mIsEnabled