History log of /packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
fcc2655b0fca7032fcde306660da303c85125218 04-Mar-2017 Makoto Onuki <omakoto@google.com> Rescan all GAL providers when GAL provider packages have...

been added or removed at startup.

Bug 35388445
Test: adb shell am instrument -w com.android.providers.contacts.tests

Change-Id: Ifc8a9498151e5523e3657cd006e7831d68389f67
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
5177614971a872535c56cba2713e8edc487515ce 15-Dec-2016 Makoto Onuki <omakoto@google.com> Fix failing test am: 640e082744
am: 70e57ed0a7

Change-Id: Ie62a1184e70b381cd9aee5b6054721095359030c
a1f5c57819937d4e9302e0db68211de377f89cc3 15-Dec-2016 Makoto Onuki <omakoto@google.com> Fix unit tests

(Note this contains MR2 failure, Ica46934c too.)

Bug 33589515

Test: adb shell am instrument -w -e size small com.android.providers.contacts.tests
Test: adb shell am instrument -w -e size medium com.android.providers.contacts.tests
Test: adb shell am instrument -w -e size large com.android.providers.contacts.tests
Change-Id: I67af719f60796e3753e67dfd743278953daa2c10
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
640e0827443fbdaed0e402b8af53cdad97d04bc6 14-Dec-2016 Makoto Onuki <omakoto@google.com> Fix failing test

Test: adb shell am instrument -w -e size small com.android.providers.contacts.tests
Test: adb shell am instrument -w -e size medium com.android.providers.contacts.tests
Test: adb shell am instrument -w -e size large com.android.providers.contacts.tests

Bug 33589330

Change-Id: Ica46934cd07c20e6d7b1c8804ebef4e768e10af9
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
fd4b8de05ffcd78e65f27763eade96f186c368b6 06-Oct-2016 Makoto Onuki <omakoto@google.com> Support making a "snapshot" of databases during tests.

- We normally use in-memory DBs in unit tests because that's faster.
Add a flag to switch to file-based DBs so we can copy them.

- Also cleaned up the getDatabaseHelper() methods -- we had two,
one with no arguments and the other without, and it wasn't clear
which ones should be used when. Now the one that takes a context
is renamed to make it clear the distinction.

Test: run-all-tests.sh with and without the flag set.

Change-Id: I376674a94e35a3314d91813debbeee5b3814f4a9
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
0220fa1c7b231796c250af2d9dd5750ae84771f6 06-Sep-2016 Makoto Onuki <omakoto@google.com> Fix thread leaks in unit tests

Now all the tests can be run with a single command:
$ adb shell am instrument -w com.android.providers.contacts.tests

Bug 26253504

Change-Id: I46bc7c54e4812e6171fb2078f21c1460b4734c96
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
f3bd980c0ec03db2538e86cadee2c1559f02c85b 12-Jan-2016 Makoto Onuki <omakoto@google.com> [FBE] Introduce shadow calllog provider [2/2]

Introduce a new provider that's a clone of the calllog provider but
is EA.

The provider is hidden and requires MANAGE_USERS to access, and responsible
for storing calllog entries that are inserted when the real provider is still
encrypted. When the real provider starts, it copies the entries from the shadow
as well as user-0's real provider, and clears the shadow.

Also fix b/26516259

Bug 26183949

Change-Id: If44b46709e2e7b1651b41c09d900e1cb2777dc56
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
9be8c68e62112d607d0f31066df8c0b9c9587340 14-Jan-2016 Victor Chang <vichang@google.com> Merge "Create a new device policy for controlling work contacts search"
6040ab71df843cbb9562ded8b819bfff1c0d9838 05-Jan-2016 Victor Chang <vichang@google.com> Create a new device policy for controlling work contacts search

Extra things:
1. fixed b/26399207
2. ContactsActor.java is changed to avoid failed unit test
because of using getSystemService(serviceClass) in EnterprisePolicyGuard
3. Make ContactsProvider2.sUriMatcher and all uri codes public

BUG=25981902, 26399207

Change-Id: I0025b809a39ff31663a15cfbcdfd087a98187c44
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
dc653a5c1bed274512ce41e4a6129a65d2b0eeac 22-Dec-2015 Makoto Onuki <omakoto@google.com> Move CallLog and VoiceMailStatus to their own DB.

- Move the "calls" and "voicemail_status" tables to the new
"calllog.db" database.

- Migrate all data into it.

- Remove the old tables in contacts2.db

- VoicemailContract.Status.SOURCE_PACKAGE is no longer UNIQUE

Bug 26247586

Change-Id: I003d49b8fb150c21a34830bc62e8c816ce2cd8cd
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
f2d3e8cb095348535e5ad3b9babccfa15bc31257 17-Dec-2015 Makoto Onuki <omakoto@google.com> Add isSameProfileGroup() to mock user manager

Change-Id: I1debe47360d440852fa3d722cc19d83142171821
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
c19d5519535bc05225eac5f7dfb830fda48497de 15-May-2015 Makoto Onuki <omakoto@google.com> Fix unit tests

- PhotoPriorityResolverTest
Now the mock sync adapter needs an intent filter

- LegacyContactsProviderTest
The authority check in ContentProvider got tightened, which broke our test because
we didn't set up the multiple authorities correctly.

Change-Id: Iab1eed24434bd159a99f0b794a7756554dc02281
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
400e50c1efeb601f6162bd829fdf33e9dc5252f6 13-May-2015 Makoto Onuki <omakoto@google.com> Clean up permissions

- All permission checks now always pass if the caller is self.
- Remove uses-permissions that're enforced by self.

Bug 20927020

Change-Id: I985338495ed947d317f37e1a8d674a40c5e6bfe4
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
3a219cc3f5045bdebfcd975bf857c6ff26886a22 25-Oct-2014 Yorke Lee <yorkelee@google.com> Sync call log entries to secondary user on background thread

Add code (similar to CP2) to offload tasks onto a background thread. This
is a bit overkill for now but will be useful when we add stuff like call
log syncing.

Also add some new methods to MockUserManager needed to pass tests.

Bug: 18056687
Change-Id: If51f64895d16029ecca1d1c46573324891e1d4d0
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
71142b333418ac7d589bd7522dad77b967f0bbe1 02-Sep-2014 Makoto Onuki <omakoto@google.com> Fix testPhoneLookupEnterprise_withCorpProfile

- Don't add "userid@" to the provider authority when setting up the
secondary cp2 for the corp profile.

Bug 17357026

Change-Id: Ife0265ee71c1fb28af87fc09763b1e53584ee358
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
9701936fadaf55ef773dd07015b35f99fd5f8a91 07-Aug-2014 Makoto Onuki <omakoto@google.com> Add unit tests for enterprise caller-id

Also fix a few issues:
- Fix projection map for phone_lookup/enterprise and add PHOTO_FILE_ID
- Null out custom ringtones from the corp CP2. Returning rintones in the corp
profile really doesn't make sense.
- Fix a log in queryPhoneLookupEnterprise().

Change-Id: If0617225228c526d4b7d87e9c95f6fbe090242a0
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
b0828df351e8b261ab36c8af37929bf3d9d6a4f9 17-Jul-2014 Makoto Onuki <omakoto@google.com> Check DPM.getCrossProfileCallerIdDisabled in caller-id

- Also add a test for UserUtils
- Also fix broken tests due to UserUtils.

Bug 16467654
Bug 15779911
Bug 16458399

Change-Id: I64a4526b512fce94590b75eae037a8bdcd874064
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
6800627f331da6be1ea7cc82202eb6d94588c44f 27-Feb-2013 Dianne Hackborn <hackbod@google.com> Call new init function to use for testing, to turn off app ops.

Change-Id: I81c749401c54c9f3facc921b7bc4e778a33ea22e
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
0bdbe752c3c0cbbef2acb4eca74642aec9195d88 12-Sep-2012 Makoto Onuki <omakoto@google.com> Send a broadcast when profile changes

Bug 7148705

Change-Id: I3df22b7fc18a106f221f022f222d8fee566a24af
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
38210445730ee04c351c7cc1b3800cfe23e34325 27-Jun-2012 Makoto Onuki <omakoto@google.com> Reorganize import in contacts provider

Change-Id: If3afb134ea36bd93859efcd114885526e1592b91
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
35997f3fdee2984b6d5373326110eda26929001a 06-Feb-2012 Makoto Onuki <omakoto@google.com> Cache fast scrolling index.

The cache content is also stored in the shared preferences.

The cache is invalidated when:
- contacts (or profile), raw_contacs, or data is modifiled.
- accounts are changed. (Strictly speaking we have to do this only when
an account is being removed, but not when added. But let's just always do this
for just in case.)
- visible contacts are updated; i.e. when custom filter is udpated.
- the locale changes.

Change-Id: I70cfe7c88d3b1a0a0f820338acbe885c136b6e10
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
212975b9dbb3c164e11732b98266eb7361e27ac5 22-Oct-2011 Makoto Onuki <omakoto@google.com> Fix test crash in ContactsProvider2.initialize().

Seems like Secure.getLong() (and other methods) internally tries to get
the Settings provider from the passed context when it's called first time,
and it crases in tests because our mock context doesn't have it.

Let's just call it with an actual contxext when tests start so it'll initialize
the settings provider correctly.

Bug 5499268

Change-Id: I863862ead2078715621cb71b1cf15f0dd94c0feb
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
eeffa7edb048e785ebc665c830dc84d87f174b07 04-Aug-2011 Debashish Chatterjee <debashishc@google.com> Allow read-only sharing of Uri in voicemail content provider.

Since we perform our own permission check, uri permission check
done by the content resolver is not sufficient. Our implementation of
the content provider should also explicitly check for uri level permission.

This is needed to allow sharing of voicemail uri from the contacts app.

In a follow up change we will allow sharing of URIs only to those apps that has
ALL permission. Right now the provider definition does not allow sharing
of uri.

Bug: 4961053
Change-Id: I5af53ee76ea10fa5f45c8cdcb95c773cc7ad138e
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
f547fd54d7933e1c03af4a8dc10560c71c38f6b8 27-Jun-2011 Dave Santoro <dsantoro@google.com> Large photo storage.

This change adds support for storing large photos for contacts in the
file system. Large photos passed to the provider will be downscaled
and re-encoded as JPEGs before being stored in the usual data BLOB
field (for the thumbnail) and in the photo store (for the display
photo).

See go/large-photo-design for details.

Change-Id: I26a69ac2ccba631962a3ac5c83edb3f45d7cfc7f
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
ed6bfd922fd84db21de08c1d12e93c501b86560d 11-Jul-2011 Daniel Lehmann <lehmannd@google.com> Remove restricted white-listing

Bug:4974334
Change-Id: I4dd95089774373d2b67d7e14dc6b7fc40a92d094
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
3b505de6c622d20d40b85b361c1437a89aef82de 08-Jul-2011 Daniel Lehmann <lehmannd@google.com> Provider implementation of stream item API.

The following URIs are supported:
contacts/#/stream_items (query stream items by contact ID)
contacts/lookup/*/stream_items (query stream items by lookup key)
contacts/lookup/*/#/stream_items (query stream items by both)
raw_contacts/#/stream_items (query/insert stream items by raw contact ID)
stream_items (query/insert/update/delete stream items)
stream_items/photo (query/insert/update stream items)
stream_items/# (query/update/delete stream items by ID)
stream_items/#/photo (query/insert/delete stream item photos)
stream_items/#/photo/# (query/update/delete stream item photos by IDs)
stream_items_limit (query limits for stream items and photos)

Change-Id: Ice433c53e18087e5e6295ad9a112062d44b12dd2
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
24c1d384b45a6d3c1cc959062a9d4308335fabbf 28-May-2011 Dave Santoro <dsantoro@google.com> URIs and queries to support profiles.

This change includes:
- A database upgrade to support tracking whether a contact represents the
user's profile (represented as an optional raw contact ID specified
per-account, and looked up in the various views).
- New Contact Provider URIs for retrieving profile-specific data:
- profile: To retrieve the user's profile contact.
- profile/data: To retrieve data for the user's profile contact.
- profile/data/#: To retrieve data for a specific data entry for the user's
profile entry, by data ID.
- profile/entities: To select entities for the user's profile.
- profile/as_vcard: To retrieve the profile as a VCard.
- profile/raw_contacts: To retrieve or insert raw contacts for the user's
profile.
- profile/raw_contacts/#: To retrieve a specific raw contact entry for the
user's profile, by raw contact ID.
- profile/raw_contacts/#/data: To retrieve data for a specific raw contact
entry for the user's profile, by raw contact ID.
- profile/raw_contacts/#/entity: To retrieve raw contact entities for a
specific raw contact entry for the user's profile, by raw contact ID.
- Permission checks to ensure that any access to profile data (whether
explicitly through the above URIs or directly via ID) enforces READ_PROFILE
or WRITE_PROFILE access.
- New and updated tests (including permission check cases for all of the above,
plus query checks for each).

I've also had to move a few large tests to medium to work around
b/3329504. I've also removed the database close step from contacts provider
test teardowns, as it doesn't seem to be necessary, and results in almost a 3x
performance boost on test runs.

Change-Id: I220552c26ad1eb3fbf24fdd865df2fe59fe4a688
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
bf732767b4d4d7104e4723bda7d3b0eb0f909997 02-Dec-2010 Dmitri Plotnikov <dplotnikov@google.com> Moving initialization and callbacks to background

Bug: 3228684
Change-Id: I7fab53092dbf55ebb502bc5d4d2012c88842c8b8
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
89b7c2b6e0003b17d08002f02d6aeec9f9788c8d 30-Nov-2010 Dmitri Plotnikov <dplotnikov@google.com> Fixing LegacyContactImporterTest

Bug: 3240203
Change-Id: Ib733141a31c648437fa5d7171e0bfd22a4911c0f
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
f65b12455184bc69c45634586ab5fd3234ad98d7 23-Oct-2010 Dmitri Plotnikov <dplotnikov@google.com> resolved conflicts for merge of 47fd3881 to master

Change-Id: I35ea513b8f0c0694d9afa6095aa718e1624eab5f
47fd3881dfd2a21de29e917b6114974ff0a67b1b 22-Oct-2010 Dmitri Plotnikov <dplotnikov@google.com> 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
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
e0e24418cba10a5184e2966aaa32d5458fa6a387 22-Oct-2010 Dmitri Plotnikov <dplotnikov@google.com> Backing up cached resource IDs with resource names

During an OTA or an adb sync some resource IDs may
change without an android.intent.action.PACKAGE_* broadcast.

We will now verify resource IDs against their names
and if anything does not match, rescan all packages.

Bug: 3117701
Change-Id: I293c5578b7092482e8dd4637554831f3e6f93cc1
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
72e3003a810fb4793a1513d17a40f8ab83d7d0af 05-Aug-2010 Dmitri Plotnikov <dplotnikov@google.com> Introducing ContactDirectoryManager

Changing the contact directory registration protocol.
Now directory providers are mostly passive,
ContactsProvider2 is in control.

Change-Id: I93815f7dc0a30fde35d70c5fd48bb1a924076ff5
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
d3d812af96f7d77e13dc60652626b39f25907147 07-Jun-2010 Dmitri Plotnikov <dplotnikov@google.com> Initial implementation of the directory API

Change-Id: If8cb0a1fc32dba0ac47502d9f86b43e0e0add8b8
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
d806946b6561dca3f34ded156c6ee89a5113996e 05-Mar-2010 Dmitri Plotnikov <dplotnikov@google.com> Preventing Chinese shorthand keys from being inserted for non-Chinese contacts.

Bug: 2488839
Change-Id: I0999284fb2eb651af7c3cb00d3f991ab157a3b28
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
5dd6d5d4acb93adc05f1fde904080787f2397f51 21-Dec-2009 Dmitri Plotnikov <dplotnikov@google.com> Resubmit: Adding support for new Contacts columns for names and sorting

This is in preparation for fixing bugs:
Bug: 2075641
Bug: 2021660
Bug: 2164422
Bug: 2267198

Change-Id: I7696abe8c8fd17d8854632cc8e818b9e4d2e643c
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
bca1c8b44f99528fc123d5547723e44771e8e934 21-Dec-2009 Mike Lockwood <lockwood@android.com> Revert "Merge change Ief95261a"

This reverts commit 003009d47e893df100d4020c708296b23c03d28f, reversing
changes made to 5b3b3ec368625c07a2c94d2199a75099d4d9b8a9.
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
b0812f94fa50c54d06978cdd65651a487c717dff 19-Dec-2009 Dmitri Plotnikov <dplotnikov@google.com> Adding support for new Contacts columns for names and sorting

This is in preparation for fixing bugs:
Bug: 2075641
Bug: 2021660
Bug: 2164422
Bug: 2267198

Change-Id: Ief95261a0f4e2c78b216a842cad47f42ef2935c2
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
fcbe2c631781d3a0fd05e9af4be8d9a92cf7cdb6 16-Oct-2009 Dmitri Plotnikov <dplotnikov@google.com> Fixing tests broken by jsharkey in CL https://android-git.corp.google.com/g/#change,29785

Change-Id: I77b08853a5acc79876caffb24eb163f6f0407e57
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
1d9c0e17216ff6df5f73fbc5e784b5965c5026bd 13-Oct-2009 Jeff Sharkey <jsharkey@android.com> Unit tests to verify IS_RESTRICTED security mechanisms.

Partially fixes http://b/2148997
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
6bc46c9f22aaa9e68f344b171426fc686d3b536a 10-Sep-2009 Dmitri Plotnikov <dplotnikov@google.com> Fixing broken tests in ContactsProvider2
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
f992bfab334b760d36a053fc0b439382dcfb51ad 12-Aug-2009 Dmitri Plotnikov <dplotnikov@google.com> Removing handling of primary phone/email on Contact.

Adding code to compute HAS_PHONE_NUMBER on a Contact.
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
e99988b266dd1263162583e81e2b408e7329b1c8 29-Jul-2009 Dmitri Plotnikov <dplotnikov@google.com> Extracting call log implementation out of the legacy contacts provider.
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
d3fde755e73cd3912a488e7cb7d412d3c5f6ca94 28-Jul-2009 Dmitri Plotnikov <dplotnikov@google.com> ContactsProvider2: Renaming Aggregates to Contacts
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
5ef0401c311c62e53bde415b99cbb0ff83b0a9a2 28-Jul-2009 Dmitri Plotnikov <dplotnikov@google.com> ContactsProvider2: Renaming CONTACT_ID to RAW_CONTACT_ID
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
6cffee46a1334d2b3ed19f436b27638451541044 27-Jul-2009 Dmitri Plotnikov <dplotnikov@google.com> Changing Contacts to RawContacts.

The renaming will be done in baby steps and in the
order of priorities.

Step 1: Contacts->RawContacts and deprecate Contacts
Step 2: Once all is converted, remove Contacts
Step 3: Aggregates->Contacts, including comments in the API
Step 4: Tables and fields
Step 5: Comments in the implementation code

Intermediate steps will be pretty ugly, but the result will be glamorous. I hope you are all still ok with "RawContacts"
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
67dde51ab932dc84d95a203b113989b13437f13d 21-Jul-2009 Jeff Sharkey <jsharkey@android.com> Hard-coded IS_RESTRICTED exceptions, move to RES_PACKAGE.

The current RestrictionException API wasn't final enough to
reveal in the next platform release, and is only being used
by a single party. In addition, the original approach
required the sync adapter to assert any granted exceptions
during each update pass. There was also additional overhead
of watching for PACKAGE_ADDED and PACKAGE_REMOVED broadcasts
for clearing any applicable exceptions.

Finally, since this is a critical security element, we
really wanted to avoid storing the exceptions in another
SQL table that may be altered through an unknown SQL
attack vector. For now, the packages granted IS_RESTRICTED
access should be manually entered in sAllowedPackages.

This change also cleans up some projection mappings, and
minor fixed to prepare for a pending framework change.
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
3cebbf7141252768d3e272e049e9c5b0cb9d710e 17-Jul-2009 Dmitri Plotnikov <dplotnikov@google.com> Work in progress: introducing DataRowHandlers in ContactsProvider2.

1. Introducing DataRowHandlers
2. Adding DISPLAY_NAME to Contact for maintaining
a backwards compatible behavior
3. Implementing compatible DISPLAY_NAME behavior
4. Fixing handling of null display name
5. Implementing primary Organization
6. Implementing compatibility mode for Organization
7. Adding "delete" to compatibility support
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
bee1a6b2e7cbea778195890e442c9e50f2a4e6d9 11-Jul-2009 Dmitri Plotnikov <dplotnikov@google.com> Initial cut of legacy public API unit test.
/packages/providers/ContactsProvider/tests/src/com/android/providers/contacts/ContactsActor.java
28f8857b1b46bde18b85c6d3c2a63ac44c3c2e1c 08-Jul-2009 Evan Millar <emillar@google.com> Merge commit 'goog/eclair-dev' into merge3

Merged the new contacts content provider into goog/master. The old and
new content providers now live side by side under separate authorities.

Conflicts:
Android.mk
AndroidManifest.xml
res/values/strings.xml