Permalink
Commits on Apr 25, 2011
  1. update to current cm7

    committed Apr 25, 2011
Commits on Feb 7, 2011
  1. Import revised translations. DO NOT MERGE

    Change-Id: Ie4ed80305df9ece30aa7c589a259a4035d28b64c
    Eric Fischer committed Feb 7, 2011
Commits on Feb 4, 2011
  1. Merge from open-source gingerbread

    Change-Id: I66ae374b23c11a7e56f9ac13d9072c324264f544
    Jean-Baptiste Queru committed Feb 4, 2011
  2. Merge "Support video/mp4 content type" into gingerbread

    Jean-Baptiste Queru committed with Android Code Review Feb 4, 2011
Commits on Feb 2, 2011
  1. Merge branch 'gingerbread' of ssh://review.source.android.com:29418/p…

    …latform/packages/apps/Mms into HEAD
    Jean-Baptiste Queru committed Feb 2, 2011
  2. Merge "Fix the delivery report error" into gingerbread

    Jean-Baptiste Queru committed with Android Code Review Feb 2, 2011
  3. Merge from open-source gingerbread

    Change-Id: Ia574c3da7273fea835eadfa0f48cde5392ab10e7
    Jean-Baptiste Queru committed Feb 2, 2011
  4. Merge "The problem is that attached files(ex. Image, Movie) on MMS ar…

    …e not displayed among other devices." into gingerbread
    Jean-Baptiste Queru committed with Android Code Review Feb 2, 2011
  5. Fix the delivery report error

    Although TP-status is PENDING or FAILED, delivery report is displayed.
    Only in case of SUCCESS, it should be displayed to users.
    
    Change-Id: I00eeed61f8797ff1d468c0bf23a7f3431ed02fae
    Signed-off-by: Sang-Jun Park <sj2202.park@samsung.com>
    Sang-Jun Park committed Feb 2, 2011
Commits on Feb 1, 2011
  1. Support video/mp4 content type

    Change-Id: I388e6066b05872993c3f15167d2250d7732c6d8f
    Signed-off-by: Sang-Jun Park <sj2202.park@samsung.com>
    Sang-Jun Park committed Feb 1, 2011
Commits on Jan 30, 2011
  1. Merge from open-source gingerbread

    Change-Id: I9c91c58901533a01df03ff62c1a08b6271a3f26c
    Jean-Baptiste Queru committed Jan 30, 2011
  2. The problem is that attached files(ex. Image, Movie) on MMS are not d…

    …isplayed among other devices.
    
    - Symptom
    	1. Attached Movie, Image files are not displayed
    	2. Attached MP4 file is not displayed : NexusS to NexusOne
    	3. Attached 3GP files can't be played : NexusS to A877/A797
    	4. Attached JPG file is not shown : NexusS to A877
    	5. Attached JPG file is not shown : Iphone to NexusS
    
    Change-Id: I443bbcca6b6a678cd816a3d0c2bf72f544d8fd56
    Signed-off-by: Sang-Jun Park <sj2202.park@samsung.com>
    Sang-Jun Park committed Jan 30, 2011
  3. Merge "fix mms crash when large video file is sent" into gingerbread

    Jean-Baptiste Queru committed with Android Code Review Jan 30, 2011
Commits on Jan 28, 2011
  1. Import revised translations. DO NOT MERGE

    Change-Id: I72f6a1b939cf6362e251590c32cc9a979d1272b0
    Eric Fischer committed Jan 28, 2011
Commits on Jan 27, 2011
  1. Import revised translations. DO NOT MERGE

    Change-Id: If77f65948df08eec3a21fb532a58c1f51c5a3f91
    Eric Fischer committed Jan 27, 2011
Commits on Jan 26, 2011
  1. fix mms crash when large video file is sent

    If we try to attach a video with size more than allowed by
    CarrierContentRestriction in the Messaging  application
    (ComposeMessageActivity), the app crashes since it tries to delete a
    message from database with improper URI (null value). Prevent the
    deletion of message with null URI in correctAttachmentSize()
    
    Change-Id: Icc08419accc23f13e80376b2078b2494815ee87f
    
    Signed-off-by: Madan Ankapura <mankapur@sta.samsung.com>
    Ritu Srivastava committed with Madan Ankapura Jan 26, 2011
Commits on Jan 25, 2011
  1. Fix crash in WorkingMessage.saveAsMms

    A set of steps will correctly cause the working message to get marked
    as discarded. However, when restarting, the discarded working message
    was not replaced with a good working message. Bug 1866477
    
    Change-Id: I4b42402e3d539df2792b20fa5c3a2f4567085f08
    Tom Taylor committed Jan 25, 2011
Commits on Jan 19, 2011
  1. Reconcile with open-source gingerbread

    Change-Id: I749917e5bf130ac5458cf6d84a8442176c17cd84
    Jean-Baptiste Queru committed Jan 19, 2011
  2. Sms sent to wrong recipient

    Remove the empty conversation from the conversation cache.
    Bug 3057952
    
    Change-Id: I5b208f5d071dac89af0ac9bd5af43b0286bbf60f
    Tom Taylor committed with Jean-Baptiste Queru Jan 5, 2011
  3. Notification goes to conv list

    Selecting sms notification often goes to conversation list instead
    of the individual conversation. Bug 3322081
    
    Change-Id: I67382208daea657b46593d82b23c6d2461414331
    Tom Taylor committed with Jean-Baptiste Queru Jan 4, 2011
  4. bug #3319036: fix one of the (severe) SMS bugs where the wrong conver…

    …sation is opened.
    
    - the code in ConversationList.onListItemClicked() was extracting the conversation data
    from the ConversationListItem view passed in. However, ListItem views can be recycled
    when rebound, so the view we got could now be reassigned to a different list position
    and contain different data.
    
    Intead of depend on ConversationListItem to store the conversation data, always load
    the cursor at the position clicked, and get the conversation data from the cursor.
    
    Change-Id: I4ce80a323771a3f0f91f2f62da17af9cc02a5084
    Wei Huang committed with Jean-Baptiste Queru Jan 4, 2011
Commits on Jan 13, 2011
  1. Squash commits of the following patchs cherry-picked from other branc…

    …h - do not merge.
    
    o Replace call to MediaMetadataRetriever.captureFrame() with MediaMetadataRetriver.getFrameAtTime()
      as part of the preparation for publishing MediaMetadataRetriever java API
    
    o Don't call MediaMetadataRetriever.setMode(), which is going to be removed.
    
    bug - 3309041
    
    Change-Id: Ic9b33a0dad21e5bc96b21b2717de2e1c41f6c479
    James Dong committed Dec 4, 2010
Commits on Jan 11, 2011
  1. Fix java.lang.IllegalStateException: attempt to re-open an already-cl…

    …osed object
    
    Wrong cursor getting closed. Bug 3338157
    
    Change-Id: I13d7233a0aafa4a363766b64a8a3bf5aa7990f8c
    Tom Taylor committed Jan 11, 2011
  2. OOM at com.android.mms.ui.UriImage.getResizedImageData

    Recycle the bitmap each time through the loop and catch OOM when we
    try and convert the bitmap to a byte array. Bug 3263587
    
    Change-Id: I83dde7ed10f18ad6a6f81ca34babe4e455a5ec42
    Tom Taylor committed Jan 6, 2011
Commits on Jan 6, 2011
  1. Merge "Import translations for additional languages." into gingerbread

    Eric Fischer committed with Android (Google) Code Review Jan 6, 2011
  2. Merge "Fix recycler NPE" into gingerbread

    Tom Taylor committed with Android (Google) Code Review Jan 6, 2011
  3. Merge "Video rotation/thumbnail is not properly displayed in MMS" int…

    …o gingerbread
    Tom Taylor committed with Android (Google) Code Review Jan 6, 2011
  4. Import translations for additional languages.

    Change-Id: I4a2a69c58e561c87d0bb6fa3edcb863a8382e984
    Eric Fischer committed Jan 6, 2011
  5. Fix recycler NPE

    It's caused by getting back a null cursor from a query. There are other
    places in the code where we could get null cursors. Fixed 'em. Also,
    the cursor wasn't getting closed. Fixed that too. Bug 3315962
    
    Change-Id: Ifff2b35cf25627847376131a16686d3420a21946
    Tom Taylor committed Jan 6, 2011
  6. Video rotation/thumbnail is not properly displayed in MMS

    Bug 3185520
    
    Change-Id: Ibd890a15a50bd8191ed95c3e1c36634246e975d5
    Tom Taylor committed Jan 6, 2011
Commits on Jan 5, 2011
  1. am 1f4171b: Sms sent to wrong recipient

    * commit '1f4171b81be3d2aafcb5d330af5603925f0c02c9':
      Sms sent to wrong recipient
    Tom Taylor committed with Android Git Automerger Jan 5, 2011
  2. Sms sent to wrong recipient

    Remove the empty conversation from the conversation cache.
    Bug 3057952
    
    Change-Id: I89d0a6445ae9126b51da3cc4bce929ba05e97853
    Tom Taylor committed Jan 5, 2011
  3. am 0978a0c: Notification goes to conv list

    * commit '0978a0c9c7baddc49dbe826c4c2a72c09d8d254a':
      Notification goes to conv list
    Tom Taylor committed with Android Git Automerger Jan 5, 2011
  4. am 782942d: (-s ours) bug #3319036: fix one of the (severe) SMS bugs …

    …where the wrong conversation is opened.
    
    * commit '782942d0e20878225da06466597760a3edc64056':
      bug #3319036: fix one of the (severe) SMS bugs where the wrong conversation is opened.
    Tom Taylor committed with Android Git Automerger Jan 5, 2011
  5. Notification goes to conv list

    Selecting sms notification often goes to conversation list instead
    of the individual conversation. Bug 3322081
    
    Merged from gingerbread
    
    Change-Id: I101e5bf6f539302970f93f190933672d06b42d37
    Tom Taylor committed Jan 5, 2011