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

am 678fa189: am 94db928d: PowerManager: Require proximity sensor value be less than Sensor.getMaximumRange()

Browse Source 
Merge commit '678fa1898f8928cd6b81d2fe60ed54af60be3695'

* commit '678fa1898f8928cd6b81d2fe60ed54af60be3695':
  PowerManager: Require proximity sensor value be less than Sensor.getMaximumRange()
This commit is contained in:
Mike Lockwood
2009-09-21 21:40:10 -07:00
committed by Android Git Automerger
parent 3fabbc83de 678fa1898f
commit a0b5e3acb4
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2131,7 +2131,9 @@ class PowerManagerService extends IPowerManager.Stub
long milliseconds = event.timestamp / 1000000;
synchronized (mLocks) {
float distance = event.values[0];
if (distance >= 0.0 && distance < PROXIMITY_THRESHOLD) {
// compare against getMaximumRange to support sensors that only return 0 or 1
if (distance >= 0.0 && distance < PROXIMITY_THRESHOLD &&
distance < mProximitySensor.getMaximumRange()) {
if (mSpew) {
Log.d(TAG, "onSensorChanged: proximity active, distance: " + distance);
}