Permalink
Commits on Jan 6, 2011
  1. Import translations for additional languages.

    Change-Id: I88dc821fb331d634f336a6ca8b555119d4d613e4
    Eric Fischer committed Jan 6, 2011
Commits on Nov 1, 2010
  1. DO NOT MERGE Grandfathering existing devices into aggregation policy.

    Bug: 3146258
    Change-Id: I0b076e58db95165a3e4a98d91cd5dd3b20cbdf31
    dmitriplotnikov committed Nov 1, 2010
Commits on Oct 22, 2010
  1. Fixing unit tests

    A bunch of tests were broken by the recent change
    of the aggregation policy, because they relied
    on the old policy.
    
    Some other tests stopped working after we upgraded
    to a new version of ICU.
    
    Updating the tests accordingly.
    
    Change-Id: I97a785015834632a896ed4fc6079744962c7a04c
    dmitriplotnikov committed Oct 22, 2010
  2. Revert "Update list of unrestricted packages"

    This reverts commit c183f4f.
    Jason Chen committed Oct 22, 2010
Commits on Oct 21, 2010
  1. Update list of unrestricted packages

    Bug: 3120038
    Change-Id: Id0a9e355c84dfbac73a4b9b6d6ef6c0073ea0f13
    Jean-Baptiste Queru committed Oct 21, 2010
Commits on Oct 18, 2010
  1. bug:3097939 trigger on a table without good index = slow contacts app

    added index on a table without which the contacts app trigger is causing
    N**2 linear scans of the contacts table. the bigger the contacts
    table size (= N), the worse the prlblem is.
    
    Change-Id: I5124b3b43d929ccaca3c4f4261c16b0ee5f02d61
    Vasu Nori committed Oct 18, 2010
Commits on Oct 14, 2010
  1. Merge "Fixing the trigger for aggregated presence." into gingerbread

    dmitriplotnikov committed with Android (Google) Code Review Oct 14, 2010
  2. Fixing the trigger for aggregated presence.

    Aggregated presence was not updated properly
    when presence was changed to NULL.
    
    Added a test that covers the specific situation.
    
    Bug: 3069107
    Change-Id: I52396db7c9006e9f18ec6b7c51b22ba09c0ae480
    dmitriplotnikov committed Oct 14, 2010
  3. Fixing ContactAggregator breakage revealed by an automated test

    If you have an automatic aggregate of three or more
    raw contacts and you confirm the aggregation by adding
    an explicit manual override between two of the raw contacts,
    the third raw contact falls out of the aggregate.
    
    This CL fixes the problem.
    
    Bug: 3097139
    Change-Id: I96b717eeb03e1a49a45b28ee395924f9d61c3e99
    dmitriplotnikov committed Oct 14, 2010
  4. Making aggregation exceptions override the not-from-same-account rule

    We now have a rule that we won't let contacts
    from the same account to get aggregated.  This
    rule should NOT apply to manual aggregation.
    
    Bug: 3095300
    Change-Id: Idb6bdf54214cec46c72bf681e6f980ac0d293386
    dmitriplotnikov committed Oct 14, 2010
Commits on Oct 13, 2010
  1. Fixing the "duplication" of contacts

    This bug was a regression caused by
    CL I413231af
    
    When the aggregator decided that it did not
    need to aggregate a raw contact despite an
    existing match, it would create a duplicate
    contact for that raw contact.  Fortunately
    those "duplicate" contacts are easy to identify
    and remove.
    
    Bug: 3091731
    
    Change-Id: Ifef2c212c1ec8d431a0aa2eeb6f34f9e30345194
    dmitriplotnikov committed Oct 13, 2010
Commits on Oct 11, 2010
  1. Changing contact aggregation to not join from same account

    Second attempt, now w/o an infinite loop.
    
    The change addresses several requirements:
    
    1. If "Michelle Lee" and "Michelle Lee" are two contacts
    in the same account, we won't aggregate them.
    2. If "Michelle Lee" and "Michelle Lee" are two contacts
    from different accounts, they do get aggregated, but
    if a third "Michelle Lee" shows up in one of those two
    accounts - we bust the original aggregate.
    3. If "Michelle Lee" and "Michelle Lee" are not aggregated
    and a third "Michelle Lee shows up, it does not get
    aggregated with either of the first two regardless of
    the account.
    4. Any manual joining overrides the above behavior.
    5. The OTA with this change will bust all aggregates that
    contain raw contacts from the same account.
    
    Bug: 2650610
    Change-Id: I413231af4cfa620f8d266a758c22bfc879aeae07
    dmitriplotnikov committed Oct 11, 2010
  2. Revert "Changing contact aggregation to not join from same account"

    This reverts commit 2a0d5f9.
    
    Bug: 3086301
    
    Change-Id: I7f05eb14122687950ca7d22d591fc172c463045e
    dmitriplotnikov committed Oct 11, 2010
  3. Changing contact aggregation to not join from same account

    The change addresses several requirements:
    
    1. If "Michelle Lee" and "Michelle Lee" are two contacts
    in the same account, we won't aggregate them.
    2. If "Michelle Lee" and "Michelle Lee" are two contacts
    from different accounts, they do get aggregated, but
    if a third "Michelle Lee" shows up in one of those two
    accounts - we bust the original aggregate.
    3. If "Michelle Lee" and "Michelle Lee" are not aggregated
    and a third "Michelle Lee shows up, it does not get
    aggregated with either of the first two regardless of
    the account.
    4. Any manual joining overrides the above behavior.
    5. The OTA with this change will bust all aggregates that
    contain raw contacts from the same account.
    
    Bug: 2650610
    
    Change-Id: Idfba4dd330a4842310f3fed85e6ae0a3a634e95c
    dmitriplotnikov committed Oct 11, 2010
Commits on Sep 28, 2010
  1. Handle DATA in ContactsProvider2.getType().

    (I noticed this was missing because I saw IllegalArgumentExceptions in the
    logs when doing caller-id lookups for SIP addresses, which happen directly
    on the Data table.)
    
    It is valid to call getType on a DATA uri, though, so we now return
    Data.CONTENT_TYPE.
    
    Bug: 3004127
    Change-Id: I14538cd8671e2f47acedddd79c18bd2ce4709a8f
    David Brown committed Sep 28, 2010
Commits on Sep 8, 2010
  1. Rebuilding name lookup for gingerbread

    Bug: 2945979
    Change-Id: Ibea10ce80023d3f2fa87fe76c5e41fbba9be6c87
    dmitriplotnikov committed Sep 8, 2010
Commits on Sep 2, 2010
  1. Allow contacts provider to grant URI permissions.

    Change-Id: I65fc58ac6ec17399ee5d02c148512ad307705da7
    Dianne Hackborn committed Sep 2, 2010
Commits on Aug 31, 2010
  1. Use new SharedPreferences$Editor.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: Icd6065e9ef650f80a93e1397bfd6300edc2670c0
    bradfitz committed Aug 26, 2010
Commits on Aug 26, 2010
  1. add emma filter to make file

    so the code coverage report won't contain classes from local static
    Java libraries
    
    Change-Id: I039963fd2baff94bc9eed8f16a5d2b2786616e0c
    Guang Zhu committed Jul 29, 2010
Commits on Aug 5, 2010
  1. Tracking merge of dalvik-dev to gingerbread

    git cherry-pick --no-commit 633d446
    
    Change-Id: I0f96f14dfffd9fa8e3bd2480c3de0518818616e7
    bdcgoogle committed Aug 5, 2010
Commits on Jul 16, 2010
  1. add chat_mode to presence_db tables: presence, aggregate_presence

    Change-Id: I62fc49669217a6136e31164713dc25a5296721ef
    Vasu Nori committed Jul 15, 2010
Commits on Jun 29, 2010
  1. set up fast-forward from froyo-release to gingerbread

    Change-Id: I39e29f724b8af92e7c2c90d651c7de3b003adfa6
    The Android Open Source Project committed Jun 29, 2010
Commits on Jun 24, 2010
  1. Avoiding a race condition caused by configuration change during FroYo…

    … upgrade
    
    Bug: 2789091
    Change-Id: I8515521eeea83e11c9b14eface70e3f86bf51974
    dmitriplotnikov committed with android-build SharedAccount Jun 24, 2010
  2. Avoiding a race condition caused by configuration change during FroYo…

    … upgrade
    
    Bug: 2789091
    Change-Id: I8515521eeea83e11c9b14eface70e3f86bf51974
    dmitriplotnikov committed Jun 24, 2010
Commits on Jun 23, 2010
  1. Resolving a race condition in upgrade to Froyo

    Bug: 2789091
    Change-Id: I4adb18ca019d50215129c2c7ec088b49438d053f
    dmitriplotnikov committed with android-build SharedAccount Jun 23, 2010
  2. Resolving a race condition in upgrade to Froyo

    Bug: 2789091
    Change-Id: I4adb18ca019d50215129c2c7ec088b49438d053f
    dmitriplotnikov committed Jun 23, 2010
Commits on Jun 4, 2010
  1. Avoid long running upgrade work on the main thread

    Pre-froyo devices didn't use the shared
    preferences to track the locale, so they will
    always return null for the "providerLocale" even
    if the database has thousands of contacts present
    so it's not safe to run the setLocale() work from
    the main thread.
    
    Report locale change time in uptimeMillis()
    so the report is correct across clock changes.
    
    Bug: 2722569
    Change-Id: I493596d657f5e02fca8174d998da1fae1115728d
    jham committed Jun 4, 2010
Commits on May 26, 2010
  1. Add a PRE_BOOT_COMPLETED receiver.

    It runs the first time after an OTA and either creates
    the database or runs the upgrade path on it. This may
    take a significatn amount of time so it's done before
    the boot animation completes.
    
    Bug: 2713849
    Change-Id: I07f2c22a1462e6923cb7b060d561e7fb41a6e82d
    jham committed May 26, 2010
Commits on May 24, 2010
  1. Cleaning up the contacts DB during upgrade to version 203

    Bug: 2709359
    Change-Id: I3912e935aba3b5ff40347616843e8caffccacead
    dmitriplotnikov committed May 24, 2010
Commits on Apr 15, 2010
  1. Merge "Import revised translations" into froyo

    kruton committed with Android (Google) Code Review Apr 15, 2010
  2. Import revised translations

    Change-Id: Ifc7e7f52003af7052f0409093114033d61b8ff87
    kruton committed Apr 15, 2010
  3. Using strict projection map

    Change-Id: I36e42e5277e94da754e1c2c0e33d59a4c4018ef3
    dmitriplotnikov committed Apr 14, 2010
Commits on Apr 12, 2010
  1. 1. Rebuild locale related RowHandler when locale was changed

    2. Don't save adjusted full name style into DB.
    
    Bug: 2582391
    
    Change-Id: I7f6720f59cb452ac19cb7fafac5e704c3d51c2bb
    Bai Tao committed Apr 9, 2010
Commits on Apr 7, 2010
  1. Fixing phone number picker in search mode.

    The phone number picker crashes if you
    try to search by something that is neither
    a name nor a phone number, e.g. "&(./"
    
    This is a relatively rare use case for people,
    but very common for monkeys. The main reason to
    fix it now is to allow monkeys to continue running
    and discovering other problems.
    
    Bug: 2473955
    Change-Id: Ib48e324b4d3ced262cc90a67471a35765742eff1
    dmitriplotnikov committed Apr 7, 2010
Commits on Apr 6, 2010
  1. Fixing handling of null sync ID in legacy import. Part II

    There was an issue with the original "fix". I actually ran
    tests against Master and thus did not notice the breakage.
    
    Bug: 2498528
    Change-Id: Ic3d288a5d1d39f1ff9a9bb5a3a048c813f665fbc
    dmitriplotnikov committed Apr 6, 2010