Merge commit '7b1a2079227cd93d1d92088fed0df2351705cbe4'
* commit '7b1a2079227cd93d1d92088fed0df2351705cbe4':
Fixed a Documentation Error in the AsyncTask Contstructor
Merge commit 'f079a659774473324b5739652c014229189a10ff'
* commit 'f079a659774473324b5739652c014229189a10ff':
Fix hang when error in SIM card communication
Merge commit '523959f50e56d8c888f39e19855ffdc8d0c2b6fc'
* commit '523959f50e56d8c888f39e19855ffdc8d0c2b6fc':
Deprecate some status bar icons that now come from the phone app (and
Merge commit 'd1af902c21b4911b964c82ced3d80fcf9ab41540' into gingerbread-plus-aosp
* commit 'd1af902c21b4911b964c82ced3d80fcf9ab41540':
Deprecate some status bar icons that now come from the phone app (and
Merge commit 'ceb8465e974ba5fa971ffe1b5b74e94a1bd53f97'
* commit 'ceb8465e974ba5fa971ffe1b5b74e94a1bd53f97':
Tweak ObbFile class
Allow things that can install packages to set Obb paths
Merge commit '87bb18579a5eea2e24af78af8c0f54f5455ce8fd' into gingerbread-plus-aosp
* commit '87bb18579a5eea2e24af78af8c0f54f5455ce8fd':
Tweak ObbFile class
Allow things that can install packages to set Obb paths
* Move error messages around to clarify the errors.
* Add extra error check when reading a file.
* Seek to the end of a file when writing the signature so the users of
the API don't have to remember to do it.
Change-Id: I2337051b9f9fa8147c5900237deec790dcd92436
Merge commit 'bbf0bde5d8311f84b6f0a8d018d78a78429602b7'
* commit 'bbf0bde5d8311f84b6f0a8d018d78a78429602b7':
Make a stupid thing about the glue less stupid.
Merge commit 'faccac7616795859af257777900db514d425a106' into gingerbread-plus-aosp
* commit 'faccac7616795859af257777900db514d425a106':
Make a stupid thing about the glue less stupid.
Merge commit 'b14f325a0118ffce286155caaabaae149653462c'
* commit 'b14f325a0118ffce286155caaabaae149653462c':
Add ANativeWindow API for directly drawing to the surface bits.
Merge commit '289b9b62372ef52a06113b83dfb870e2c2fb325a' into gingerbread-plus-aosp
* commit '289b9b62372ef52a06113b83dfb870e2c2fb325a':
Add ANativeWindow API for directly drawing to the surface bits.
Also other cleanup and fixes:
- We now properly set the default window format to 565.
- New APIs to set the window format and flags from native code.
- Tweaked glue for simpler handling of the "destroy" message.
- Um, other stuff.
Change-Id: Id7790a21a2fa9a19b91854d225324a7c1e7c6ade
Merge commit '0260887ca78330b8dd7009d91859925df94a69d6'
* commit '0260887ca78330b8dd7009d91859925df94a69d6':
Improved logging when there's an error creating the directories in getFilesDir()
Merge commit '3dbbf2dc21dae3ac3a157fa7b83eee12201d6270'
* commit '3dbbf2dc21dae3ac3a157fa7b83eee12201d6270':
Fix send/receive MMS while the phone's state isn't in IDLE and the Network type can support voice and data calls concurrently
Merge commit 'd321e8d6882485203b159b224d49247707bdd5aa'
* commit 'd321e8d6882485203b159b224d49247707bdd5aa':
Remove some (unused, non-public) phone-related status bar notification icons
