diff options
| author | Brian Attwell <brianattwell@google.com> | 2015-01-07 18:25:58 -0800 |
|---|---|---|
| committer | Brian Attwell <brianattwell@google.com> | 2015-01-08 16:27:15 -0800 |
| commit | e05d1118d89cdbfc9bc0558d04af3ca3b2c6a508 (patch) | |
| tree | 2b131d21a461fafdbbb3ad949aefd83fc407c8a9 /src/com | |
| parent | 3a809797c1f1b744f63d298bcb060fbb7fc589e2 (diff) | |
| download | packages_providers_ContactsProvider-e05d1118d89cdbfc9bc0558d04af3ca3b2c6a508.zip packages_providers_ContactsProvider-e05d1118d89cdbfc9bc0558d04af3ca3b2c6a508.tar.gz packages_providers_ContactsProvider-e05d1118d89cdbfc9bc0558d04af3ca3b2c6a508.tar.bz2 | |
Ubundle from contacts contract Part 2/3
Remove ProviderStatus.DATA1
Discussion: go/contacts-contact-intent-ui
Bug: 18777272
Change-Id: I9c6125cc30710e4637b38f3785608abb9928d1a2
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/providers/contacts/ContactsProvider2.java | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java index f36bed8..aa804c3 100644 --- a/src/com/android/providers/contacts/ContactsProvider2.java +++ b/src/com/android/providers/contacts/ContactsProvider2.java @@ -1410,7 +1410,6 @@ public class ContactsProvider2 extends AbstractContactsProvider private int mProviderStatus = ProviderStatus.STATUS_NORMAL; private boolean mProviderStatusUpdateNeeded; - private long mEstimatedStorageRequirement = 0; private volatile CountDownLatch mReadAccessLatch; private volatile CountDownLatch mWriteAccessLatch; private boolean mAccountUpdateListenerRegistered; @@ -2145,14 +2144,6 @@ public class ContactsProvider2 extends AbstractContactsProvider @Override public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) { - if (mWriteAccessLatch != null) { - // Update on PROVIDER_STATUS used to be used as a trigger to re-start legacy contact - // import. Now that we no longer support it, we just ignore it. - int match = sUriMatcher.match(uri); - if (match == PROVIDER_STATUS) { - return 0; - } - } waitForAccess(mWriteAccessLatch); // Enforce stream items access check if applicable. @@ -6393,8 +6384,8 @@ public class ContactsProvider2 extends AbstractContactsProvider case PROVIDER_STATUS: { return buildSingleRowResult(projection, - new String[] {ProviderStatus.STATUS, ProviderStatus.DATA1}, - new Object[] {mProviderStatus, mEstimatedStorageRequirement}); + new String[] {ProviderStatus.STATUS}, + new Object[] {mProviderStatus}); } case DIRECTORIES : { |