Merge change 23709 into eclair
* changes: Put in temporary code to prevent contacts upsync based on Gservices setting
This commit is contained in:
commit
d1d87b4dc9
@ -1538,6 +1538,11 @@ public class ContactsSyncAdapter extends AbstractSyncAdapter {
|
||||
return false;
|
||||
}
|
||||
|
||||
// TODO REMOVE THIS HACK THAT PREVENTS UPLOAD BASED ON GSERVICES SETTING
|
||||
if (android.provider.Settings.Gservices.getInt(cr, "contacts_v3_upsync_enabled", 0) == 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
try {
|
||||
// Get them all atomically
|
||||
EntityIterator ei = cr.queryEntities(uri, RawContacts.DIRTY + "=1", null, null);
|
||||
|
Loading…
Reference in New Issue
Block a user