aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoman Birg <roman@cyngn.com>2016-08-11 11:23:05 -0700
committerMichael Bestas <mikeioannina@gmail.com>2017-01-07 01:41:44 +0200
commit3fb85e16d931054784ea883beaa89715a1823750 (patch)
tree519d8544eee4bd4ffdbacb3f1c0e7d884813608d
parent74414b80cebac5d3e6daff5bc7a561ecf363748a (diff)
downloadandroid_frameworks_opt_telephony-3fb85e16d931054784ea883beaa89715a1823750.tar.gz
android_frameworks_opt_telephony-3fb85e16d931054784ea883beaa89715a1823750.tar.bz2
android_frameworks_opt_telephony-3fb85e16d931054784ea883beaa89715a1823750.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.java2
1 files changed, 1 insertions, 1 deletions
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;
}
/**