Merge commit '1bdba9fa3178d00a03dcbc3ede1818f7bff07e61'
* commit '1bdba9fa3178d00a03dcbc3ede1818f7bff07e61':
GPS: Fix another race condition in GPS HAL initialization
Merge commit 'a23964f9a1df7fb2f18e350fb4215933674f9991'
* commit 'a23964f9a1df7fb2f18e350fb4215933674f9991':
bug:3082865 don't use IN to construct sql to delete downloads
Merge commit 'ca1db5ae68971779fd8af83c908128849f470ae0'
* commit 'ca1db5ae68971779fd8af83c908128849f470ae0':
Fallback to SharedPreferences$Editor.commit() when no apply() exists.
Merge commit 'ceb3aae348d4b17e6282fe7706fc22b699ee9a1d'
* commit 'ceb3aae348d4b17e6282fe7706fc22b699ee9a1d':
Avoid pre-processing images when they won't be used
Merge commit '41aabeb51305d19747687f246080f44fc2a74435'
* commit '41aabeb51305d19747687f246080f44fc2a74435':
Added more robust tracking and cancelation of events.
Merge commit '1da8d4d1697cec871dea8c30dad67e90db10bde6' into gingerbread-plus-aosp
* commit '1da8d4d1697cec871dea8c30dad67e90db10bde6':
Fix an event injection bug when the policy is bypassed.
Merge commit '44104df10660c711129fd263364afc2174f40ac2' into gingerbread-plus-aosp
* commit '44104df10660c711129fd263364afc2174f40ac2':
Fix status bar flashing after orientation change
Merge commit 'a4e95dfea4f3635d6cb845873fce0566c20cc88e' into gingerbread-plus-aosp
* commit 'a4e95dfea4f3635d6cb845873fce0566c20cc88e':
Grant URI permissions to the MCS
Added the concept of a "trusted" event to distinguish between events from
attached input devices or trusted injectors vs. other applications.
This change enables us to move certain policy decisions out of the
dispatcher and into the policy itself where they can be handled more
systematically.
Change-Id: I4d56fdcdd31aaa675d452088af39a70c4e039970
Merge commit 'c0ad216c8ebc74b59074a7538533605eebfd65c3' into gingerbread-plus-aosp
* commit 'c0ad216c8ebc74b59074a7538533605eebfd65c3':
Add a configuration option to turn on the screen when you unplug the device.
Merge commit '3d90d11a7b6d2b1c49e5890306a06f01646392b0' into gingerbread-plus-aosp
* commit '3d90d11a7b6d2b1c49e5890306a06f01646392b0':
Revert "docs: new web apps dev guides" Do not merge.
Merge commit '3fd40ee692ed1d4bca40e184119b0d1368671037' into gingerbread
* commit '3fd40ee692ed1d4bca40e184119b0d1368671037':
Revert "docs: new web apps dev guides" Do not merge.
Merge commit 'cf6b2765ae7ea6305754e253264012b8f0498f7b' into gingerbread-plus-aosp
* commit 'cf6b2765ae7ea6305754e253264012b8f0498f7b':
fix a bug where FLIP_H would do a 180 rotation
Merge commit 'd0528b74b6de87c415ea498095e142d52c68875b' into gingerbread-plus-aosp
* commit 'd0528b74b6de87c415ea498095e142d52c68875b':
deliver invalidate messages AFTER other messages
because invalidate messages were always handled first, they
could prevent other messages to get through entirely.
there is no real reason to handle invalidate messages first because
the other messages are very uncommon and won't interfer with
updates.
Change-Id: Ib95cdf35a91407bd2f4d69dd082c5f546e1e0071
Merge commit '446547af37fd10142f15f6a9b3ac3007c6473981' into gingerbread-plus-aosp
* commit '446547af37fd10142f15f6a9b3ac3007c6473981':
Don't throw when userActivity fails because of the permission check.
Merge commit '6bb7a4a68ae79dab56b23d1c7111bf7eb3aa55fe' into gingerbread-plus-aosp
* commit '6bb7a4a68ae79dab56b23d1c7111bf7eb3aa55fe':
Go one day into 1970 for timezone code.
Merge commit 'ce2f1909c74a1b90995f06a865d21260b062300b' into gingerbread-plus-aosp
* commit 'ce2f1909c74a1b90995f06a865d21260b062300b':
On boot, advance time to at least 1970.
Merge commit 'a7c76d8307a3b49bf5b8fdda3543455b0e5dd64c' into gingerbread-plus-aosp
* commit 'a7c76d8307a3b49bf5b8fdda3543455b0e5dd64c':
fix a bug where timeouts would only be handled when a message was delivered
Merge commit '1010da2e02216b2f94fbe763a82d53201b340217' into gingerbread-plus-aosp
* commit '1010da2e02216b2f94fbe763a82d53201b340217':
Just in case we're behind a NAT router/firewall, attempt to poke holes into it for future incoming RTP/RTCP packets to pass through.
