Merge commit 'a46c138ab37e141f195d449f453dda8bd1df0947'
* commit 'a46c138ab37e141f195d449f453dda8bd1df0947':
Check for failure to create EGL surfaces and contexts.
Merge commit '5b2acbfcee2e424583ed69de5a94e6582b096d59'
* commit '5b2acbfcee2e424583ed69de5a94e6582b096d59':
Fix remaining object leaks. Change FountainView to tear down the rsContext and recreate on rotation to test teardown.
Merge commit 'b1d9ee626694e06196b5fc7f7ea5eb99ea998eb0'
* commit 'b1d9ee626694e06196b5fc7f7ea5eb99ea998eb0':
Use EGLUtils to simplify choosing a configuration.
Merge commit '9a9b97d3a98cff6f2a9a5bd590c113c79f3fc7c9'
* commit '9a9b97d3a98cff6f2a9a5bd590c113c79f3fc7c9':
Allow us to set the contact uri without setting the fast track's uri
Merge commit 'abd4d965db17d8e77119da5246d5a9c367ae9c58'
* commit 'abd4d965db17d8e77119da5246d5a9c367ae9c58':
add a optional String to the key of notifications to allow users
Merge commit 'f6252635870e83abe461943ac293a8b0b1453998'
* commit 'f6252635870e83abe461943ac293a8b0b1453998':
Improve renderscript context teardown. Track object in the system and then force their cleanup by releasing all user references once destroy context is called. Java layer will no longer send destroy notifications for objects garbage collected once a context is destroyed.
Merge commit 'd7168c6b12b325be5d91ddee0c1b6de092727ec1'
* commit 'd7168c6b12b325be5d91ddee0c1b6de092727ec1':
Use reflection to figure out a readable string from install error code.
Merge commit 'be3abd73346206d7e3aeaae54a9bcace3b5f8ee8'
* commit 'be3abd73346206d7e3aeaae54a9bcace3b5f8ee8':
If WebCore doesn't response touch down in time, don't
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.
