Merge commit 'd94ed3794c68b93ac9faa357bb3517f4fae88162' into eclair-plus-aosp
* commit 'd94ed3794c68b93ac9faa357bb3517f4fae88162':
Fix bug 2242585 to unhide the new audio recording sources.
Merge commit 'b25cb21f59da53f138bc516a6047f55a2c412764'
* commit 'b25cb21f59da53f138bc516a6047f55a2c412764':
Prevent crash in Home when using widgets whose ids collide with Home's
Merge commit '4909b554782c1970bce11fb421b0a06664a25718'
* commit '4909b554782c1970bce11fb421b0a06664a25718':
Fix texture upload bug for narrow texture of less than 32bpp.
Merge commit 'cc2d3572e9cdcb8b9011b664d2e0247d9d7b8c96'
* commit 'cc2d3572e9cdcb8b9011b664d2e0247d9d7b8c96':
Add BMW kits made by Motorola PCS to autoblack list for Bluetooth.
Merge commit '8426319c5a5f4b6b7a1d5940e78d3fc717c36d98' into eclair-mr2-plus-aosp
* commit '8426319c5a5f4b6b7a1d5940e78d3fc717c36d98':
Prevent crash in Home when using widgets whose ids collide with Home's
Merge commit 'a8f2c2b428f5f261c7c95b6b19404b05f0b30762' into eclair-mr2-plus-aosp
* commit 'a8f2c2b428f5f261c7c95b6b19404b05f0b30762':
Fix texture upload bug for narrow texture of less than 32bpp.
Merge commit 'f53f86a743a91b4383e480dcf44a8e7b16ca7fa0' into eclair-mr2-plus-aosp
* commit 'f53f86a743a91b4383e480dcf44a8e7b16ca7fa0':
Add BMW kits made by Motorola PCS to autoblack list for Bluetooth.
Merge commit 'f20e9a88a36ced533e96b8873a3321b4d51585ca' into eclair-mr2
* commit 'f20e9a88a36ced533e96b8873a3321b4d51585ca':
Prevent crash in Home when using widgets whose ids collide with Home's
Merge commit 'f20e9a88a36ced533e96b8873a3321b4d51585ca' into eclair-plus-aosp
* commit 'f20e9a88a36ced533e96b8873a3321b4d51585ca':
Prevent crash in Home when using widgets whose ids collide with Home's
Merge commit '902051dfa7590f8b2c22eb0a46df80f1bf19a087' into eclair-mr2
* commit '902051dfa7590f8b2c22eb0a46df80f1bf19a087':
Fix texture upload bug for narrow texture of less than 32bpp.
Merge commit '8de4e0ad8ff39d9a397cd80de5155d4c09ef98fd' into eclair-mr2
* commit '8de4e0ad8ff39d9a397cd80de5155d4c09ef98fd':
Add BMW kits made by Motorola PCS to autoblack list for Bluetooth.
Merge commit '902051dfa7590f8b2c22eb0a46df80f1bf19a087' into eclair-plus-aosp
* commit '902051dfa7590f8b2c22eb0a46df80f1bf19a087':
Fix texture upload bug for narrow texture of less than 32bpp.
Merge commit '8de4e0ad8ff39d9a397cd80de5155d4c09ef98fd' into eclair-plus-aosp
* commit '8de4e0ad8ff39d9a397cd80de5155d4c09ef98fd':
Add BMW kits made by Motorola PCS to autoblack list for Bluetooth.
Merge commit '74b036577427ed6dca4b11540a32d676126231e3'
* commit '74b036577427ed6dca4b11540a32d676126231e3':
DO NOT MERGE: Squashed commit of the following:
Merge commit '9d216dfd5169be831f9e542e6225b132924918b1'
* commit '9d216dfd5169be831f9e542e6225b132924918b1':
Fix for 2221718: Hang in BatteryStatsService.noteBluetoothOn
Merge commit 'db8585402f6b4ca219d5d73735a11cee115f50b7'
* commit 'db8585402f6b4ca219d5d73735a11cee115f50b7':
Now that UseBuffer on this component is fixed, let's use it.
Merge commit 'c3c2f76682151c5051a02269b1990b6644a9074c'
* commit 'c3c2f76682151c5051a02269b1990b6644a9074c':
New live wallpaper API to expose author and description strings.
Merge commit '0fb041f364355c438eb7d508eb7fa7946418cd11'
* commit '0fb041f364355c438eb7d508eb7fa7946418cd11':
remove the SubscribedFeedsProvider since it has been moved to vendor/google
Merge commit 'e334ce27f1c936af54748c1312cfdeeb3eea7184' into eclair-mr2-plus-aosp
* commit 'e334ce27f1c936af54748c1312cfdeeb3eea7184':
DO NOT MERGE: Squashed commit of the following:
Merge commit '7b2aa74f4644979acea456e1047c96e17e09bc6d' into eclair-mr2-plus-aosp
* commit '7b2aa74f4644979acea456e1047c96e17e09bc6d':
Fix for 2221718: Hang in BatteryStatsService.noteBluetoothOn
Merge commit '2fe3e3a771c0ea78ca9d88ffa6739396d38d61a6' into eclair-mr2-plus-aosp
* commit '2fe3e3a771c0ea78ca9d88ffa6739396d38d61a6':
Now that UseBuffer on this component is fixed, let's use it.
Merge commit '1bca7612dfeb78bba91f3985fb6f3567daf13a57' into eclair-mr2-plus-aosp
* commit '1bca7612dfeb78bba91f3985fb6f3567daf13a57':
New live wallpaper API to expose author and description strings.
Merge commit '3266c5f125be34aae0f50e0e3397b14d9a603ad0' into eclair-mr2-plus-aosp
* commit '3266c5f125be34aae0f50e0e3397b14d9a603ad0':
remove the SubscribedFeedsProvider since it has been moved to vendor/google
Merge commit '05eca1d46a45723a57899dabad698537b7faef82' into eclair-mr2
* commit '05eca1d46a45723a57899dabad698537b7faef82':
DO NOT MERGE: Squashed commit of the following:
Merge commit '05eca1d46a45723a57899dabad698537b7faef82' into eclair-plus-aosp
* commit '05eca1d46a45723a57899dabad698537b7faef82':
DO NOT MERGE: Squashed commit of the following:
Merge commit '4ab2c7770c8e55072ee7a083fa84e318e07c8c3e' into eclair-mr2
* commit '4ab2c7770c8e55072ee7a083fa84e318e07c8c3e':
Fix for 2221718: Hang in BatteryStatsService.noteBluetoothOn
Merge commit '818a9cf827f282addbf7c8ee23534e08a3aaa358' into eclair-mr2
* commit '818a9cf827f282addbf7c8ee23534e08a3aaa358':
Now that UseBuffer on this component is fixed, let's use it.
Merge commit 'eca41b31fb9a5202f755bfd9dbc4849dbb486137' into eclair-mr2
* commit 'eca41b31fb9a5202f755bfd9dbc4849dbb486137':
New live wallpaper API to expose author and description strings.
Merge commit '4ab2c7770c8e55072ee7a083fa84e318e07c8c3e' into eclair-plus-aosp
* commit '4ab2c7770c8e55072ee7a083fa84e318e07c8c3e':
Fix for 2221718: Hang in BatteryStatsService.noteBluetoothOn
Merge commit '818a9cf827f282addbf7c8ee23534e08a3aaa358' into eclair-plus-aosp
* commit '818a9cf827f282addbf7c8ee23534e08a3aaa358':
Now that UseBuffer on this component is fixed, let's use it.
This is to prevent a noisy proximity sensor from causing the screen to turn on and off
in rapid succession, which can trigger race conditions in the keyguard manager.
Change-Id: I2c6e54e4b41716e038854ed9a827c901579c8865
Signed-off-by: Mike Lockwood <lockwood@android.com>
