diff options
| author | Benergy Meenan Ravuri <bravuri@codeaurora.org> | 2015-12-31 17:37:17 +0530 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-07-02 10:55:01 -0700 |
| commit | 28678cf38af0dd3d01f6e3df6db6b286ab11807b (patch) | |
| tree | e32984ea4d299813d3591a80194b3534a4f34b1b | |
| parent | 35b357b911ebb9eac4ff4f3b003797b243cc25ac (diff) | |
| download | android_frameworks_opt_telephony-28678cf38af0dd3d01f6e3df6db6b286ab11807b.tar.gz android_frameworks_opt_telephony-28678cf38af0dd3d01f6e3df6db6b286ab11807b.tar.bz2 android_frameworks_opt_telephony-28678cf38af0dd3d01f6e3df6db6b286ab11807b.zip | |
IMS: Fix null pointer exception for call forwarding
Check if ICCrecords are present, before setting the call forwarding
flag in ICCrecrods.
Change-Id: I7fe632acd4a9b42caf8c8bf6fee7d2cd97c41102
CRs-Fixed: 955679
| -rw-r--r-- | src/java/com/android/internal/telephony/PhoneBase.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/java/com/android/internal/telephony/PhoneBase.java b/src/java/com/android/internal/telephony/PhoneBase.java index ed169333a..dc790d798 100644 --- a/src/java/com/android/internal/telephony/PhoneBase.java +++ b/src/java/com/android/internal/telephony/PhoneBase.java @@ -1525,7 +1525,10 @@ public abstract class PhoneBase extends Handler implements Phone { public void setVoiceCallForwardingFlag(int line, boolean enable, String number) { setCallForwardingIndicatorInSharedPref(enable); - mIccRecords.get().setVoiceCallForwardingFlag(line, enable, number); + IccRecords r = mIccRecords.get(); + if (r != null) { + r.setVoiceCallForwardingFlag(line, enable, number); + } } protected void setVoiceCallForwardingFlag(IccRecords r, int line, boolean enable, |