commit 99d00f13bbbb02bb4db4fa71afb700eb178a2238
author Paul Westbrook <pwestbro@google.com> Wed Aug 28 09:17:45 2013 -0700
committer Paul Westbrook <pwestbro@google.com> Wed Aug 28 09:17:45 2013 -0700
tree 90a4c70ee984c943f32464638eba755b48d13449
parent 3e3ba3d6cfc787b1d0bb45e76b231da5d12ea9cb

Fix NPE

Bug: 10513216
Change-Id: I2db3957311addcac51dd3df9bd595ee23f973284

src/com/android/exchange/service/CalendarSyncAdapterService.java

diff --git a/src/com/android/exchange/service/CalendarSyncAdapterService.java b/src/com/android/exchange/service/CalendarSyncAdapterService.java
index a6919c5..876b1c4 100644
--- a/src/com/android/exchange/service/CalendarSyncAdapterService.java
+++ b/src/com/android/exchange/service/CalendarSyncAdapterService.java
@@ -68,11 +68,15 @@
      * be put in place at a later time.
      */
     private static void performSync(Context context, Account account, Bundle extras) {
-        ContentResolver cr = context.getContentResolver();
-        boolean logging = Eas.USER_LOG;
+        final ContentResolver cr = context.getContentResolver();
+        final boolean logging = Eas.USER_LOG;
         if (extras.getBoolean(ContentResolver.SYNC_EXTRAS_UPLOAD)) {
-            Cursor c = cr.query(Events.CONTENT_URI,
+            final Cursor c = cr.query(Events.CONTENT_URI,
                     new String[] {Events._ID}, DIRTY_IN_ACCOUNT, new String[] {account.name}, null);
+            if (c == null) {
+                LogUtils.e(TAG, "Null changes cursor in CalendarSyncAdapterService");
+                return;
+            }
             try {
                 if (!c.moveToFirst()) {
                     if (logging) {