Merge commit '20e7c267c8f8d2de8f121bbf20f5d34487f17997'
* commit '20e7c267c8f8d2de8f121bbf20f5d34487f17997':
Add WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR to indicate screen was turned off by the proximity sensor.
Merge commit '25bd4f29e1720d78d164c9749f786a2add6cafe9'
* commit '25bd4f29e1720d78d164c9749f786a2add6cafe9':
dealloc compiled-sql statements before deref'ing them from SQLiteDatabase obj.
Merge commit '20b213c7dd9d18d092a60ea176dd83cc29d6be80'
* commit '20b213c7dd9d18d092a60ea176dd83cc29d6be80':
Document that stopPreview is not needed before takePicture.
Merge commit '11a2853e0196905e25a2dc5c227320688e04e950' into eclair-mr2-plus-aosp
* commit '11a2853e0196905e25a2dc5c227320688e04e950':
Add support for Car Dock.
Merge commit '44000eb2a2340b1a47eaa587d4829810e04cbcdc' into eclair-mr2-plus-aosp
* commit '44000eb2a2340b1a47eaa587d4829810e04cbcdc':
Add WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR to indicate screen was turned off by the proximity sensor.
Merge commit '6d1ec0d81cd8ecdd390b31e724bac554bb955a94' into eclair-mr2-plus-aosp
* commit '6d1ec0d81cd8ecdd390b31e724bac554bb955a94':
dealloc compiled-sql statements before deref'ing them from SQLiteDatabase obj.
Merge commit '678c2e35768a5426b4ad8f67c836008e7751a353' into eclair-mr2
* commit '678c2e35768a5426b4ad8f67c836008e7751a353':
Add WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR to indicate screen was turned off by the proximity sensor.
Merge commit '963559ec0a2a8eaf118b4bbcedaa7274ef8909f2'
* commit '963559ec0a2a8eaf118b4bbcedaa7274ef8909f2':
Make RemoteViews also set the sourceBounds in the PendingIntent.
Merge commit 'dbed53504f515337ccc2f60248bb589dff0f24fb'
* commit 'dbed53504f515337ccc2f60248bb589dff0f24fb':
Add a new field to Intent that allows you to give a hint about what on screen caused the intent to
dealloc compiled-sql statements before removing references of SQLiteClosable objects from SQLiteDatabase obj. otherwise, code will attempt to close database before deallocing the compiled-sql statements and that causes sqlite exceptions.
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 '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 '949851525a1aebca0d7d6b9a3465d5e572c8c621'
* commit '949851525a1aebca0d7d6b9a3465d5e572c8c621':
Add WSP header to WAP_PUSH_RECEIVED intent in addition to data
Merge commit 'a0c9c173f1096a5a39fb9976c8736dbccb7b7d2f'
* commit 'a0c9c173f1096a5a39fb9976c8736dbccb7b7d2f':
Some work on issue #2286804: sometimes text field doesn't accept input
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 '1e8c96251ca885db700978a3566a67af27099b02'
* commit '1e8c96251ca885db700978a3566a67af27099b02':
In setDefaultSelection ensure that webkit is notified of the new selection.
Merge commit 'd5b325aaaca7e5197851d26332f48b917d961b9d' into eclair-mr2-plus-aosp
* commit 'd5b325aaaca7e5197851d26332f48b917d961b9d':
Add WSP header to WAP_PUSH_RECEIVED intent in addition to data
Merge commit '2d8b0c3f0fbc3c42063f4e790ca85b86c5d655f0' into eclair-mr2-plus-aosp
* commit '2d8b0c3f0fbc3c42063f4e790ca85b86c5d655f0':
Some work on issue #2286804: sometimes text field doesn't accept input
Merge commit '8693f82d02fd9b3a805e076fa1eafacd1737446d' into eclair-mr2
* commit '8693f82d02fd9b3a805e076fa1eafacd1737446d':
Some work on issue #2286804: sometimes text field doesn't accept input
1. PRIORITY_OFF is when user unchecks A2DP connection profile box.
2. By default, when you bond, it will be PRIORITY_ON.
3. When the profile gets connected, the priority gets set to
PRIORITY_AUTO_CONNECT. This means that we will connect
automatically to this profile.
4. When the user disconnects, we downgrade the priority to PRIORITY_ON,
which means we won't reconnect automatically.
a) We need to make a similar change to Handsfree profile.
b) We need to rework the profile management design and code which
will fix the 6 second timer that we have for A2DP reconnection.
Add AUTO_CONNECT priority for Headset profile.
Also, don't set priority to ON while disconnecting.
This logic has been pushed up to the Settings app.
Dr No: Eastham
Bug: 2133530
