From f64aff1a20c7a8da78fbeaf277bf8b39a5557fc1 Mon Sep 17 00:00:00 2001
From: Bjorn Bringert <>
Date: Tue, 24 Mar 2009 17:59:45 -0700
Subject: [PATCH] Automated import from //branches/master/...@140582,140582

---
 core/java/android/content/ContentProvider.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/java/android/content/ContentProvider.java b/core/java/android/content/ContentProvider.java
index 25544deac10d1..5cc5730c098f3 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) {