commit a02d0d60204b94f88da4896f7dcfa8d58dca5c43
author Karl Rosaen <krosaen@google.com> Wed Aug 05 09:44:06 2009 -0700
committer Karl Rosaen <krosaen@google.com> Wed Aug 05 10:35:00 2009 -0700
tree 10087ee4e7c4b0014b4cd4bf98409f0e2e9e1193
parent 94e114c951008c831d1a31a2e6773fb40e4e9392

Guard against remote process dying when retrieving column from cursor.

Fixes bug 2035791.

core/java/android/app/SuggestionsAdapter.java

diff --git a/core/java/android/app/SuggestionsAdapter.java b/core/java/android/app/SuggestionsAdapter.java
index 4a00e485..bd4e66e 100644
--- a/core/java/android/app/SuggestionsAdapter.java
+++ b/core/java/android/app/SuggestionsAdapter.java
@@ -658,7 +658,14 @@
         if (col == NONE) {
             return null;
         }
-        return cursor.getString(col);
+        try {
+            return cursor.getString(col);
+        } catch (Exception e) {
+            Log.e(LOG_TAG,
+                    "unexpected error retrieving valid column from cursor, "
+                            + "did the remote process die?", e);
+            return null;
+        }
     }
 
 }