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_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 android-5.0.0_r6 android-5.0.0_r5.1
Nothing to show
Commits on Jan 17, 2011
  1. Fix build issue with last merge

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

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

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

    Change-Id: Iae7405f8aaf90d08172ed9c199783bd0ec37dbf4
    android-merger committed Jan 17, 2011
Commits on Nov 19, 2010
  1. Change maxMessageSize to 300 kB.

    Change-Id: Id02f66cf1d2c4e9bfb5e2d07e9b7cba4d1c6b6e1
    roubert committed Nov 19, 2010
Commits on Oct 22, 2010
  1. Merge "Turn off messaging app's SEVERE_WARNING" into gingerbread

    Tom Taylor committed with Android (Google) Code Review Oct 22, 2010
  2. Import revised translations. DO NOT MERGE

    Change-Id: I5cdee6e9e71aecc70ddbe91168000e083f2d6a45
    Eric Fischer committed Oct 22, 2010
  3. Turn off messaging app's SEVERE_WARNING

    Bug 3062274
    Change-Id: I100914f4f31bf74c2cc79e784f38cd0fc33143d1
    Tom Taylor committed Oct 22, 2010
Commits on Oct 18, 2010
  1. Prepare for turning off extensive logging

    Bug 3062274
    Change-Id: I02dbc06b6502d8f50ba7bb2dca367623364adc40
    Tom Taylor committed Oct 18, 2010
Commits on Oct 15, 2010
  1. Fix crash logging exception

    Bug 3099377. The rest of the code is full of lines like this:
      Log.e(TAG, e.getMessage(), e);
    I tested code like that and when getMessage() is null it
    will log (but not crash):
    E/MessageListAdapter( 2210): null
    E/MessageListAdapter( 2210):
    E/MessageListAdapter( 2210): 	at
    E/MessageListAdapter( 2210): 	at android.widget.CursorAdapter.getView(
    Change-Id: I728e20cc5f0d8e986d67d2964d04682645a550d4
    Tom Taylor committed Oct 15, 2010
Commits on Oct 14, 2010
  1. Import revised translations

    Change-Id: Iec10782854c4ae81d4959100a7f06ed1a756274f
    kruton committed Oct 14, 2010
Commits on Oct 12, 2010
  1. Remove some PII.

    Change-Id: I846866881d79b985ea0bc6fa647f8e7a38e63a9b
    Wink Saville committed Oct 12, 2010
Commits on Oct 11, 2010
  1. Tighten recipient check

    When we send a message, the recips in the UI can be empty when the
    user manually types in a number and hits send. prepareForSave() then
    turns those working numbers into real recips. Add an extra test
    for that situation before complaining of different recips.
    Bug 3066322
    Change-Id: I4aaa86138bc9aa817848b24cc5aac1c7718fe735
    Tom Taylor committed Oct 11, 2010
Commits on Oct 9, 2010
  1. Merge "Call dialog.dismiss()" into gingerbread

    Tom Taylor committed with Android (Google) Code Review Oct 9, 2010
  2. Fix too strict scary message

    Don't check threadIds in syncWorkingRecipients. Instead, check recipients
    across a call to prepareForSave in send. Bug 3076599
    Change-Id: I26f12370bfb7e42196194edd1374ca2b89997595
    Tom Taylor committed Oct 9, 2010
  3. Call dialog.dismiss()

    In many of the click handlers, we neglected to dismiss the dialog.
    Bug 3072307
    Change-Id: Ie461492394c9f29ce2a7bb6e7f00a93068ea2bf8
    Tom Taylor committed Oct 9, 2010
Commits on Oct 7, 2010
  1. Import revised translations. DO NOT MERGE

    Change-Id: Id8c77e65f64624f49207ceae5460752527f54ce1
    Eric Fischer committed Oct 7, 2010
Commits on Oct 6, 2010
  1. New downscaled menu assets

    Change-Id: Ifd78299b85eb359e1d795c118069473c18cf3354
    Gilles Debunne committed Oct 6, 2010
  2. Loosen recipients check

    A valid sending scenario was found where we were complaining the
    recipients didn't match. Bug 3066322
    Change-Id: I53da6a9a9d063d09826ce7f955a2dfaaf0633b38
    Tom Taylor committed Oct 6, 2010
Commits on Oct 5, 2010
  1. Merge "Add debugging code" into gingerbread

    Tom Taylor committed with Android (Google) Code Review Oct 5, 2010
  2. Add debugging code

    Add a number of tests to try and track down the situation that causes
    a message to be sent to the wrong recipient. Bug 3057952
    Change-Id: I2da3e91dcb039e87c3222e48026b859d1644793e
    Tom Taylor committed Oct 5, 2010
Commits on Sep 30, 2010
  1. Merge "Import revised translations. DO NOT MERGE" into gingerbread

    Eric Fischer committed with Android (Google) Code Review Sep 30, 2010
Commits on Sep 29, 2010
  1. Fix proguard flag file dependency.

    Change-Id: I38204e9946a468cf91c8e0966ed2bb3bbc0f3a1f
    wangying1015 committed Sep 29, 2010
  2. Import revised translations. DO NOT MERGE

    Change-Id: I286c76c304fe117f8a83041396ac466c50699d5c
    Eric Fischer committed Sep 29, 2010
  3. Genericize strings that refer to the SD card.

    Change-Id: I0d467767507e88118de3737c13e3ddeb52472112
    Eric Fischer committed Sep 28, 2010
Commits on Sep 27, 2010
  1. Trim unwanted whitespace from translations. DO NOT MERGE

    Change-Id: I8703102b3e68e697746c140ad038a85dd949234d
    Eric Fischer committed Sep 27, 2010
Commits on Sep 18, 2010
  1. do not merge

    new assets
    Change-Id: I983006630c15453c72c0a081545a17548c9a2aeb
    chethaase committed Sep 18, 2010
Commits on Sep 16, 2010
  1. Dismiss dialog

    Dismiss the dialog and don't leak the window.
    Bug 2675689
    Change-Id: Iacaff5e6463c7cbef41ab09c80b6512d50aa5b35
    Tom Taylor committed Sep 16, 2010
  2. Fix multi-image attachment

    Handle the case where building a PDU part returns null. Tested by
    forcing this code path to occur. The user sees a toast and the Mms message
    is put into the error state (with visible error icon).
    Bug 2938634
    Change-Id: I8043fce21080f3b8073aed03b7f194406acf4768
    Tom Taylor committed Sep 16, 2010
  3. Handle OutOfMemory when decoding images

    Decoding images and videos in the messaging app appears to be a
    vulnerable point for running out of memory. Catch those exceptions,
    log an error, and continue on without loading the image. Most of these
    "catches" are around situations where there's been a problem decoding
    the original image in the first place, and now we're simply trying
    to decode a small missing stand-in image. However, since BitmapFactory.decodeResource
    seems to be in an inordinate number of bug reports, I want to log every
    use in the code in case of failure.
    Handles the 2nd part of bug 2994057.
    Change-Id: Iaa8035f6ef28385b353d31507b9753934881d3e8
    Tom Taylor committed Sep 16, 2010
Commits on Sep 14, 2010
  1. Don't do disk writes on the UI thread when updating cache.

    Fixes some of the more common StrictMode violations.
    Change-Id: Ica4373ec20a6040642cee035f1e7eafdcdc2af67
    bradfitz committed Sep 14, 2010
Commits on Sep 10, 2010
  1. Thread call start

    A thread was calling run() instead of start(). Add names to the
    threads in this file. Gingerbread bug 2991885.
    Change-Id: I20f144b53c96227f977340d4a69bc68311403ed5
    Tom Taylor committed Sep 10, 2010
Commits on Aug 31, 2010
  1. Use new apply() instead of commit().

    apply() starts an async disk write and doesn't have a return
    value but is otherwise identical in observable effects.
    Change-Id: I126fa7cb5d02a2c30721eb702ecf5bd9d9376b17
    bradfitz committed Aug 26, 2010
Commits on Aug 24, 2010
  1. merge -s ours from froyo-release so that upgrading to gingerbread is …

    …a git fast-forward
    Change-Id: I551c090b9ebcb904da09faf3a99c2106c5973d95
    Jean-Baptiste Queru committed Aug 24, 2010
Commits on Aug 18, 2010
  1. Move failed message to failed state

    When we try and send a message and the telephony layer throws an
    exception, move that message to the failed state. Otherwise, it
    perpetually remains in the outbox and shows as "Sending..." to the
    Change-Id: Iaa2a4ed05f67828e8f980228e01a5a34e4fc069e
    Tom Taylor committed with android-build SharedAccount Aug 3, 2010