diff options
| author | Joe Onorato <joeo@android.com> | 2010-10-26 07:24:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-26 07:24:41 -0700 |
| commit | a1e7474498163f8ddbe1146f8f375fbf905db41d (patch) | |
| tree | 53e566e97754ed9be275c704c4568582ae1762b3 /services | |
| parent | 55744530222288c79a5e1aa61b65f7f6b2262fab (diff) | |
| parent | 11e2e9b0c261d95aafc9eb9c306f85fe95ac508a (diff) | |
| download | frameworks_base-a1e7474498163f8ddbe1146f8f375fbf905db41d.zip frameworks_base-a1e7474498163f8ddbe1146f8f375fbf905db41d.tar.gz frameworks_base-a1e7474498163f8ddbe1146f8f375fbf905db41d.tar.bz2 | |
am 11e2e9b0: Merge "Don\'t turn the button backlights on if the screen is off. Part 2." into gingerbread
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/PowerManagerService.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java index fadbb34..b0e30f9 100644 --- a/services/java/com/android/server/PowerManagerService.java +++ b/services/java/com/android/server/PowerManagerService.java @@ -2354,6 +2354,14 @@ class PowerManagerService extends IPowerManager.Stub Slog.d(TAG, "lightSensorChangedLocked " + value); } + // Don't do anything if the screen is off. + if ((mPowerState & SCREEN_ON_BIT) == 0) { + if (mDebugLightSensor) { + Slog.d(TAG, "dropping lightSensorChangedLocked because screen is off"); + } + return; + } + // do not allow light sensor value to decrease if (mHighestLightSensorValue < value) { mHighestLightSensorValue = value; |