diff options
| author | Bjorn Bringert <> | 2009-03-24 17:57:22 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-24 17:57:22 -0700 |
| commit | 9e728e082e6060612691b726e6fe264a0d37276f (patch) | |
| tree | 0fd7f1f01e73702de811cdb4f7bdcca8ef5bff6d /core/java/android/content/ContentProvider.java | |
| parent | bd8f9072310fa63ad858287bac6c439d2f299d7c (diff) | |
| download | frameworks_base-9e728e082e6060612691b726e6fe264a0d37276f.zip frameworks_base-9e728e082e6060612691b726e6fe264a0d37276f.tar.gz frameworks_base-9e728e082e6060612691b726e6fe264a0d37276f.tar.bz2 | |
Automated import from //branches/donutburger/...@140581,140581
Diffstat (limited to 'core/java/android/content/ContentProvider.java')
| -rw-r--r-- | core/java/android/content/ContentProvider.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/content/ContentProvider.java b/core/java/android/content/ContentProvider.java index 25544de..5cc5730 100644 --- a/core/java/android/content/ContentProvider.java +++ b/core/java/android/content/ContentProvider.java @@ -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) { |