From eb785fa71a4b2c83158fbde42ec515bbbfe356fb Mon Sep 17 00:00:00 2001
From: Dianne Hackborn <>
Date: Tue, 24 Mar 2009 20:27:03 -0700
Subject: [PATCH] Automated import from //branches/master/...@141518,141518

---
 .../java/com/android/internal/database/SortCursor.java | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/core/java/com/android/internal/database/SortCursor.java b/core/java/com/android/internal/database/SortCursor.java
index af0efc9195cf0..99410bcaa478a 100644
--- a/core/java/com/android/internal/database/SortCursor.java
+++ b/core/java/com/android/internal/database/SortCursor.java
@@ -253,7 +253,15 @@ public class SortCursor extends AbstractCursor
         if (mCursor != null) {
             return mCursor.getColumnNames();
         } else {
-            return new String[0];
+            // All of the cursors may be empty, but they can still return
+            // this information.
+            int length = mCursors.length;
+            for (int i = 0 ; i < length ; i++) {
+                if (mCursors[i] != null) {
+                    return mCursors[i].getColumnNames();
+                }
+            }
+            throw new IllegalStateException("No cursor that can return names");
         }
     }