Merge commit '29e25bd3418b04e395119bf99abe92898830a796' into gingerbread-plus-aosp
* commit '29e25bd3418b04e395119bf99abe92898830a796':
Only print out wake locks in the if the wakelock was held.
Merge commit '3c1363beec9c142c062d8704b8bef4230b42eae5' into gingerbread-plus-aosp
* commit '3c1363beec9c142c062d8704b8bef4230b42eae5':
COMMENT ONLY change to add some warnings about ParcelFileDescriptor
Merge commit '60a200617791cf4dd3660c514ac6bf17dfcb85de' into gingerbread-plus-aosp
* commit '60a200617791cf4dd3660c514ac6bf17dfcb85de':
docs: add information about using color resources as drawables
Merge commit '2f0dc6d9f50ceece294e9db393583e655d3bf781' into gingerbread
* commit '2f0dc6d9f50ceece294e9db393583e655d3bf781':
COMMENT ONLY change to add some warnings about ParcelFileDescriptor
Merge commit 'fb1c0fe7fda72c29ac333f0f7d18c36d797a7a4a' into gingerbread-plus-aosp
* commit 'fb1c0fe7fda72c29ac333f0f7d18c36d797a7a4a':
COMMENT-ONLY change to clarify Camera documentation.
Merge commit '2316d6260862230af10d8ca3ff446ad3f560f712' into gingerbread
* commit '2316d6260862230af10d8ca3ff446ad3f560f712':
docs: add information about using color resources as drawables
Merge commit 'cc14a8393b92cd1ed6cba74829396045605ab211' into gingerbread-plus-aosp
* commit 'cc14a8393b92cd1ed6cba74829396045605ab211':
Support a single format change at the beginning of audio playback. This way the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we'll still play it back correctly.
Added methods for audio effects management by audio policy manager.
- control of total CPU load and memory used by effect engines
- selection of output stream for global effects
- added audio session id in parameter list for startOutput() and stopOutput().
this is not used in default audio policy manager implementation.
Modifications of audio effect framework in AudioFlinger to allow moving and reconfiguring
effect engines from one output mixer thread to another when audio tracks in the same session
are moved or when requested by audio policy manager.
Also fixed mutex deadlock problem with effect chains locks.
Change-Id: Ida43484b06e9b890d6b9e53c13958d042720ebdb
Merge commit 'faf1d46a60518fcc3e58c91740e673e8a3f2d3cc' into gingerbread-plus-aosp
* commit 'faf1d46a60518fcc3e58c91740e673e8a3f2d3cc':
Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled.
Merge commit 'ff7049ab2886acc73e145367118646f7741ce333' into gingerbread-plus-aosp
* commit 'ff7049ab2886acc73e145367118646f7741ce333':
Remove some debug logging that I accidentally committed.
If window was destroyed when touch was pressed this destroyed
window was still considered as a target for motion events.
In some cases this could result with hang up inside event dispatch procedure.
Change-Id: I2ede17a40b14b2f509ab3d2560abb65292324f45
Merge commit 'f23682f128151def4d83d3e2422aea36e0a00061' into gingerbread-plus-aosp
* commit 'f23682f128151def4d83d3e2422aea36e0a00061':
fixed parsing issue in BluetoothService so that it parses the UUID property correctly
Merge commit '80e62ac61c297452c003919f71c4dcd7063d1b43' into gingerbread-plus-aosp
* commit '80e62ac61c297452c003919f71c4dcd7063d1b43':
Fix the layoutlib Paint.set(Paint) method. Do not merge.
It would change the text rendering info but not recompute
the Java Font objects. The effect is a broken font rendering
in the EditText (which use this method to copy some Paint
object before using the copy for the actual drawing)
Change-Id: I9e7fbf9bd57b421fd793876a6de4ade1ecac372d
