Merge commit 'f6ff2be323812b5525a0755d194b2fc751ba5968' into eclair-mr2-plus-aosp
* commit 'f6ff2be323812b5525a0755d194b2fc751ba5968':
Import revised translations. DO NOT MERGE
Merge commit '62ad899fa6edb7311eb4f6e0dc2da7e354ce359f'
* commit '62ad899fa6edb7311eb4f6e0dc2da7e354ce359f':
Only use FLAG_ACTIVITY_CLEAR_TOP on the search intent when from global search.
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 '2b3970a2956152a508254aa2675b68df363d46c1' into eclair-plus-aosp
* commit '2b3970a2956152a508254aa2675b68df363d46c1':
Only use FLAG_ACTIVITY_CLEAR_TOP on the search intent when from global search.
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 '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 '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 '8d51f7101d2427953dbff9b4b8f8c9fdc0dc4a91' into eclair-plus-aosp
* commit '8d51f7101d2427953dbff9b4b8f8c9fdc0dc4a91':
b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
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 '49fa9e00986993f5cf05f1092c30479cb98eb254' into eclair-plus-aosp
* 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.
Merge commit '6b07bf3d8f8f9b5124c19f1206e11634a774c356' into eclair-mr2-plus-aosp
* commit '6b07bf3d8f8f9b5124c19f1206e11634a774c356':
Expose PowerManager.isScreenOn in the public api.
Merge commit '3cba72880b78b81cda2868136462c9e261a3e403' into eclair-plus-aosp
* commit '3cba72880b78b81cda2868136462c9e261a3e403':
Expose PowerManager.isScreenOn in the public api.
Merge commit '3cba72880b78b81cda2868136462c9e261a3e403' into eclair-mr2
* commit '3cba72880b78b81cda2868136462c9e261a3e403':
Expose PowerManager.isScreenOn in the public api.
Merge commit '45011f2dc56e99c00bd1f3abff4f11d6df644d80' into eclair-plus-aosp
* commit '45011f2dc56e99c00bd1f3abff4f11d6df644d80':
do not merge -- original checkin to mr2 here:
https://android-git.corp.google.com/g/#change,30204
check for native initialization before calling public function
Added more checks where it is possible to call a native function
after creating a WebView but before the native side is initialized.
These cases can be triggered by the monkey.
Fixes http://b/issue?id=2187719
This change fixes a corner case where a callback may not get handled until
a second callback arrives. This can happen because there is a significant
section of the wait_for_event function where the mutex is not locked, and
the sPendingCallbacks member could be updated. We now check to see if
there is a pending callback to handle before we wait for another callback.
Change-Id: I20cfae1e780944bb74133940dda032efc4c55540
Signed-off-by: Fred Fettinger <fred.fettinger@motorola.com>
Signed-off-by: Jared Suttles <jared.suttles@motorola.com>
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '78e502df5163e8bcdd803af7f0a3958322a288dc'
* commit '78e502df5163e8bcdd803af7f0a3958322a288dc':
Fix SDK build: a few things missing, a link that was wrong.
Merge commit '892574f5f91b834f70ace880301db61f60d58362' into eclair-mr2-plus-aosp
* commit '892574f5f91b834f70ace880301db61f60d58362':
Fix SDK build: a few things missing, a link that was wrong.
Merge commit '13bf8260134d516cbcc982d360d9f21067f47fa6' into eclair-plus-aosp
* commit '13bf8260134d516cbcc982d360d9f21067f47fa6':
Fix SDK build: a few things missing, a link that was wrong.
Merge commit '13bf8260134d516cbcc982d360d9f21067f47fa6' into eclair-mr2
* commit '13bf8260134d516cbcc982d360d9f21067f47fa6':
Fix SDK build: a few things missing, a link that was wrong.
Merge commit '85fdfd0144c06dcef7652a8dd283f717cabe8759'
* commit '85fdfd0144c06dcef7652a8dd283f717cabe8759':
Fix issue #2243096: Need to expose live wallpaper APIs in SDK
Merge commit '237cc15c171511e8c8ffe903c5d6f473593477b8' into eclair-mr2-plus-aosp
* commit '237cc15c171511e8c8ffe903c5d6f473593477b8':
Fix issue #2243096: Need to expose live wallpaper APIs in SDK
