diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2012-02-11 18:51:54 +0300 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2012-02-11 18:51:54 +0300 |
| commit | 3836ca19dba4dead4584fd47dd8b8dacba2b90b0 (patch) | |
| tree | d79ade35d622541b88bd714b1ef7700bafa0f674 | |
| parent | f3e43ec1bba9a48ddcc4c36c34b3f20ec5d3ee02 (diff) | |
| parent | bd803b35d12104863e9278c382228b5dab89a8a6 (diff) | |
| download | frameworks_base-3836ca19dba4dead4584fd47dd8b8dacba2b90b0.zip frameworks_base-3836ca19dba4dead4584fd47dd8b8dacba2b90b0.tar.gz frameworks_base-3836ca19dba4dead4584fd47dd8b8dacba2b90b0.tar.bz2 | |
Merge "Fix mDeskModeKeepsScreenOn logic" into gingerbread
| -rw-r--r-- | services/java/com/android/server/UiModeManagerService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/java/com/android/server/UiModeManagerService.java b/services/java/com/android/server/UiModeManagerService.java index 431cc39..759b686 100644 --- a/services/java/com/android/server/UiModeManagerService.java +++ b/services/java/com/android/server/UiModeManagerService.java @@ -546,9 +546,10 @@ class UiModeManagerService extends IUiModeManager.Stub { updateConfigurationLocked(true); // keep screen on when charging and in car mode + // or when on a desk dock boolean keepScreenOn = mCharging && ((mCarModeEnabled && mCarModeKeepsScreenOn) || - (mCurUiMode == Configuration.UI_MODE_TYPE_DESK && mDeskModeKeepsScreenOn)); + ((mCurUiMode&Configuration.UI_MODE_TYPE_DESK)!=0 && mDeskModeKeepsScreenOn)); if (keepScreenOn != mWakeLock.isHeld()) { if (keepScreenOn) { mWakeLock.acquire(); |