summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
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-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-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-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-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-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-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-09merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger
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-06Optionally create threadidTom Taylor
Bug 7081327 Change-Id: I072d62196f8147d235173fd9abf99e322aacfdd8
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.
2012-08-01Merge "Remove jsr305 from LOCAL_STATIC_JAVA_LIBRARIES."Brian Carlstrom
2012-07-31Remove jsr305 from LOCAL_STATIC_JAVA_LIBRARIES.Wink Saville
Bug: 6866232 (cherry-picked from 8630a50c3115542bc47c0c09fd31f56fa58c0cd0) Change-Id: If93162d62a917b90fadd6b96d9a811f6ade54d29
2012-07-24Remove jsr305 from LOCAL_STATIC_JAVA_LIBRARIES.Wink Saville
Bug: 6866232 Change-Id: I86dd10dc65b19513ed64ff7a063a3e96e9704b41
2012-07-17am 49e84ba2: (-s ours) am 9ee98103: (-s ours) Create mms-common - DO NOT MERGEWink Saville
* commit '49e84ba2c2320883b2138ab4281a598c50a1a138': Create mms-common - DO NOT MERGE
2012-07-17am 9ee98103: (-s ours) Create mms-common - DO NOT MERGEWink Saville
* commit '9ee98103a9015fbabe813218915b2892b599ae16': Create mms-common - DO NOT MERGE
2012-07-17Create mms-common - DO NOT MERGEWink Saville
mms-common was created by moving all of frameworks/base/core/java/com/google/android/mms to: frameworks/opt/mms Change-Id: I7b9f491e19161d86ccfffc01ace826de23ef167e
2012-07-12Merge commit 'd02a0641' into mitWink Saville
* commit 'd02a0641': Create mms-common
2012-06-14Create mms-commonWink Saville
mms-common was created by moving all of frameworks/base/core/java/com/google/android/mms to: frameworks/opt/mms Change-Id: I7b9f491e19161d86ccfffc01ace826de23ef167e
2012-06-13Initial empty repositoryChad Jones
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 23:26:14 +0000