tree b0804482494f3d2887be8a4492965e5a6d352552
parent fa1bef43f913fa551e554f12e2da6ef644de4d7c
author Hall Liu <hallliu@google.com> 1502921111 -0700
committer Hall Liu <hallliu@google.com> 1502921293 -0700

Fix two NPEs in TelephonyConnection

1. A trinary condition was screwed up and not doing a null check
properly
2. Add a null check in refreshConferenceSupported

Change-Id: Ib0a0d6c19b5e473e7c3c5ab8d1148142ae677ffa
Fixes: 35380056
Fixes: 64734432
Test: manual