aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFred Quintana <fredq@google.com>2009-09-25 14:53:00 -0700
committerFred Quintana <fredq@google.com>2009-09-25 15:02:30 -0700
commita3bd0246ca3741877488bca7aadd91c79b2fd8d2 (patch)
tree27e0fd00c6d36267c66d4a2f5c5501fcf64679e4 /src
parentbba785deb78d0c75e83492dc8aa9e2ff6165b227 (diff)
downloadContactsProvider-a3bd0246ca3741877488bca7aadd91c79b2fd8d2.tar.gz
request a sync when the database is created
Diffstat (limited to 'src')
-rw-r--r--src/com/android/providers/contacts/OpenHelper.java14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/com/android/providers/contacts/OpenHelper.java b/src/com/android/providers/contacts/OpenHelper.java
index 2c517bab..93d8d0e7 100644
--- a/src/com/android/providers/contacts/OpenHelper.java
+++ b/src/com/android/providers/contacts/OpenHelper.java
@@ -20,6 +20,7 @@ import com.android.internal.content.SyncStateContentProviderHelper;
import android.content.ContentValues;
import android.content.Context;
+import android.content.ContentResolver;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
@@ -32,7 +33,9 @@ import android.database.sqlite.SQLiteOpenHelper;
import android.database.sqlite.SQLiteQueryBuilder;
import android.database.sqlite.SQLiteStatement;
import android.os.Binder;
+import android.os.Bundle;
import android.provider.BaseColumns;
+import android.provider.ContactsContract;
import android.provider.CallLog.Calls;
import android.provider.ContactsContract.AggregationExceptions;
import android.provider.ContactsContract.Contacts;
@@ -1161,6 +1164,9 @@ import java.util.HashMap;
// taken into account. Make a note of it and do the actual reopening in the
// getWritableDatabase method.
mReopenDatabase = true;
+
+ ContentResolver.requestSync(null /* all accounts */,
+ ContactsContract.AUTHORITY, new Bundle());
}
@Override
@@ -1198,12 +1204,6 @@ import java.util.HashMap;
db.execSQL("DROP TABLE IF EXISTS " + Tables.AGGREGATION_EXCEPTIONS + ";");
onCreate(db);
- // TODO: eventually when this supports upgrades we should do something like the following:
-// if (!upgradeDatabase(db, oldVersion, newVersion)) {
-// mSyncState.discardSyncData(db, null /* all accounts */);
-// ContentResolver.requestSync(null /* all accounts */,
-// mContentUri.getAuthority(), new Bundle());
-// }
}
/**
@@ -1433,7 +1433,7 @@ import java.util.HashMap;
DatabaseUtils.bindObjectToProgram(mContactIdQuery, 1, rawContactId);
return mContactIdQuery.simpleQueryForLong();
} catch (SQLiteDoneException e) {
- // No valid mapping found, so return -1
+ // No valid mapping found, so return 0
return 0;
}
}