Merge commit '61080e26799a2236ee87ef5cb35d0f461a5c835f'
* commit '61080e26799a2236ee87ef5cb35d0f461a5c835f':
Hold a lock while we access the preview heap.
Merge commit '62ad899fa6edb7311eb4f6e0dc2da7e354ce359f'
* commit '62ad899fa6edb7311eb4f6e0dc2da7e354ce359f':
Only use FLAG_ACTIVITY_CLEAR_TOP on the search intent when from global search.
Merge commit '461af5c8db02ecbf81b0e57934f86a7ab6c4e8b6' into eclair-mr2-plus-aosp
* commit '461af5c8db02ecbf81b0e57934f86a7ab6c4e8b6':
Hold a lock while we access the preview heap.
Merge commit '087c06039faeac54aa3063b643c5a6aafe51aa30' into eclair-mr2-plus-aosp
* commit '087c06039faeac54aa3063b643c5a6aafe51aa30':
Only use FLAG_ACTIVITY_CLEAR_TOP on the search intent when from global search.
Merge commit '7ab900edd69324e5eeb2c6b01ef3ef5e836689a3' into eclair-mr2
* commit '7ab900edd69324e5eeb2c6b01ef3ef5e836689a3':
Hold a lock while we access the preview heap.
Merge commit '2b3970a2956152a508254aa2675b68df363d46c1' into eclair-mr2
* commit '2b3970a2956152a508254aa2675b68df363d46c1':
Only use FLAG_ACTIVITY_CLEAR_TOP on the search intent when from global search.
Merge commit 'e4f5e840a3a32764dc49396eb1d8de898f3ed7a5'
* commit 'e4f5e840a3a32764dc49396eb1d8de898f3ed7a5':
b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
Merge commit '4335552259c893dc5e8ebfd8980a36ff8547ee5d'
* commit '4335552259c893dc5e8ebfd8980a36ff8547ee5d':
Increase light sensor delay from one to two seconds.
Merge commit 'f5f452facab27a4c05361f9a61cee2098c2d5043'
* commit 'f5f452facab27a4c05361f9a61cee2098c2d5043':
Set argv[0] from the main thread of an app, not a random binder thread
Merge commit '77be730ace28b9e6543da25f53305496402af295'
* commit '77be730ace28b9e6543da25f53305496402af295':
Add UPDATE_ACTION to Gservices, used by the new checkin service.
Merge commit '811f655366461d0f21f970bcac07dd2084fd54fa' into eclair-mr2-plus-aosp
* commit '811f655366461d0f21f970bcac07dd2084fd54fa':
b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
Merge commit 'dc2a3f60f2bed20ceb44d18ae03e75d360de4ca6' into eclair-mr2-plus-aosp
* commit 'dc2a3f60f2bed20ceb44d18ae03e75d360de4ca6':
Increase light sensor delay from one to two seconds.
Merge commit '307fbbf2b6dbdbc9249c492d5569e874207de5b1' into eclair-mr2-plus-aosp
* commit '307fbbf2b6dbdbc9249c492d5569e874207de5b1':
Set argv[0] from the main thread of an app, not a random binder thread
Merge commit '883be83eab608237652e013b26fe871c18fa8901' into eclair-mr2-plus-aosp
* commit '883be83eab608237652e013b26fe871c18fa8901':
Add UPDATE_ACTION to Gservices, used by the new checkin service.
Merge commit '8d51f7101d2427953dbff9b4b8f8c9fdc0dc4a91' into eclair-mr2
* commit '8d51f7101d2427953dbff9b4b8f8c9fdc0dc4a91':
b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
Merge commit 'b8933665376905c91069eb29fa78c029aa790ce9' into eclair-mr2
* commit 'b8933665376905c91069eb29fa78c029aa790ce9':
Increase light sensor delay from one to two seconds.
Merge commit '49fa9e00986993f5cf05f1092c30479cb98eb254' into eclair-mr2
* commit '49fa9e00986993f5cf05f1092c30479cb98eb254':
Set argv[0] from the main thread of an app, not a random binder thread
Merge commit '7e3873a0d24453057850b408f17fa0e2e37ba0c7'
* commit '7e3873a0d24453057850b408f17fa0e2e37ba0c7':
Expose PowerManager.isScreenOn in the public api.
Forgot to do this with previous check in. Now that calculateLength() has
been fixed to match the actual encoding (ie, doesn't support single-segment
EMS), test case needs to be updated.
Fixes b/2244483
Merge commit '6b07bf3d8f8f9b5124c19f1206e11634a774c356' into eclair-mr2-plus-aosp
* commit '6b07bf3d8f8f9b5124c19f1206e11634a774c356':
Expose PowerManager.isScreenOn in the public api.
copyFrameAndPostCopiedFrame was not holding a lock while it accessed
the preview heap. If the client process is torn down while the heap
is accessed, the memcpy could access memory that was deallocated.
This patch creates a local sp reference to the preview heap while
holding the lock, then releases the lock. This should prevent the
heap from being pulled out from underneath us.
Merge commit '3cba72880b78b81cda2868136462c9e261a3e403' into eclair-mr2
* commit '3cba72880b78b81cda2868136462c9e261a3e403':
Expose PowerManager.isScreenOn in the public api.
Merge commit '22dc40b6c3c1a9951fa17d80bf1f624bc29f5542'
* commit '22dc40b6c3c1a9951fa17d80bf1f624bc29f5542':
do not merge -- original checkin to mr2 here:
Merge commit '3c452e366001521b2ea07dcc2bd2aaa51c5ffd67'
* commit '3c452e366001521b2ea07dcc2bd2aaa51c5ffd67':
Handle OMX_StateInvalid in emergency shutdown properly (by ignoring it and hoping for the best) instead of asserting.
Merge commit 'ca3a6dc41418da152d154245c59054f7d0f0d679' into eclair-mr2-plus-aosp
* commit 'ca3a6dc41418da152d154245c59054f7d0f0d679':
do not merge -- original checkin to mr2 here:
Merge commit 'f28e0c2ac75bf630a595d442a7ddefcc1f8386f6' into eclair-mr2-plus-aosp
* commit 'f28e0c2ac75bf630a595d442a7ddefcc1f8386f6':
Handle OMX_StateInvalid in emergency shutdown properly (by ignoring it and hoping for the best) instead of asserting.
Merge commit '45011f2dc56e99c00bd1f3abff4f11d6df644d80' into eclair-mr2
* commit '45011f2dc56e99c00bd1f3abff4f11d6df644d80':
do not merge -- original checkin to mr2 here:
