summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2012-09-07am 23480fbe: Group MMS flickers between white square and received message ↵Tom Taylor
when initially checking * commit '23480fbe75113d2658cc5437d9b0745de17c8faf': Group MMS flickers between white square and received message when initially checking
2012-09-07Group MMS flickers between white square and received message when initially ↵Tom Taylor
checking Bug 7113015 Update the new text_only column in the pdu if the message only contains text and not any other attachments. Change-Id: I083504349437104c43582dde1f7a787dfabe2cab
2012-09-06am aabf40bb: am a67e3955: Optionally create threadidTom Taylor
* commit 'aabf40bbd43fd3340a56833f92eb23fac9df5df1': Optionally create threadid
2012-09-06am a67e3955: Optionally create threadidTom Taylor
* commit 'a67e3955994a976ab5fafceb86055d98a100bcc0': Optionally create threadid
2012-09-06Optionally create threadidTom Taylor
Bug 7081327 Change-Id: I072d62196f8147d235173fd9abf99e322aacfdd8
2012-09-06am 733fcced: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project
* commit '733fccedb2c26f5f725aa4aba525063fd779e9f1': Unable to receive MMS on Mako
2012-09-06Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project
Change-Id: Id3157ca77b5d15212de07d443e5f26a2c4db80fa
2012-08-29Unable to receive MMS on MakoTom Taylor
Bug 7077996 Restore a null check that was in the original code and fix sending messages to myself. Change-Id: I0e1e9211a3e00deb264ebc724e6fed849ee77f39
2012-08-29Unable to receive MMS on MakoTom Taylor
Bug 7077996 Restore a null check that was in the original code and fix sending messages to myself. Change-Id: I0e1e9211a3e00deb264ebc724e6fed849ee77f39
2012-08-28Support group mmsTom Taylor
Bug 6282172 Add some logging code (turned off) to the pdu parser to make it easy to see what's in the pdu. When we're looking for a thread that an incoming message belongs to, use all the recipients the message was addressed to. Change-Id: I791c9594d9645903bb392f0fb29dc8522159c424
2012-08-24am 008eb65f: am e158afc2: Merge ""audio/mp4" missing from array of supported ↵Jean-Baptiste Queru
content types." * commit '008eb65f170aecb25d674cb47a8fcd3edd8b6b8e': "audio/mp4" missing from array of supported content types.
2012-08-24am e158afc2: Merge ""audio/mp4" missing from array of supported content types."tools_r21Jean-Baptiste Queru
* commit 'e158afc25e4a2b0d6a6c3e4403a5d82a12329493': "audio/mp4" missing from array of supported content types.
2012-08-24Merge ""audio/mp4" missing from array of supported content types."Jean-Baptiste Queru
2012-08-18"audio/mp4" missing from array of supported content types.David Magno
"audio/mp4" is included in the array of supported audio types, but isn't included in the array of supproted content types, causing problems with proper use of MP4 audio in MMS. Change-Id: I7be9ac581fcf7594234000d37f56d901174d54c0
2012-08-01am d6de7266: am 24777f8a: Merge "Remove jsr305 from ↵Brian Carlstrom
LOCAL_STATIC_JAVA_LIBRARIES." * commit 'd6de726692d8a420faae86300bc9e87c30733730': Remove jsr305 from LOCAL_STATIC_JAVA_LIBRARIES.
2012-08-01am 24777f8a: Merge "Remove jsr305 from LOCAL_STATIC_JAVA_LIBRARIES."Brian Carlstrom
* commit '24777f8a1c9df825d182f1765595bea57dca92ee': Remove jsr305 from LOCAL_STATIC_JAVA_LIBRARIES.