1) Add the include path for jni.h.
2) Rename InitCheck() and read_at() to initCheck() and readAt(),
repectively in StreamSource, as done in DataSource.
3) Add back the definition of SkJPEGImageDecoder to jpeg_decoder_bench.cpp.
Need to do so because SkJPEGImageDecoder is not defined in a header file.
Part of a fix for bug b/2300622 (Proximity sensor always blows up the lock screen while in call)
Change-Id: I9ef888638b19540a78a34507d52ff522f505102f
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '64fc80823e1e954a419bdcb0a193e4c56a8da959' into eclair-mr2-plus-aosp
* commit '64fc80823e1e954a419bdcb0a193e4c56a8da959':
Document that stopPreview is not needed before takePicture.
Merge commit '40057ce749c8c4d274db0352a2af4344bda92dba' into eclair-mr2
* commit '40057ce749c8c4d274db0352a2af4344bda92dba':
Document that stopPreview is not needed before takePicture.
Merge commit 'a8974b637c384d10bac10d94fae7487afdb2c16d' into eclair-mr2-plus-aosp
* commit 'a8974b637c384d10bac10d94fae7487afdb2c16d':
Make the notification panel send the position as well.
Merge commit '19a4157ce40f4ab77b60445b8e73069c5877bb8a' into eclair-mr2
* commit '19a4157ce40f4ab77b60445b8e73069c5877bb8a':
Make the notification panel send the position as well.
Merge commit '6c5401d8b780d324afb784d4c0fba69cee4a6a9a' into eclair-mr2-plus-aosp
* commit '6c5401d8b780d324afb784d4c0fba69cee4a6a9a':
Make RemoteViews also set the sourceBounds in the PendingIntent.
Merge commit 'b28632a5206d11844db39ca1ab5f64a99ec74e29' into eclair-mr2-plus-aosp
* commit 'b28632a5206d11844db39ca1ab5f64a99ec74e29':
Add a new field to Intent that allows you to give a hint about what on screen caused the intent to
Merge commit '7597065d6b0877ffc460b443fdb1595965ccd7b2' into eclair-mr2
* commit '7597065d6b0877ffc460b443fdb1595965ccd7b2':
Make RemoteViews also set the sourceBounds in the PendingIntent.
Merge commit 'c7a63eea8d3d346addaaf892b5bbe0aa80651640' into eclair-mr2
* commit 'c7a63eea8d3d346addaaf892b5bbe0aa80651640':
Add a new field to Intent that allows you to give a hint about what on screen caused the intent to
Merge commit '2b3509c9a5d6f3a7142430cd0b81d135a9c0a5df' into eclair-mr2-plus-aosp
* commit '2b3509c9a5d6f3a7142430cd0b81d135a9c0a5df':
the vertex index should be "first + i".
Merge commit '1b04daf92b2f76da532c35e92eaa9ed2a9663d36' into eclair-mr2-plus-aosp
* commit '1b04daf92b2f76da532c35e92eaa9ed2a9663d36':
Fix bug 2216426: correct the hdpi star assets for RatingBar.
Merge commit 'de5343290c4bac9b10b6fdd328b70da6f5e4d626' into eclair-mr2
* commit 'de5343290c4bac9b10b6fdd328b70da6f5e4d626':
Fix bug 2216426: correct the hdpi star assets for RatingBar.
Merge commit '26fd38401132ac13cf0c465bcfde27aa3ae989b5'
* commit '26fd38401132ac13cf0c465bcfde27aa3ae989b5':
Add support for extracting render time and image in page cycler
Merge commit '949851525a1aebca0d7d6b9a3465d5e572c8c621'
* commit '949851525a1aebca0d7d6b9a3465d5e572c8c621':
Add WSP header to WAP_PUSH_RECEIVED intent in addition to data
Merge commit '5d2a7b26d6bb06f71904ecd7c828ae90d79b27ef'
* commit '5d2a7b26d6bb06f71904ecd7c828ae90d79b27ef':
Add DoCoMo vendor specific OMNA WSP content type number
Merge commit '2aa107917b5a7e6de720a34c4701de55ee9772eb'
* commit '2aa107917b5a7e6de720a34c4701de55ee9772eb':
fix [2291418] Camera preview cannot work in Emulator
Merge commit 'a0c9c173f1096a5a39fb9976c8736dbccb7b7d2f'
* commit 'a0c9c173f1096a5a39fb9976c8736dbccb7b7d2f':
Some work on issue #2286804: sometimes text field doesn't accept input
Merge commit 'fafa98e51bea0fd9c0f48fe31d54b663db18fe86'
* commit 'fafa98e51bea0fd9c0f48fe31d54b663db18fe86':
Add a new priority for Auto Connection of A2DP. DO NOT MERGE.
Merge commit 'da5a110b8aae83cab96c3f77da95f8f85cc0e0d5'
* commit 'da5a110b8aae83cab96c3f77da95f8f85cc0e0d5':
add screenshots for the Bluetooth Chat sample app
Merge commit 'a7493240ab97013458b2dbe16fcd27fb6e85c0af'
* commit 'a7493240ab97013458b2dbe16fcd27fb6e85c0af':
Telephony: Fix exception if PROPERTY_OPERATOR_NUMERIC is not set
Merge commit 'b2c13d7c8e616d5680260e128b2c31021a160add'
* commit 'b2c13d7c8e616d5680260e128b2c31021a160add':
When passing the Message for saved form data, pass the node pointer properly.
Merge commit '74f7b139d0e380969268f44d5358db08e0325394'
* commit '74f7b139d0e380969268f44d5358db08e0325394':
remove accounts for authenticators that are uninstalled
Merge commit '52d390e8892967c1fad717a00731c0a25e268686'
* commit '52d390e8892967c1fad717a00731c0a25e268686':
Fix issue 2292062: Audio freezes for three seconds when choosing ringtones with a headset connected and music playing.
Merge commit '1e8c96251ca885db700978a3566a67af27099b02'
* commit '1e8c96251ca885db700978a3566a67af27099b02':
In setDefaultSelection ensure that webkit is notified of the new selection.
Merge commit 'cb6203cdcbfbcb0c2909964b9173d0a873f086c4'
* commit 'cb6203cdcbfbcb0c2909964b9173d0a873f086c4':
DATE_TAKEN should be in millisecond instead of second.
