OSDN Git Service

(root) / android-x86 / frameworks-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2f0dc6d) | patch
Fix a merge problem with html mms
authorTom Taylor <tomtaylor@google.com>
Wed, 21 Jul 2010 17:49:48 +0000 (10:49 -0700)
committerTom Taylor <tomtaylor@google.com>
Wed, 21 Jul 2010 17:49:48 +0000 (10:49 -0700)
commitdbac180d8342a7db2bb9994f937869eecb6b50ff
tree76d31c2ef9d9adcae2af8244ac378efbefc7e46atree | snapshot
parent2f0dc6d9f50ceece294e9db393583e655d3bf781commit | diff
Fix a merge problem with html mms

Html mms message support was added back in Jan '10. At that time, we
had moved the mms code out of the framework into the mms app. We decided
to back out that change and leave the mms code in its original place.
As a result, the changes to support html messages were lost. This
handmerged CL restores those changes. I'll cherry-pick this into master
as well. Bug 2858888

Change-Id: Icf8835edc8ac396698c167be5433a6fe1cfe6103
core/java/com/google/android/mms/ContentType.java diff | blob | history
core/java/com/google/android/mms/pdu/PduParser.java diff | blob | history
core/java/com/google/android/mms/pdu/PduPersister.java diff | blob | history
frameworks/base
About OSDN
Find Software
Develop Software
Help