Merge commit 'f6ff2be323812b5525a0755d194b2fc751ba5968' into eclair-mr2-plus-aosp
* commit 'f6ff2be323812b5525a0755d194b2fc751ba5968':
Import revised translations. DO NOT MERGE
Merge commit '3bde388ac2b80c9d86553552eaddf762fc9514a4' into eclair-mr2-plus-aosp
* commit '3bde388ac2b80c9d86553552eaddf762fc9514a4':
docs: add new document for the win usb driver;
Merge commit '1edbc1a12c7ecff267e4b94b74222f980af9de6b' into eclair-mr2
* commit '1edbc1a12c7ecff267e4b94b74222f980af9de6b':
docs: add new document for the win usb driver;
The code intended to copy the old value of a field, before the
field was updated. However, what the code was actually doing was
copying the new value of the field, after the field was updated.
The fix was to move the copy to before the update.
This is work towards fixing bug 2228262
Merge commit '0e08055aa31c752732005fc48b09ee470a2c4822' into eclair
* commit '0e08055aa31c752732005fc48b09ee470a2c4822':
docs: add new document for the win usb driver;
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 '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
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 '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:
