Merge commit '3f442ece257d416b48f7803a4cc263f0215faa0d' into gingerbread-plus-aosp
* commit '3f442ece257d416b48f7803a4cc263f0215faa0d':
Fix character count bug and Javadoc typos in SMS (with test cases)
- Now track wake locks in battery history.
- Now track sensors in battery history.
- Some filtering of sensory data.
- Fixes to some data that wasn't cleared when resetting battery stats.
- Print amount discharged since last charge.
And the big part -- keep track of wake locks held per process,
and kill processes that hold wake locks too much while they are in
the background. This includes information in the battery stats
about the process being killed, which will be available to the
developer if the app is reported.
Change-Id: I97202e94d00aafe0526ba2db74a03212e7539c54
Merge commit '4f170821678099010ec593d2b5a081e0f8adf92d' into gingerbread-plus-aosp
* commit '4f170821678099010ec593d2b5a081e0f8adf92d':
Fix typo and bug in CTS test class.
Merge commit '0a6bfe2ae21f19adf65d8b8a18c530d94ea4e543' into gingerbread-plus-aosp
* commit '0a6bfe2ae21f19adf65d8b8a18c530d94ea4e543':
Add --max-res-version flag to aapt.
Merge commit '2abde6e0ddaed3d2d60bad984a2adc3acbb8164c' into gingerbread
* commit '2abde6e0ddaed3d2d60bad984a2adc3acbb8164c':
Add --max-res-version flag to aapt.
Merge commit '7525c2cfbbaa5c947c029008ef490e93a50c064f' into gingerbread-plus-aosp
* commit '7525c2cfbbaa5c947c029008ef490e93a50c064f':
Add --max-res-version flag to aapt.
Merge commit '1e4aa48cfd2b2c13c4f7ace8c9fcb33adfa18661' into gingerbread-plus-aosp
* commit '1e4aa48cfd2b2c13c4f7ace8c9fcb33adfa18661':
fix [2912927] Can't get NV_draw_path extension to work
aapt will ignore any versioned resource directories over the
specified version (if used). e.g. --max-res-version=6 will
cause layout-land-v7 to be ignored.
Merged from froyo.
Change-Id: Ia4eabae535b95b75d18b0c83135d44ed9a95b9eb
aapt will ignore any versioned resource directories over the
specified version (if used). e.g. --max-res-version=6 will
cause layout-land-v7 to be ignored.
Merged from eclair.
Change-Id: I40ccf820c8a6e3074fccc987dd60a511dd8eb0de
Fix a character count bug I discovered while working on related SMS
bugs. Includes a new set of test cases to verify the fix for the
buggy calculateLength() methods ("runtest frameworks-telephony").
You can also verify that the counter works properly in the Mms app
by typing characters until the boundary is crossed where an
additional message part is required. The counter should count down
to 0 characters remaining before increasing the message count.
Change-Id: I4de68b82dfc53dcae094865798f2c0235a355d43
When the driver was configured to run with power save mode disabled the
power save mode incorrectly got reverted back to AUTO mode right after
DHCP response. The power save mode value is now saved so that the device
properly reverts back to a previous mode after DHCP response.
Change-Id: Ie68cd107872d233bf422e24130a1eb9f6432db91
Bug: 2834260
Merge commit 'c8d0d6307fc5cdd24083113456ac33790a5fb94a' into gingerbread-plus-aosp
* commit 'c8d0d6307fc5cdd24083113456ac33790a5fb94a':
Fix issue 2909189: System property ro.audio.silent no longer mutes system.
Merge commit 'e95d192fae5a80ed821c53bfea214a85ea395e90' into gingerbread-plus-aosp
* commit 'e95d192fae5a80ed821c53bfea214a85ea395e90':
Mainly fix two mistakes that I made:
Merge commit '5f96138ba65cecf38d0c752d87ad47d931db8775' into gingerbread-plus-aosp
* commit '5f96138ba65cecf38d0c752d87ad47d931db8775':
Support getting codec, width, and height in URL for gtalk playback.
1. When the ERROR_END_OF_STREAM is returned from read, the input buffer is not initialized
release it would lead to crash
2. The mPrevTimestampUs is not initialized and thus fail in the CHECK(mPrevTimestampUs, timeUs)
Change-Id: Id1e51575fb8b3ca48e80547efd3a3a82dfac773b
Merge commit 'b7d1be01ae44428b947823fc48c1c126dcaa9732' into gingerbread-plus-aosp
* commit 'b7d1be01ae44428b947823fc48c1c126dcaa9732':
Fix a couple issues with the new hwcomposer HAL
- we now clear the framebuffer upon request from the HAL
- the HAL list size could get out of sync with reality
- there was also an issue where sometime we could run past the list
Change-Id: Ic3a34314aed24181f2d8cc787096af83c046ef27
Merge commit 'd790c6485a388a3e8045dbd18b903b20a7dcf0d9' into gingerbread-plus-aosp
* commit 'd790c6485a388a3e8045dbd18b903b20a7dcf0d9':
Add lost preview surface detection in the JNI layer
Merge commit 'ae3a1f45951aeb716e1f6b9a99a09838eb55dab4' into gingerbread-plus-aosp
* commit 'ae3a1f45951aeb716e1f6b9a99a09838eb55dab4':
Fix the h.263 assembler to properly subset a buffer's range if it already has a range applied.
Merge commit '66aa0f3d950f7f842327b47592baa920e855925c' into gingerbread-plus-aosp
* commit '66aa0f3d950f7f842327b47592baa920e855925c':
APacketSource is too verbose.
Merge commit '708ec39c21568e0c2aa3d20c681f0e14ee6134ad' into gingerbread-plus-aosp
* commit '708ec39c21568e0c2aa3d20c681f0e14ee6134ad':
Don't send late frames to software encoders for encoding
