From 3fb85e16d931054784ea883beaa89715a1823750 Mon Sep 17 00:00:00 2001
From: Roman Birg <roman@cyngn.com>
Date: Thu, 11 Aug 2016 11:23:05 -0700
Subject: Telephony: fix SMS NPE

Ticket: CYNGNOS-1094

Change-Id: Ia3c4327a185e4c182a4e4ad6c91c01fd0e62a3aa
Signed-off-by: Roman Birg <roman@cyngn.com>
---
 src/java/android/telephony/SmsMessage.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/java/android/telephony/SmsMessage.java b/src/java/android/telephony/SmsMessage.java
index bb0553a00..9dc577674 100644
--- a/src/java/android/telephony/SmsMessage.java
+++ b/src/java/android/telephony/SmsMessage.java
@@ -624,7 +624,7 @@ public class SmsMessage {
      * Returns the service centre timestamp in currentTimeMillis() format
      */
     public long getTimestampMillis() {
-        return mWrappedSmsMessage.getTimestampMillis();
+        return mWrappedSmsMessage != null ? mWrappedSmsMessage.getTimestampMillis() : 0;
     }
 
     /**
-- 
cgit v1.2.3