diff options
| author | Mike Lockwood <lockwood@android.com> | 2009-10-29 01:27:40 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-29 01:27:40 -0700 |
| commit | c867958eb6fb50210a767fa24757bfa19228c22e (patch) | |
| tree | 4f5b2bae0487244fc33208651ad39e962690c760 /services | |
| parent | a2151b2b982cce5d424fdea2510ea9334a131475 (diff) | |
| parent | d376d2407bbc14a2d221dfef9955d0feeab0d550 (diff) | |
| download | frameworks_base-c867958eb6fb50210a767fa24757bfa19228c22e.zip frameworks_base-c867958eb6fb50210a767fa24757bfa19228c22e.tar.gz frameworks_base-c867958eb6fb50210a767fa24757bfa19228c22e.tar.bz2 | |
am d376d240: Merge change I081f08c1 into eclair
Merge commit 'd376d2407bbc14a2d221dfef9955d0feeab0d550' into eclair-mr2
* commit 'd376d2407bbc14a2d221dfef9955d0feeab0d550':
A better solution for ignoring user activity while the screen is animating off.
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/PowerManagerService.java | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java index 927c1b3..4bf606d 100644 --- a/services/java/com/android/server/PowerManagerService.java +++ b/services/java/com/android/server/PowerManagerService.java @@ -158,7 +158,6 @@ class PowerManagerService extends IPowerManager.Stub private int mProximityCount = 0; private int mPowerState; private boolean mOffBecauseOfUser; - private boolean mAnimatingScreenOff; private int mUserState; private boolean mKeyboardVisible = false; private boolean mUserActivityAllowed = true; @@ -1232,7 +1231,6 @@ class PowerManagerService extends IPowerManager.Stub Log.d(TAG, "preventScreenOn: turning on after a prior preventScreenOn(true)!"); } - mAnimatingScreenOff = false; int err = setScreenStateLocked(true); if (err != 0) { Log.w(TAG, "preventScreenOn: error from setScreenStateLocked(): " + err); @@ -1394,7 +1392,6 @@ class PowerManagerService extends IPowerManager.Stub reallyTurnScreenOn = false; } if (reallyTurnScreenOn) { - mAnimatingScreenOff = false; err = setScreenStateLocked(true); long identity = Binder.clearCallingIdentity(); try { @@ -1436,7 +1433,6 @@ class PowerManagerService extends IPowerManager.Stub if (!mScreenBrightness.animating) { err = screenOffFinishedAnimatingLocked(becauseOfUser); } else { - mAnimatingScreenOff = true; mOffBecauseOfUser = becauseOfUser; err = 0; mLastTouchDown = 0; @@ -1454,7 +1450,6 @@ class PowerManagerService extends IPowerManager.Stub mTotalTouchDownTime, mTouchCycles); mLastTouchDown = 0; int err = setScreenStateLocked(false); - mAnimatingScreenOff = false; if (mScreenOnStartTime != 0) { mScreenOnTime += SystemClock.elapsedRealtime() - mScreenOnStartTime; mScreenOnStartTime = 0; @@ -1827,9 +1822,6 @@ class PowerManagerService extends IPowerManager.Stub return; } - if (mAnimatingScreenOff) { - return; - } if (false) { if (((mPokey & POKE_LOCK_IGNORE_CHEEK_EVENTS) != 0)) { Log.d(TAG, "userActivity !!!");//, new RuntimeException()); @@ -1847,6 +1839,11 @@ class PowerManagerService extends IPowerManager.Stub + " mProximitySensorActive=" + mProximitySensorActive + " force=" + force); } + // ignore user activity if we are in the process of turning off the screen + if (mScreenBrightness.animating && mScreenBrightness.targetValue == 0) { + Log.d(TAG, "ignoring user activity while turning off screen"); + return; + } if (mLastEventTime <= time || force) { mLastEventTime = time; if ((mUserActivityAllowed && !mProximitySensorActive) || force) { |