Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: eclair-sholes-…
Commits on Jan 26, 2010
  1. Merge branch 'eclair' into eclair-release

    The Android Automerger authored
  2. bug 2384418: fix bug in mms contact lookup.

    Wei Huang authored
    - a portion of the mms contact lookup wasn't protected by the synchronization block, and that portion used a member variable 'mSelectionArgs[]', which contains the number to be looked up. If this code is accessed by different threads at the same time, mSelectionArgs[] could be overridden by a wrong number, causing the resulting contact info be bad. With the bad contact cache, future lookups by phone number would result in the wrong contact.
    
    While I didn't reproduce this with release builds, I was able to write a test that looks up a bunch of numbers in thread 1, and another bunch in thread 2. I observed thread #2 overwritting mSelectionArgs[] for thread 1, causing contact lookup to create bad contact cache. I believe in practice this can happen as the MMS code does look up and create contact cache entries from different threads.
    
    This problem should be in builds before ERE19. In ERE19, Dmitri added an optimization in the ContactInfoCache's contact lookup, which should result in contact lookup to fail (zero cursor) when mSelectionArgs[] is overwritten by a bad phone number. It'd be nice to confirm that, but bug 2384418 doesn't contain a bug report, and we don't know for sure which build it was found in.
    
    In any case, this fix is straight forward and should fix the contact lookup.
    
    Change-Id: I516ff7039bec47c1b7bdc7dd5e52347c004a5a13
Commits on Jan 21, 2010
  1. Merge branch 'eclair' into eclair-release

    The Android Automerger authored
  2. Bug: 2167799

    Wei Huang authored
    - use PhoneUtils.toCallerIDMinMatch() instead of getStrippedReversed(). The latter uses the whole number, and would treat numbers "1-650-555-1212" and "650-555-1212" differently. The former uses the first 7 digits of the reversed digits, and is what ContactsProvider uses to filter for numbers.
Commits on Jan 19, 2010
  1. Merge branch 'eclair' into eclair-release

    The Android Automerger authored
Commits on Jan 18, 2010
  1. dmitriplotnikov

    Optimizing phone lookup for MMS recipient list.

    dmitriplotnikov authored
    Bug: 2167799
    Change-Id: I25a7fc18260bbec3dcc5eb87ede45be644d51ef6
Commits on Jan 14, 2010
  1. Merge branch 'eclair' into eclair-release

    The Android Automerger authored
Commits on Jan 12, 2010
  1. Don't load contacts on UI thread

    Tom Taylor authored
    There's a route through a Conversation constructor that will
    result in the conversation's contacts getting loaded on the
    UI thread. Add an explicit "allowQuery" parameter to give callers
    the ability to throttle this behavior. Fixes bug 2280762.
    
    Conflicts:
    
    	src/com/android/mms/data/Conversation.java
    	src/com/android/mms/ui/ComposeMessageActivity.java
Commits on Dec 10, 2009
  1. Merge branch 'eclair' into eclair-release

    The Android Automerger authored
  2. Import revised translations. DO NOT MERGE

    Eric Fischer authored
Commits on Dec 4, 2009
  1. Merge branch 'eclair' into eclair-release

    The Android Automerger authored
Commits on Dec 3, 2009
  1. Import revised translations. DO NOT MERGE

    Eric Fischer authored
  2. Merge branch 'eclair' into eclair-release

    The Android Automerger authored
  3. Merge change I2e5b602b into eclair

    Android (Google) Code Review authored
    * changes:
      be sure to set mIsStale to false (bug 2299730)
  4. be sure to set mIsStale to false (bug 2299730)

    Mark Wagner authored
Commits on Dec 2, 2009
  1. Import revised translations. DO NOT MERGE

    Eric Fischer authored
  2. Merge branch 'eclair' into eclair-release

    The Android Automerger authored
  3. Fix conversation loading

    Tom Taylor authored
    After loading a thread with an exact set of recipients, the code called
    setRecipients() which resets the threadId to zero. As a result, a new
    conversation was created and displayed, rather than the existing conversation
    with all of its messages. Fixes bug 2284007.
    
    Change-Id: I6b38a046120f320a95f5e63721ee3000290feb1c
Commits on Dec 1, 2009
  1. bug: change default UA agent string for MMS.

    Wei Huang authored
    - add conditional logging for UAProf url.
    - if the MMS port isn't set, don't use Log.e() to log it.
    
    Change-Id: I9557763d209226eafb5cb3b0b7e4092287f5ef29
  2. Merge branch 'eclair' into eclair-release

    The Android Automerger authored
Commits on Nov 30, 2009
  1. Import revised translations. DO NOT MERGE

    Eric Fischer authored
Commits on Nov 23, 2009
  1. Merge branch 'eclair' into eclair-release

    The Android Automerger authored
Commits on Nov 20, 2009
  1. Merge branch 'eclair' into eclair-release

    The Android Automerger authored
  2. bug #2271915: make MmsConfig more robust - use defaults when configs …

    Wei Huang authored
    …in the xml file isn't present.
    
    Change-Id: I628ddd211e1a130b10075dbe55708fca020bcfb6
Commits on Nov 19, 2009
  1. Fix two Messaging contact updating bugs

    Tom Taylor authored
    1) There's a situation where getting a contact could potentially
    return a cached contact whose contents haven't been completely filled
    in yet.
    2) When a contact's info does change, update the messages in the thread
    to reflect the current contact data.
    Bug 2271800.
    
    Change-Id: I48403c45c461b3c609400a3a5f55b99aaee01cbd
Commits on Nov 18, 2009
  1. Merge branch 'eclair' into eclair-release

    The Android Automerger authored
  2. Fix ANR from calling Contact.get()

    Tom Taylor authored
    The Contact.get() API allows the caller to specify whether the operation
    can block (looking up contact info in the DB) or not. There are about 10
    places where various callers were passing "true" to canBlock, all coming
    from the UI thread. We've previously fixed Contact.get() to always return
    a Contact, with the number filled in, even if we don't have the contact
    in the cache. With this change, never block the UI thread getting a contact.
    The worst side-effect should be showing a number, instead of a name.
    Fixes bug 2265631.
Commits on Nov 15, 2009
  1. Merge branch 'eclair' into eclair-release

    The Android Automerger authored
Commits on Nov 14, 2009
  1. Merge change I430b3e56 into eclair

    Android (Google) Code Review authored
    * changes:
      Import revised translations.  DO NOT MERGE
  2. Import revised translations. DO NOT MERGE

    Eric Fischer authored
    Approver: jerryw
  3. Fix null ref

    Tom Taylor authored
    Fixes bug 2261398.
    
    Change-Id: Idb4db938e93b792248d49410b9474c71d5d4bb37
Commits on Nov 13, 2009
  1. Merge branch 'eclair' into eclair-release

    The Android Automerger authored
  2. Merge change Iee6fa925 into eclair

    Android (Google) Code Review authored
    * changes:
      Import revised translations.  DO NOT MERGE
  3. Don't show Converting to MMS

    Tom Taylor authored
    When we open a thread where the recipient is an
    email address, don't automatically show the "Converting
    to multimedia message" The user already saw that when
    he/she added the email recipient. Bug 2235226.
  4. Import revised translations. DO NOT MERGE

    Eric Fischer authored
    Approver: jerryw
Something went wrong with that request. Please try again.