Automated import from //branches/master/...@140582,140582

This commit is contained in:
Bjorn Bringert
2009-03-24 17:59:45 -07:00
committed by The Android Open Source Project
parent 71b7797c26
commit f64aff1a20

View File

@@ -172,7 +172,8 @@ public abstract class ContentProvider implements ComponentCallbacks {
public ISyncAdapter getSyncAdapter() {
checkWritePermission(null);
return ContentProvider.this.getSyncAdapter().getISyncAdapter();
SyncAdapter sa = ContentProvider.this.getSyncAdapter();
return sa != null ? sa.getISyncAdapter() : null;
}
private void checkReadPermission(Uri uri) {