diff options
| author | Bjorn Bringert <> | 2009-03-24 17:59:45 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-24 17:59:45 -0700 |
| commit | f64aff1a20c7a8da78fbeaf277bf8b39a5557fc1 (patch) | |
| tree | 49c184e1183dd7dd9f02f5969642152c53edb5cb /core/java/android/content/ContentProvider.java | |
| parent | 71b7797c26ffa1cd5c2351995702517c6bfb44d2 (diff) | |
| download | frameworks_base-f64aff1a20c7a8da78fbeaf277bf8b39a5557fc1.zip frameworks_base-f64aff1a20c7a8da78fbeaf277bf8b39a5557fc1.tar.gz frameworks_base-f64aff1a20c7a8da78fbeaf277bf8b39a5557fc1.tar.bz2 | |
Automated import from //branches/master/...@140582,140582
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) { |