Merge commit 'f9b8e9018bf8ab012ec734262620d3274b2cd2ec'
* commit 'f9b8e9018bf8ab012ec734262620d3274b2cd2ec':
Fix a bug where we cleaned an apps external data when upgrading it. :(
Merge commit '3fb627525e077fa5452a99ac1e2a7e9c41995044' into gingerbread-plus-aosp
* commit '3fb627525e077fa5452a99ac1e2a7e9c41995044':
Fix a bug where we cleaned an apps external data when upgrading it. :(
Merge commit '392edec1162e9d00bcb66b271f43908f75d42ace' into gingerbread
* commit '392edec1162e9d00bcb66b271f43908f75d42ace':
Fix a bug where we cleaned an apps external data when upgrading it. :(
this should help developers figure out what various sqlite errors mean
and possibly programmatically handle them.
Change-Id: I5c313be1b17b6c5171929bf04e19a16ea92bb357
Merge commit '969907f3f59cf9420c3bd9d672b509196cf82cbe'
* commit '969907f3f59cf9420c3bd9d672b509196cf82cbe':
Make hasIccCard return true if RUIM card is present.
Merge commit 'f0fa8416e13b2885b858b6974b101c70833e4729' into gingerbread-plus-aosp
* commit 'f0fa8416e13b2885b858b6974b101c70833e4729':
Make hasIccCard return true if RUIM card is present.
The generator supports features that are not yet implement in the
renderer: color matrix, lighting, porterduff color blending and
composite shaders.
This change also adds support for repeated/mirrored non-power of 2
bitmap shaders.
Change-Id: I903a11a070c0eb9cc8850a60ef305751e5b47234
Merge commit '52075987c5726c95613f98571aac4c54e8319df4'
* commit '52075987c5726c95613f98571aac4c54e8319df4':
Fix a bug where we cleaned an apps external data when upgrading it. :(
Merge commit '31b5d5485f7336639d252da7ba979234dbd2f1e1' into gingerbread-plus-aosp
* commit '31b5d5485f7336639d252da7ba979234dbd2f1e1':
Fix a bug where we cleaned an apps external data when upgrading it. :(
Merge commit '571180c4c72e0bb4f930f8971edf000a652f10f6' into gingerbread-plus-aosp
* commit '571180c4c72e0bb4f930f8971edf000a652f10f6':
Attempt to fix the SDK build
On the assumption that the local min() function declaration is in
conflict with some 'min' #define floating around, rename the local
function to min_of().
Change-Id: I62aa27f213c6093cc78805de611cf4aa75f0eef2
Merge commit '6ec402b5ae33c8927694d8522b4cc6a5c8ba974e' into gingerbread-plus-aosp
* commit '6ec402b5ae33c8927694d8522b4cc6a5c8ba974e':
DO NOT MERGE: Fix input event injection ANRs on UI thread.
Added a new asynchronous injection mode and made the existing
synchronization mechanism more robust.
Change-Id: Ia4aa04fd9b75ea2461a844c5b7933c831c1027e6
Caveats:
- Ongoing and normal are lumped together
- Currently no limit on number of icons (should be 4)
- Still can't see the notifications in the panel
Change-Id: I83ac474db6ff290207d37747b672a1a56788a238
Added a new asynchronous injection mode and made the existing
synchronization mechanism more robust.
Change-Id: I0464f70ff5cbd519dbb02686b2cb5d810fe7dbb2
Adding support to allow video size to be different than the supported
picture sizes. A picture size larger than the demanded video size is
chosen. Captured pictures are then cropped to the size of the desired
video size. Cropping is done from the the center portion of the picture.
Change-Id: I6bcbe16f94b6ecbcf28b7f46826a81b4b6b8cbc3
YUVImage is a container class to hold YUV data and provide
various utilities, e.g. to set/get pixel values for different
YUV formats, fast copying routines, etc.
Currently supported YUV420 Planar and YUV420 Semi Planar.
YUVCanvas holds a reference to a YUVImage on which it can do various
drawing operations.
Change-Id: I052a57b7fbc834efe1626914f76c04c091996cac
Merge commit '6dea6f4e71b53e421564d783c227cbe0a2469183' into gingerbread-plus-aosp
* commit '6dea6f4e71b53e421564d783c227cbe0a2469183':
Squashed commit of the following:
Merge commit '16263d9f8cc01392c2f3678b381ce897647c8c81' into gingerbread
* commit '16263d9f8cc01392c2f3678b381ce897647c8c81':
Squashed commit of the following:
commit 4abf16bb04dc9695fedf4007a84f903074312ccd
Author: Andreas Huber <andih@google.com>
Date: Tue Jul 20 09:21:17 2010 -0700
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.
Change-Id: Icc790122744745e9a88099788d4818ca1e265a82
related-to-bug: 2826841
commit 09c74da63e6ad5cb5dafb70f62696d75d2978967
Author: James Dong <jdong@google.com>
Date: Sun Jul 18 17:57:01 2010 -0700
Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled.
Change-Id: I883c81dad3ea465e71cb5590e89d763671a90ff8
commit f672bf2a782dc7d5fb6325d611a7fe17045dfe9a
Author: James Dong <jdong@google.com>
Date: Thu Jul 8 20:56:13 2010 -0700
Enable the support for decoding audio with AAC+ and eAAC+ features
bug - 282684
Change-Id: I73c8377af3cc4edd3ee7cea86dc3b1c369fbd78b
Change-Id: I012f1179e933b6d1345d2368f357576c722485f7