Merge "Fix a NPE when update message status"

1 files changed, 3 insertions, 1 deletions

diff --git a/src/com/android/mms/transaction/MessageStatusService.java b/src/com/android/mms/transaction/MessageStatusService.java
index 35a500a9..f9c8af20 100644
--- a/src/com/android/mms/transaction/MessageStatusService.java
+++ b/src/com/android/mms/transaction/MessageStatusService.java
@@ -103,7 +103,9 @@ public class MessageStatusService extends IntentService {
             } else {
                 error("Can't find message for status update: " + messageUri);
             }
-        } finally {
+        }catch(NullPointerException e){
+            return null;
+        }finally {
             cursor.close();
         }
         return message;