am 2c79efd8
: Merge change I303304ab into eclair
Merge commit '2c79efd82736c4fd9a8351130b9410e9fb23f7f7' into eclair-mr2 * commit '2c79efd82736c4fd9a8351130b9410e9fb23f7f7': changes from Sync Manager API Review: bug 2164262
This commit is contained in:
commit
df002ccfac
@ -59,7 +59,7 @@ public class ContactsSyncAdapterService extends Service {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void performSync(Account account, Bundle extras,
|
||||
public void onPerformSync(Account account, Bundle extras,
|
||||
String authority, ContentProviderClient provider, SyncResult syncResult) {
|
||||
try {
|
||||
ContactsSyncAdapterService.performSync(mContext, account, extras,
|
||||
@ -81,7 +81,7 @@ public class ContactsSyncAdapterService extends Service {
|
||||
|
||||
@Override
|
||||
public IBinder onBind(Intent intent) {
|
||||
return sSyncAdapter.getISyncAdapter().asBinder();
|
||||
return sSyncAdapter.getSyncAdapterBinder();
|
||||
}
|
||||
|
||||
/**
|
||||
|
Loading…
Reference in New Issue
Block a user