The logic that disables user activity while turning off the screen should not affect proximity sensor.
Fixes bug b/2228734 (in-call, prox sensor gets confused)
Change-Id: Ieca126e6f79bf7baa5741981aea72d306ba03edc
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '80164966d087388ac0192caf7270158dea22444e'
* commit '80164966d087388ac0192caf7270158dea22444e':
Fix issue 197683: English IME key-press latency is noticeably higher on passion than sholes. Part 2.
Merge commit 'db61b03c23267d2687c18a4dfec1448ab5325764'
* commit 'db61b03c23267d2687c18a4dfec1448ab5325764':
Do not advance mLastEventTime when enabling or disabling user activity.
Merge commit 'a86861a8684809bf3e3b877a20852483bc889742' into eclair-mr2-plus-aosp
* commit 'a86861a8684809bf3e3b877a20852483bc889742':
Fix issue 197683: English IME key-press latency is noticeably higher on passion than sholes. Part 2.
Merge commit 'b2346324e5f6062fed7bdeaedb9cf968b05050ec' into eclair-mr2-plus-aosp
* commit 'b2346324e5f6062fed7bdeaedb9cf968b05050ec':
Do not advance mLastEventTime when enabling or disabling user activity.
Merge commit '31f62008db4b2c3bfd24379b76570fd9bd1de2b3' into eclair-mr2
* commit '31f62008db4b2c3bfd24379b76570fd9bd1de2b3':
Fix issue 197683: English IME key-press latency is noticeably higher on passion than sholes. Part 2.
Merge commit 'f1d14f6a33bc6086db52a77b6a1217452b7eac90' into eclair-mr2
* commit 'f1d14f6a33bc6086db52a77b6a1217452b7eac90':
Do not advance mLastEventTime when enabling or disabling user activity.
Merge commit '31f62008db4b2c3bfd24379b76570fd9bd1de2b3' into eclair-plus-aosp
* commit '31f62008db4b2c3bfd24379b76570fd9bd1de2b3':
Fix issue 197683: English IME key-press latency is noticeably higher on passion than sholes. Part 2.
Merge commit 'f1d14f6a33bc6086db52a77b6a1217452b7eac90' into eclair-plus-aosp
* commit 'f1d14f6a33bc6086db52a77b6a1217452b7eac90':
Do not advance mLastEventTime when enabling or disabling user activity.
Fixes a race condition between the keyguard and power key that sometimes resulted
in the power key failing to turn off the screen.
Fixes bug b/2212852 (Power button does not put phone to sleep)
Change-Id: I92498c5fddf2bfc32b105ea1a7ea14a06d83888e
Signed-off-by: Mike Lockwood <lockwood@android.com>
Reduce sleep time in AudioFlinger mixer thread when no data has been written to output to speed up startup time when exiting standby.
The rest of the modifications for this issues is in kernel driver:
commit 0dbb0ee136ed8de757df1ae26d84556c1751deae for buffer size modification from 8192 to 4800 bytes.
Another kernel improvement that is not submitted yes will reduce delay when audio output is exiting standby.
Merge commit '69cbd296820d21fac1f866fe8d3b03d3007bb241'
* commit '69cbd296820d21fac1f866fe8d3b03d3007bb241':
Add warning that hardware auto-brightness is deprecated and will be removed in the next release.
Merge commit '0fe19fb891d65f94bdab46b2dd3ecfdabd2876ee'
* commit '0fe19fb891d65f94bdab46b2dd3ecfdabd2876ee':
Manage button and keyboard backlights with light sensor in both manual and automatic mode.
Merge commit 'f20555706c81dcb9fcb1fee9ce263072cd77ea3c' into eclair-mr2-plus-aosp
* commit 'f20555706c81dcb9fcb1fee9ce263072cd77ea3c':
Add warning that hardware auto-brightness is deprecated and will be removed in the next release.
Merge commit 'f6fc41314d253962720b2c75f3a64025037acf0e' into eclair-mr2-plus-aosp
* commit 'f6fc41314d253962720b2c75f3a64025037acf0e':
Manage button and keyboard backlights with light sensor in both manual and automatic mode.
Merge commit '47fd5cd1fae6cfaac1b9d5c492be013663c0c9fc'
* commit '47fd5cd1fae6cfaac1b9d5c492be013663c0c9fc':
Don't turn on keyboard backlights when keyboard is closed in auto brightness mode.
Merge commit '301eff069cbf086450af7a6e546acda20ca0055f'
* commit '301eff069cbf086450af7a6e546acda20ca0055f':
Use separate flags for enabling hardware and software auto-brightness.
Merge commit '0d8aa05d306205850e3014550bce34735ac78660'
* commit '0d8aa05d306205850e3014550bce34735ac78660':
Add a privateImeOption to represent that the IME should not show
Merge commit '78383abf76e7daf8c1968d2e9a29a1ba354edb2e'
* commit '78383abf76e7daf8c1968d2e9a29a1ba354edb2e':
Turns out the SGX driver is correct and the bug was in this test.
Merge commit 'c64e9346785a1a4fc95ec6cf27da8a5193a2dfbc'
* commit 'c64e9346785a1a4fc95ec6cf27da8a5193a2dfbc':
fix[2222341] Soft reset while going back from camcorder settings
Merge commit '3275b80f0dc8e2a0bcc048ad0907762f11910f05'
* commit '3275b80f0dc8e2a0bcc048ad0907762f11910f05':
DO NOT MERGE: Another gcc 4.0.3 workaround.
Merge commit 'e0d30d674d59f3f2b04ab07e14f50390f30024a8'
* commit 'e0d30d674d59f3f2b04ab07e14f50390f30024a8':
Revert the channge where channels were not selected randomly.
Merge commit '9efd523c4611c0cf10e712453a699c083a01064c' into eclair-mr2
* commit '9efd523c4611c0cf10e712453a699c083a01064c':
Add warning that hardware auto-brightness is deprecated and will be removed in the next release.
Merge commit '4984e73dc5fc3df757e4ac8dd333b88151deb3ea' into eclair-mr2
* commit '4984e73dc5fc3df757e4ac8dd333b88151deb3ea':
Manage button and keyboard backlights with light sensor in both manual and automatic mode.
Merge commit '9efd523c4611c0cf10e712453a699c083a01064c' into eclair-plus-aosp
* commit '9efd523c4611c0cf10e712453a699c083a01064c':
Add warning that hardware auto-brightness is deprecated and will be removed in the next release.
Merge commit '4984e73dc5fc3df757e4ac8dd333b88151deb3ea' into eclair-plus-aosp
* commit '4984e73dc5fc3df757e4ac8dd333b88151deb3ea':
Manage button and keyboard backlights with light sensor in both manual and automatic mode.
Merge commit '7dc642d0b9f9395221818978d2cd9143cd3cad36' into eclair-mr2-plus-aosp
* commit '7dc642d0b9f9395221818978d2cd9143cd3cad36':
Don't turn on keyboard backlights when keyboard is closed in auto brightness mode.
Merge commit '148f666b0a10183afc987809482f18d8199d747c' into eclair-mr2-plus-aosp
* commit '148f666b0a10183afc987809482f18d8199d747c':
Use separate flags for enabling hardware and software auto-brightness.
Merge commit 'df024920ebc63a82f570105c7a26e339ff244afd' into eclair-plus-aosp
* commit 'df024920ebc63a82f570105c7a26e339ff244afd':
Don't turn on keyboard backlights when keyboard is closed in auto brightness mode.
Merge commit 'aa66ea880f58c9caa49e31c166bb3bd6bbf14e21' into eclair-plus-aosp
* commit 'aa66ea880f58c9caa49e31c166bb3bd6bbf14e21':
Use separate flags for enabling hardware and software auto-brightness.
Merge commit 'df024920ebc63a82f570105c7a26e339ff244afd' into eclair-mr2
* commit 'df024920ebc63a82f570105c7a26e339ff244afd':
Don't turn on keyboard backlights when keyboard is closed in auto brightness mode.
Merge commit 'aa66ea880f58c9caa49e31c166bb3bd6bbf14e21' into eclair-mr2
* commit 'aa66ea880f58c9caa49e31c166bb3bd6bbf14e21':
Use separate flags for enabling hardware and software auto-brightness.
