diff options
| author | Roman Birg <roman@cyngn.com> | 2015-05-05 09:46:08 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2015-05-05 20:35:56 +0000 |
| commit | f666bcaa22966ea9753f74567732f39c85f23b47 (patch) | |
| tree | 456b922721056c54717c6a8a181c09d468560c75 | |
| parent | 61f23ebbd23a65622ff712b14a0abebdc1603984 (diff) | |
| download | android_frameworks_base-f666bcaa22966ea9753f74567732f39c85f23b47.tar.gz android_frameworks_base-f666bcaa22966ea9753f74567732f39c85f23b47.tar.bz2 android_frameworks_base-f666bcaa22966ea9753f74567732f39c85f23b47.zip | |
policy: fix device sleeping with lid with incoming call
Change-Id: Idd538ee25009eeb4f5a9e11602ac739926493a81
Signed-off-by: Roman Birg <roman@cyngn.com>
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 41dbbcbda23..efdc7c39f03 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -6729,9 +6729,14 @@ public class PhoneWindowManager implements WindowManagerPolicy { mPowerManager.setKeyboardVisibility(isBuiltInKeyboardVisible()); if (mLidState == LID_CLOSED && mLidControlsSleep) { - mPowerManager.goToSleep(SystemClock.uptimeMillis(), - PowerManager.GO_TO_SLEEP_REASON_LID_SWITCH, - PowerManager.GO_TO_SLEEP_FLAG_NO_DOZE); + TelecomManager telephonyService = getTelecommService(); + if (!(telephonyService == null + || telephonyService.isRinging())) { + mPowerManager.goToSleep(SystemClock.uptimeMillis(), + PowerManager.GO_TO_SLEEP_REASON_LID_SWITCH, + PowerManager.GO_TO_SLEEP_FLAG_NO_DOZE); + } + } synchronized (mLock) { |