diff options
| author | Tom Taylor <tomtaylor@google.com> | 2010-04-28 10:49:02 -0700 |
|---|---|---|
| committer | Tom Taylor <tomtaylor@google.com> | 2010-04-28 10:49:02 -0700 |
| commit | f899bce945a70990c9511ce4d26f856d8adf1e04 (patch) | |
| tree | 111f2fe636f6dcf9c2ccb5558029fe45ea20d16f | |
| parent | 2e2a345aef4045479289871e20215d11853ed103 (diff) | |
| download | Mms-f899bce945a70990c9511ce4d26f856d8adf1e04.tar.gz | |
Fix cursor null-refs
Found by the devious and relentless monkey. Bug 2631640
Change-Id: If45ce4f5e42b25b2b0e69cedfd03f1b4c359c2b5
| -rw-r--r-- | src/com/android/mms/ui/ConversationList.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/mms/ui/ConversationList.java b/src/com/android/mms/ui/ConversationList.java index ae31f835..2707fc88 100644 --- a/src/com/android/mms/ui/ConversationList.java +++ b/src/com/android/mms/ui/ConversationList.java @@ -370,7 +370,7 @@ public class ConversationList extends ListActivity public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) { Cursor cursor = mListAdapter.getCursor(); - if (cursor.getPosition() < 0) { + if (cursor == null || cursor.getPosition() < 0) { return; } Conversation conv = Conversation.from(ConversationList.this, cursor); @@ -399,7 +399,7 @@ public class ConversationList extends ListActivity @Override public boolean onContextItemSelected(MenuItem item) { Cursor cursor = mListAdapter.getCursor(); - if (cursor.getPosition() >= 0) { + if (cursor != null && cursor.getPosition() >= 0) { Conversation conv = Conversation.from(ConversationList.this, cursor); long threadId = conv.getThreadId(); switch (item.getItemId()) { |