Merge commit 'f4d788c9309bc5480100d980608472e4cb04f309' into gingerbread-plus-aosp
* commit 'f4d788c9309bc5480100d980608472e4cb04f309':
Make input dispatcher only ANR for foreground windows.
Redesigned the input dispatcher's ANR timeout mechanism so it is much
closer to Froyo's policy. ANR is only ever signalled if the dispatcher
is waiting on a window to finish processing its previous event(s) and
there is new pending input.
In the old code, we tracked the dispatch timeout separately for each
input channel. This was somewhat complicated and also resulted in the
situation where applications could ANR long after the user had pushed
them into the background.
Change-Id: I666ecada0952d4b95f1d67b9f733842b745c7f4b
Merge commit '747c61535281b4d2958e293e83245a19ba58f6a0' into gingerbread-plus-aosp
* commit '747c61535281b4d2958e293e83245a19ba58f6a0':
ContactsContract: update SipAddress to be multi-valued
Merge commit '310da64d78750cdba4349d7cc0a268c07155569d'
* commit '310da64d78750cdba4349d7cc0a268c07155569d':
fix a typo where the eventtags code were wrong
Merge commit '7ff945775210c60e6f113fb00903449cbb05c68a'
* commit '7ff945775210c60e6f113fb00903449cbb05c68a':
Various fixes to improve resilience of the rtsp stack against spurious errors instead of asserting.
Merge commit 'b8dbdc293a8495a873a9c36353d6a9408c698256' into gingerbread-plus-aosp
* commit 'b8dbdc293a8495a873a9c36353d6a9408c698256':
Clarify the danger of READ_LOGS and DUMP permissions.
Merge commit '24a2c2b59670b4d9083ff0d23c87d3910a632e7d' into gingerbread-plus-aosp
* commit '24a2c2b59670b4d9083ff0d23c87d3910a632e7d':
Upgrade to the latest .webm project code.
Merge commit '3fd5fa4ca9dbdd5be46ec2952c7038cdd59e35d5' into gingerbread-plus-aosp
* commit '3fd5fa4ca9dbdd5be46ec2952c7038cdd59e35d5':
Fix the runtime restart due to name change.
Merge commit '8d9e8de2c920e8c9dc2da33410780ec739076bb9'
* commit '8d9e8de2c920e8c9dc2da33410780ec739076bb9':
SipService: send SERVER_ERROR if server doesn't provide nonce
Merge commit 'd2de99e377408dc28dca5e4c61a816879595fbf3'
* commit 'd2de99e377408dc28dca5e4c61a816879595fbf3':
Fix name shadowing bug with revoking URI permissions.
Merge commit 'c5e2e26b9da40dc0941d0a6a33a82d8923924051'
* commit 'c5e2e26b9da40dc0941d0a6a33a82d8923924051':
DO NOT MERGE Correct the PackageManager.checkSignatures documentation.
Merge commit '344d96635ec40e0c541f32064f42c8ad38e4505a' into gingerbread-plus-aosp
* commit '344d96635ec40e0c541f32064f42c8ad38e4505a':
Close tz query cursor when done.
Merge commit '8f385affafddc1147b9dc4f0c4f49449ebf477c9' into gingerbread-plus-aosp
* commit '8f385affafddc1147b9dc4f0c4f49449ebf477c9':
Add new/changed drawable assets from design team
Merge commit 'a6f41495962c6427cfb3976daeb7f7b4df63ac57' into gingerbread-plus-aosp
* commit 'a6f41495962c6427cfb3976daeb7f7b4df63ac57':
Update camera API and javadoc for API review comments.
Merge commit '968735e580b7728c6a17aff9b7356f9d74dc6eb3' into gingerbread-plus-aosp
* commit '968735e580b7728c6a17aff9b7356f9d74dc6eb3':
Fixing the NPE in SipPhone
Merge commit '698ddb0cd64f7e317ae2f98de05d6462f22b2b2a' into gingerbread-plus-aosp
* commit '698ddb0cd64f7e317ae2f98de05d6462f22b2b2a':
Fix links in SIP API javadoc.
Merge commit 'f182e8a8c2e726b376f3f4c0deb02dfdb6ae06a9' into gingerbread-plus-aosp
* commit 'f182e8a8c2e726b376f3f4c0deb02dfdb6ae06a9':
fix a typo where the eventtags code were wrong
Merge commit '14bc6b5d0677e5c454a67775c852f90389bb4567'
* commit '14bc6b5d0677e5c454a67775c852f90389bb4567':
Replace epoll() with poll() and rename PollLoop to Looper.
