Merge commit 'dba93b68326f139f669aefa6770d50daff032746' into eclair-plus-aosp
* commit 'dba93b68326f139f669aefa6770d50daff032746':
Check that playlist entries refer to a row in the audio table.
Merge commit 'e883847f177665102ebc6b2369dbfbfd1e79cf62' into eclair-plus-aosp
* commit 'e883847f177665102ebc6b2369dbfbfd1e79cf62':
Add documentation about flash and change video-light to torch.
Merge commit '960972d465d6890d51c73fc08dda7fb17825ce7f' into eclair-plus-aosp
* commit '960972d465d6890d51c73fc08dda7fb17825ce7f':
Allways dump the list of allocated buffers when an allocation fails.
Merge commit '41c64ba73cf4dbc14beeaaa618afdd908da8b0cb' into eclair-plus-aosp
* commit '41c64ba73cf4dbc14beeaaa618afdd908da8b0cb':
Improve logging code to dump more detaild rs object info. Fix bug with predefined elements not being recreated for contexts after one was destroyed. Add stricter type enforcement.
* changes:
Improve logging code to dump more detaild rs object info. Fix bug with predefined elements not being recreated for contexts after one was destroyed. Add stricter type enforcement.
Merge commit '4b35d699e1ebd8f3d25b8300ff9c3923547f14d0' into eclair-plus-aosp
* commit '4b35d699e1ebd8f3d25b8300ff9c3923547f14d0':
Don't back up / restore "allow apps from unknown sources"
Merge commit 'd021ea27cea0ea14ad0e0295eaa51c94e92946fc' into eclair-plus-aosp
* commit 'd021ea27cea0ea14ad0e0295eaa51c94e92946fc':
Modified the test case name for the browser page load test.
Merge commit '5fbbdf2a21e5d41a3eaaa7122f4a46d30f81f7f7' into eclair-plus-aosp
* commit '5fbbdf2a21e5d41a3eaaa7122f4a46d30f81f7f7':
Don't forget to clear "backup in progress" state when finishing a pass
We no longer back up the state of the "Allow the installation of applications
from unknown sources" setting, nor do we set that based on restore data even if
it is present.
Change-Id: Ida276874616f1ff82807d642b0b733fcab339529
If a backup pass had been skipped (either because the transport was unavailable
or -- in a common case! -- because there was simply no work pending when the
periodic backup check fired), we were forgetting to reset the "backup currently
in progress" flag. Once we'd done that, the device would *NEVER* perform a
backup until it was rebooted, since it would forever think that there was one
currently in operation that must not be interfered with.
Change-Id: I0d6d7375dc6de99b599222a449934e70fe13ebb9
We dropped an onTrySetupData call because onEnableNewApn calls that automatically on GSM,
but CDMA was not doing anything. Made CDMA simply call onTrySetupData.
Also, isApnTypeActive for CDMA was returning true even when no data was working. Changed
to report true when initing or connected, like GSM.
Merge commit 'fbb7263121923cd30d52ac4a35c4309b0a618ddb' into eclair-plus-aosp
* commit 'fbb7263121923cd30d52ac4a35c4309b0a618ddb':
add new column "real_date" for IM messages table.
Check the delta for short press case as we may switch to
PREVENT_DRAG_NO at SWITCH_TO_SHORTPRESS.
This should fix another two corner cases where flick doesn't
do anything.
Merge commit '6a07f9fbe9f270795d3338415ca03a3333ec50e3' into eclair-plus-aosp
* commit '6a07f9fbe9f270795d3338415ca03a3333ec50e3':
bug 2148061: if PduBody is zero length, treat it as an empty message.
Merge commit 'ac939d086c42afeaef0982cee0e5861184dd82eb' into eclair-plus-aosp
* commit 'ac939d086c42afeaef0982cee0e5861184dd82eb':
Fix issue #2148939: Sholes slow to wake up in landscape mode
Merge commit 'cc96652c7049569c1bc7b1f93ba454a7cb891fd8' into eclair-plus-aosp
* commit 'cc96652c7049569c1bc7b1f93ba454a7cb891fd8':
Remove fflush when storing thumbanil to sdcard.
This was introduced when I did the fading of the lock screen,
which relies on setting the policy visibility of the windows behind
it to be hidden. As a result, when the orientation changed or
the activity was restarted, they wouldn't be resized or reported
as drawn, and the activity manager would wait until its timeout
before unfreezing the screen.
We now have a new method on WindowState to find out if a window
has drawn itself, which is used in the appropriate places.
Change-Id: If05f8b1947d3029917f62ad0f89b43544bd0a4dc
Merge commit '94bbfa47b043c50e10e6558e461d018b7d13bb5d' into eclair-plus-aosp
* commit '94bbfa47b043c50e10e6558e461d018b7d13bb5d':
Handle expiration of discovery mode in system server.
Also trigger low battery when battery reaches the specified level
rather than when it drops below the level.
Fixes bug b/1788656
Change-Id: I81f5cbb9892fc6574320d92e153211f83c69f415
Signed-off-by: Mike Lockwood <lockwood@android.com>
