commit 1ddb185c7fefaa2c5a185b552bf869c0153c327b
author Omata Shou <shou.omata@sony.com> Wed May 17 19:52:07 2017 +0900
committer takeshi tanigawa <takeshi.tanigawa@sony.com> Fri Sep 22 08:08:51 2017 +0000
tree 9af7a245ffdae02628b4285fd2d833b68f4bb11a
parent 80ccafe55e3bfe9bf6fcd46162f32402fc38b10b

Fix crash issue due to NPE when two calls are merged

NPE occurs when a ViLTE call in hold state and a VoLTE
call in active state are merged. Because an original
connection is cleared once when two calls are merged.
After that, the released original connection is referred
during setting video state.

Fixed to add null check in shouldSetDisableAddCallExtra.

Test: manual - Checked that no crash occurred when a ViLTE call in
hold state and a VoLTE call in active state are merged.
Bug: 66592790

Change-Id: I9101116ba7ef424599ca043d574a30930288d22c