summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-04-30Merge "Can not download empty text file received in MMS"android-l-preview_r2l-previewidea133-weekly-releaseTom Taylor
2014-04-29Merge "Release PduPersister if need to create a new one"Tom Taylor
2014-04-29Can not download empty text file received in MMSBin Yang
When the content of mms is empty,there will be a Nullpointer Exception, so User can't download the mms.Fix the null pointer when mms is empty. Change-Id: I3b2c71133f897daa5723f2b838f05b0e66ba1c36 Signed-off-by: Bin Yang <bin.y.yang@intel.com>
2014-04-21Release PduPersister if need to create a new oneRoger Chen
Change-Id: I6bc0f49db70a205c03ee35d39694ca0c99a86451 Signed-off-by: Roger Chen <cxr514033970@gmail.com>
2013-08-21am 7d177dd3: Merge "mms: also load group message recipients from CC field"idea133Tom Taylor
* commit '7d177dd3cb42c3246478abcc2bf69200e1d59fe6': mms: also load group message recipients from CC field
2013-08-21Merge "mms: also load group message recipients from CC field"tools_r22.2Tom Taylor
2013-08-20mms: also load group message recipients from CC fieldChristian Gaetano
If group messaging is enabled by the user, the messaging framework should also try to load any numbers in the CC PduHeader. Some devices initiate group messaging by populating this field with the group members' phone numbers, and they only place the first number in the TO header. This should solve threading issues with these devices. loadRecipients() will handle the CC field correctly if it is null. Signed-off-by: Christian Gaetano <cgatno@gmail.com> Change-Id: I955bb0912356f4d8fb648acd2bd9e6bba21c9a82
2013-07-30am 848b54ae: Merge "Support MMS with empty subject"android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4w_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1kitkat-wearkitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-devTom Taylor
* commit '848b54ae56cb8fa8264f65365db65dc7f1921f81': Support MMS with empty subject
2013-07-30Merge "Support MMS with empty subject"Tom Taylor
2013-07-30Support MMS with empty subjectAnson Zhang
Phones fail to receive MMS messages that have empty subject. There are operators who report this as an issue. Change-Id: I553e4d6524638d12290d2c2f0c4640b261eeddf5
2013-03-11am 109111fd: (-s ours) am 1d5c4afa: am 6fdb2a11: am 76b14915: (-s ours) am ↵Jean-Baptiste Queru
61c0f4fa: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '109111fd8b6c3bacf51afb61fa5fadc8ad8fe428':
2013-03-11am 1d5c4afa: am 6fdb2a11: am 76b14915: (-s ours) am 61c0f4fa: (-s ours) ↵android-4.3_r3.1android-4.3_r3android-4.3.1_r1jb-mr2.0.0-releasejb-mr2-devJean-Baptiste Queru
Reconcile with jb-mr1-release - do not merge * commit '1d5c4afa91fb2b15402a0e57f98d4b00e0a9cfc5':
2013-03-11am 6fdb2a11: am 76b14915: (-s ours) am 61c0f4fa: (-s ours) Reconcile with ↵Jean-Baptiste Queru
jb-mr1-release - do not merge * commit '6fdb2a116c95a51953cf2203b8af0ac84cbeb2b2':
2013-03-11am 76b14915: (-s ours) am 61c0f4fa: (-s ours) Reconcile with jb-mr1-release ↵jb-mr1.1-devJean-Baptiste Queru
- do not merge * commit '76b149158bebe5ae8259d1db497fc38b5c5ef37b':
2013-03-11am 61c0f4fa: (-s ours) Reconcile with jb-mr1-release - do not mergeJean-Baptiste Queru
* commit '61c0f4fa6f2e3049018f70706227cc256a529801':
2013-03-11Reconcile with jb-mr1-release - do not mergejb-mr1-devJean-Baptiste Queru
2013-02-20Close stream when finishedandroid-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9jb-mr2.0-releasejb-mr2-releaseTom Taylor
While investigating bug 8214355, I found that the mms framework code wasn't closing a stream. This was causing a warning and much log spew. Change-Id: I9a6670f07092fbae969857b2f255d87466e780c7
2012-11-06am 4caf0ebe: (-s ours) am 188bd32c: Reconcile with jb-mr1-factory-release ↵The Android Open Source Project
jb-mr1-release - do not merge * commit '4caf0ebebbdd7514f4c12ae14b4cc537d504f20e':
2012-11-06am 188bd32c: Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergetools_r22jb-mr1.1-dev-plus-aospjb-mr1-dev-plus-aospThe Android Open Source Project
* commit '188bd32cb36757ca2a007b66becdaf31abed41af':
2012-11-06Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeandroid-cts-4.2_r2The Android Open Source Project
Change-Id: I87313b00fc7435d079f0270cf0140dd57436e67a
2012-10-31am 20a08cc9: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project
* commit '20a08cc9916a2a65a557f533a6bdc2878b1bddef':
2012-10-31Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project
Change-Id: Id17039f77e0e3a14fcca640bdeb65b24640b14b0
2012-10-23merge in jb-mr1-release history after reset to jb-mr1-devandroid-cts-4.2_r1android-4.2_r1android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1jb-mr1.1-releasejb-mr1-releaseThe Android Automerger
2012-10-23am b7c14d3c: am 4c80e1ad: Crash trying to save a draft with a picture from ↵Tom Taylor
the gallery * commit 'b7c14d3c7a9df13f3e37db90ccf89cf713fd09f5': Crash trying to save a draft with a picture from the gallery
2012-10-23am 4c80e1ad: Crash trying to save a draft with a picture from the galleryTom Taylor
* commit '4c80e1addeee093e0b9e7ad6f918cdcda92f6c3b': Crash trying to save a draft with a picture from the gallery
2012-10-22Crash trying to save a draft with a picture from the galleryandroid-sdk-support_r11Tom Taylor
Bug 7374081 Change the persister api's to accept a HashMap of opened inputStreams for the parts. The inputStreams are opened on the UI thread, but the actual persisting takes place on a non-UI thread. Change-Id: I5b886b8d12dd06f2a9e63232f7f7560815338673
2012-10-17merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger
2012-10-17am 1f6dc6d4: am 34d50cb7: Empty draft created on deleting a group MMS messageTom Taylor
* commit '1f6dc6d4e51431c8c825753bcfdef4d001dc99a2': Empty draft created on deleting a group MMS message
2012-10-17am 34d50cb7: Empty draft created on deleting a group MMS messageTom Taylor
* commit '34d50cb71769cc37fd733722ca2891bf9e364da6': Empty draft created on deleting a group MMS message
2012-10-17Empty draft created on deleting a group MMS messageTom Taylor
Bug 7360609 Don't create a pdu row with a NULL thread id. Use zero. Change-Id: I332a3cfd1c95dcc7bdfe581cdccbf97dbc4aa8de
2012-10-15am 9155fe81: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release ↵The Android Open Source Project
- do not merge * commit '9155fe81a9844b78f90f340dad36c106768aae6b':
2012-10-15Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project
Change-Id: Iaffda05bc8f285a7b4fdb8477608f228a42733f6
2012-10-12am ee2a5e9d: am e1f17ce8: MMS creates a new thread when receiver is not in ↵Tom Taylor
the Message thread * commit 'ee2a5e9d14a0f1d02037c18a7c07f87b308b2cae': MMS creates a new thread when receiver is not in the Message thread
2012-10-12am e1f17ce8: MMS creates a new thread when receiver is not in the Message threadTom Taylor
* commit 'e1f17ce8cd1f968b1273938a05ef9237862827d4': MMS creates a new thread when receiver is not in the Message thread
2012-10-12merge in jb-mr1-factory-release history after reset to jb-mr1-devThe Android Automerger
2012-10-12merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger
2012-10-11MMS creates a new thread when receiver is not in the Message threadTom Taylor
Bug 7334111 The bug is due to the phone not knowing its own number and hence, not being able to remove the phone's own number from the list of recipients. The simple fix for one-to-one chats is to not add the TO recipients when there's only one recipient, because we know that's going to be ourself. Change-Id: Iec54949e53c350974b8291e389f61b323f1b23f2
2012-10-10am 15480409: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release ↵The Android Open Source Project
- do not merge * commit '15480409f3b085b3292af0ec894d2bed2bc147a2':
2012-10-10Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project
Change-Id: Ic06ba79213c8ce2c41c8282a333456fd8304636b
2012-10-10merge in jb-mr1-factory-release history after reset to jb-mr1-devThe Android Automerger
2012-10-10merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger
2012-10-09merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger
2012-10-09merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger
2012-10-09am a7fc89ae: am ab17014b: Support group mms settingTom Taylor
* commit 'a7fc89ae6184eb8b92fd229e45ffa0bbe7bbf1da': Support group mms setting
2012-10-09am ab17014b: Support group mms settingTom Taylor
* commit 'ab17014baf326d69a5bfd153622a1d7da6a4f9ce': Support group mms setting
2012-10-08Support group mms settingTom Taylor
Bug 6970173 Pass in a parameter to persist() to tell the function whether to use all of the recipients when finding/creating the matching threadId or just use the sender. This is needed for enabling/disabling group mms. Change-Id: I2f28b7891b6689425cf41a26fb3d84a446886fc1
2012-09-12am 2219bd26: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project
* commit '2219bd26bde084d4703cab9bb85982e41ad01f28':
2012-09-12Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project
Change-Id: I17f75cece44e1e9dfe9707346ee7168ca0f0a654
2012-09-10am 7a083b69: am 23480fbe: Group MMS flickers between white square and ↵Tom Taylor
received message when initially checking * commit '7a083b69466d207a427d77d6d84b1b7406849185': Group MMS flickers between white square and received message when initially checking
2012-09-09merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger