Permalink
Switch branches/tags
android-wear-5.1.1_r1 android-wear-5.1.0_r1 android-wear-5.0.0_r1 android-sdk-support_r11 android-sdk-adt_r20 android-sdk-adt_r16.0.1 android-sdk-4.4.2_r1.0.1 android-sdk-4.4.2_r1 android-sdk-4.0.3_r1 android-sdk-4.0.3-tools_r1 android-m-preview android-m-preview-2 android-m-preview-1 android-l-preview_r2 android-cts-verifier-4.0.3_r1 android-cts-verifier-4.0_r1 android-cts-5.1_r24 android-cts-5.1_r23 android-cts-5.1_r22 android-cts-5.1_r21 android-cts-5.1_r20 android-cts-5.1_r19 android-cts-5.1_r18 android-cts-5.1_r17 android-cts-5.1_r16 android-cts-5.1_r15 android-cts-5.1_r14 android-cts-5.1_r13 android-cts-5.1_r10 android-cts-5.1_r9 android-cts-5.1_r8 android-cts-5.1_r7 android-cts-5.1_r6 android-cts-5.1_r5 android-cts-5.1_r4 android-cts-5.1_r3 android-cts-5.1_r2 android-cts-5.1_r1 android-cts-5.0_r9 android-cts-5.0_r8 android-cts-5.0_r7 android-cts-5.0_r6 android-cts-5.0_r5 android-cts-5.0_r4 android-cts-5.0_r3 android-cts-4.4_r4 android-cts-4.4_r1 android-cts-4.2_r2 android-cts-4.2_r1 android-cts-4.1_r4 android-cts-4.1_r2 android-cts-4.1_r1 android-cts-4.0.3_r2 android-cts-4.0.3_r1 android-cts-4.0_r1 android-cts-2.3_r12 android-cts-2.3_r11 android-cts-2.3_r10 android-cts-2.2_r8 android-5.1.1_r38 android-5.1.1_r37 android-5.1.1_r36 android-5.1.1_r35 android-5.1.1_r34 android-5.1.1_r33 android-5.1.1_r30 android-5.1.1_r29 android-5.1.1_r28 android-5.1.1_r26 android-5.1.1_r25 android-5.1.1_r24 android-5.1.1_r23 android-5.1.1_r22 android-5.1.1_r20 android-5.1.1_r19 android-5.1.1_r18 android-5.1.1_r17 android-5.1.1_r16 android-5.1.1_r15 android-5.1.1_r14 android-5.1.1_r13 android-5.1.1_r12 android-5.1.1_r10 android-5.1.1_r9 android-5.1.1_r8 android-5.1.1_r7 android-5.1.1_r6 android-5.1.1_r5 android-5.1.1_r4 android-5.1.1_r3 android-5.1.1_r2 android-5.1.1_r1 android-5.1.0_r5 android-5.1.0_r4 android-5.1.0_r3 android-5.1.0_r1 android-5.0.2_r3 android-5.0.2_r1 android-5.0.1_r1 android-5.0.0_r7
Nothing to show
Commits on Feb 18, 2011
  1. Import revised translations. DO NOT MERGE

    Eric Fischer committed with android-merger Feb 15, 2011
    Change-Id: Ied0c01074e54f2881710f26344b89f931a87a6f9
Commits on Feb 8, 2011
  1. Import revised translations. DO NOT MERGE

    Eric Fischer committed with android-merger Feb 7, 2011
    Change-Id: Ie4ed80305df9ece30aa7c589a259a4035d28b64c
  2. Support video/mp4 content type

    Sang-Jun Park committed with android-merger Feb 1, 2011
    Change-Id: I388e6066b05872993c3f15167d2250d7732c6d8f
    Signed-off-by: Sang-Jun Park <sj2202.park@samsung.com>
Commits on Feb 3, 2011
  1. merge in gingerbread-release history after reset to gingerbread

    The Android Automerger committed Feb 3, 2011
  2. merge in gingerbread-release history after reset to gingerbread

    The Android Automerger committed Feb 3, 2011
  3. merge in gingerbread-release history after reset to gingerbread

    The Android Automerger committed Feb 3, 2011
Commits on Feb 2, 2011
  1. Merge branch 'gingerbread' of ssh://review.source.android.com:29418/p…

    Jean-Baptiste Queru committed Feb 2, 2011
    …latform/packages/apps/Mms into HEAD
  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

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

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

    Sang-Jun Park committed Feb 2, 2011
    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>
Commits on Jan 31, 2011
  1. merge in gingerbread-release history after reset to gingerbread

    The Android Automerger committed Jan 31, 2011
Commits on Jan 30, 2011
  1. Merge from open-source gingerbread

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

    Sang-Jun Park committed Jan 30, 2011
    …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>
  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. merge in gingerbread-release history after reset to gingerbread

    The Android Automerger committed Jan 28, 2011
  2. Import revised translations. DO NOT MERGE

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

    Eric Fischer committed Jan 27, 2011
    Change-Id: If77f65948df08eec3a21fb532a58c1f51c5a3f91
  2. merge in gingerbread-release history after reset to gingerbread

    The Android Automerger committed Jan 27, 2011
Commits on Jan 26, 2011
  1. merge in gingerbread-release history after reset to gingerbread

    The Android Automerger committed Jan 26, 2011
  2. fix mms crash when large video file is sent

    Ritu Srivastava committed with Madan Ankapura Jan 26, 2011
    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>
Commits on Jan 25, 2011
  1. Fix crash in WorkingMessage.saveAsMms

    Tom Taylor committed Jan 25, 2011
    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
Commits on Jan 21, 2011
  1. merge in gingerbread-release history after reset to gingerbread

    The Android Automerger committed Jan 21, 2011
Commits on Jan 19, 2011
  1. Reconcile with open-source gingerbread

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

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

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

    Wei Huang committed with Jean-Baptiste Queru Jan 4, 2011
    …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
Commits on Jan 17, 2011
  1. Fix build issue with last merge

    android-merger committed Jan 17, 2011
    Change-Id: I7530e23e4054389b9595c2248dc89261ec357f63
  2. Sms sent to wrong recipient

    Tom Taylor committed with android-merger Jan 5, 2011
    Remove the empty conversation from the conversation cache.
    Bug 3057952
    
    Change-Id: I5b208f5d071dac89af0ac9bd5af43b0286bbf60f
  3. manual merge d2ff1f8

    android-merger committed Jan 17, 2011
    Change-Id: If37e57c8e8b6f35f4073e5094e14185e63f25ec7
  4. manual merge a7ce913

    android-merger committed Jan 17, 2011
    Change-Id: Iae7405f8aaf90d08172ed9c199783bd0ec37dbf4
  5. merge in gingerbread-release history after reset to gingerbread

    The Android Automerger committed Jan 17, 2011
Commits on Jan 16, 2011
  1. merge in gingerbread-release history after reset to gingerbread

    The Android Automerger committed Jan 16, 2011
Commits on Jan 14, 2011
  1. merge in gingerbread-release history after reset to gingerbread

    The Android Automerger committed Jan 14, 2011