diff options
| author | Roman Birg <roman@cyngn.com> | 2016-08-11 11:23:05 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-09-02 11:00:42 -0700 |
| commit | 40928162411343c9567bea2dc8ed37ac56e7d5c2 (patch) | |
| tree | b5f1889fd6bb29046671ab75fc5b159f72919127 | |
| parent | 26de2377e1a3becfdeb22720835a34b96e32e161 (diff) | |
| download | android_frameworks_opt_telephony-40928162411343c9567bea2dc8ed37ac56e7d5c2.tar.gz android_frameworks_opt_telephony-40928162411343c9567bea2dc8ed37ac56e7d5c2.tar.bz2 android_frameworks_opt_telephony-40928162411343c9567bea2dc8ed37ac56e7d5c2.zip | |
Telephony: fix SMS NPE
Ticket: CYNGNOS-1094
Change-Id: Ia3c4327a185e4c182a4e4ad6c91c01fd0e62a3aa
Signed-off-by: Roman Birg <roman@cyngn.com>
| -rw-r--r-- | src/java/android/telephony/SmsMessage.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/java/android/telephony/SmsMessage.java b/src/java/android/telephony/SmsMessage.java index 03676b793..bf04c3d11 100644 --- a/src/java/android/telephony/SmsMessage.java +++ b/src/java/android/telephony/SmsMessage.java @@ -609,7 +609,7 @@ public class SmsMessage { * Returns the service centre timestamp in currentTimeMillis() format */ public long getTimestampMillis() { - return mWrappedSmsMessage.getTimestampMillis(); + return mWrappedSmsMessage != null ? mWrappedSmsMessage.getTimestampMillis() : 0; } /** |