Merge commit '1150e818727d9a0620ecd5c5f7ef40ce0078c7f4'
* commit '1150e818727d9a0620ecd5c5f7ef40ce0078c7f4':
Add ability to disable sending Photos using Vcard. Do Not Merge
Merge commit '395a20aeed0d7c58c978ed32cf50253280723cac' into eclair-mr2-plus-aosp
* commit '395a20aeed0d7c58c978ed32cf50253280723cac':
Add ability to disable sending Photos using Vcard. Do Not Merge
Merge commit 'a229cedadd6c3b8ab7f2d8b7b45638753e834992' into eclair-mr2
* commit 'a229cedadd6c3b8ab7f2d8b7b45638753e834992':
Add ability to disable sending Photos using Vcard. Do Not Merge
Merge commit '15ec511b5c5cdb901bf1bd0e26ff0514635fc681'
* commit '15ec511b5c5cdb901bf1bd0e26ff0514635fc681':
Fix a build break. Too many branches to keep track of.
Merge commit '8ba42ba83b206929c4c13c0b8ef24de87a92f42c'
* commit '8ba42ba83b206929c4c13c0b8ef24de87a92f42c':
libbinder: add a NO_CACHING flag to MemoryHeapBase
Merge commit 'fb1d992f4b8addad729a94cb006a732a40b62756'
* commit 'fb1d992f4b8addad729a94cb006a732a40b62756':
Make sure the visualization stops immediately when sound stops, instead of continuing for a fraction of a second.
Merge commit '766df995e30caa054cc25068e55f160c765590eb'
* commit '766df995e30caa054cc25068e55f160c765590eb':
Fix some leaks. This fixes the major malloc memory leak in allApps. Still tracking some much more minor issues.
Merge commit '38f95586a6540756d5de383145b49a8625d49d23' into eclair-mr2-plus-aosp
* commit '38f95586a6540756d5de383145b49a8625d49d23':
Fix a build break. Too many branches to keep track of.
Merge commit '03e778b913adfb450889c51adf042388ada7c5f8' into eclair-mr2
* commit '03e778b913adfb450889c51adf042388ada7c5f8':
Fix a build break. Too many branches to keep track of.
Merge commit 'cd767bfd1c8e3103f99207ecfa34385e76518e82' into eclair-mr2-plus-aosp
* commit 'cd767bfd1c8e3103f99207ecfa34385e76518e82':
libbinder: add a NO_CACHING flag to MemoryHeapBase
Merge commit '1166ff76eb3dbb5304dc40b3056e48c2c9dc7577' into eclair-mr2-plus-aosp
* commit '1166ff76eb3dbb5304dc40b3056e48c2c9dc7577':
Make sure the visualization stops immediately when sound stops, instead of continuing for a fraction of a second.
Merge commit 'd31b0e44af38594691440ba1ab5150b1a8f8480b' into eclair-mr2-plus-aosp
* commit 'd31b0e44af38594691440ba1ab5150b1a8f8480b':
Fix some leaks. This fixes the major malloc memory leak in allApps. Still tracking some much more minor issues.
Merge commit 'd4649b2f8ea8285a4eb3c47e87520c7835e6c672' into eclair-mr2
* commit 'd4649b2f8ea8285a4eb3c47e87520c7835e6c672':
libbinder: add a NO_CACHING flag to MemoryHeapBase
Merge commit '1d9246e8bb8de624e14c55dce57e93da18cfd7a8' into eclair-mr2
* commit '1d9246e8bb8de624e14c55dce57e93da18cfd7a8':
Make sure the visualization stops immediately when sound stops, instead of continuing for a fraction of a second.
Merge commit '3bbb5e9a1e792795dc6965dd399ef78d4e6556cd' into eclair-mr2
* commit '3bbb5e9a1e792795dc6965dd399ef78d4e6556cd':
Fix some leaks. This fixes the major malloc memory leak in allApps. Still tracking some much more minor issues.
Merge commit '96c178498c7c65388955cb8d2f8f11b0fac76c8d'
* commit '96c178498c7c65388955cb8d2f8f11b0fac76c8d':
Use setRepeating() rather than setInexactRepeating() for backup scheduling,
Merge commit 'cc1d35e2e5e0c2370361294a64ff0e580856b9d2' into eclair-mr2-plus-aosp
* commit 'cc1d35e2e5e0c2370361294a64ff0e580856b9d2':
Use setRepeating() rather than setInexactRepeating() for backup scheduling,
Merge commit 'afd81beb33cce3b296927d13821fe0dc874ce7db' into eclair-mr2
* commit 'afd81beb33cce3b296927d13821fe0dc874ce7db':
Use setRepeating() rather than setInexactRepeating() for backup scheduling,
* changes:
Use setRepeating() rather than setInexactRepeating() for backup scheduling, and add some random fuzz to the scheduling times, to make sure we aren't creating hour-aligned server load spikes.
Bug 2195678
We had all this stuff there to keep the notification view
around so it doesn't need to be reconstructed each time,
and we weren't using it. This fixes that, and it looks
much better now.
Merge commit 'a94da0e7d98cdeae65cd48d4e7cfcf8f8b9aacfb'
* commit 'a94da0e7d98cdeae65cd48d4e7cfcf8f8b9aacfb':
Fix problem with proximity sensor not reawaking screen if the values change too quickly.
Merge commit 'e94261b874b7d0704dade14540dbb9477a828163' into eclair-mr2-plus-aosp
* commit 'e94261b874b7d0704dade14540dbb9477a828163':
Fix problem with proximity sensor not reawaking screen if the values change too quickly.
Merge commit '989b76aadd92538c7ab4ca00c34508b42fda8cef' into eclair-mr2
* commit '989b76aadd92538c7ab4ca00c34508b42fda8cef':
Fix problem with proximity sensor not reawaking screen if the values change too quickly.
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.
