tree 3d5b380c7f8d097275759a9c6e2ed12e827bd77e
parent 0f6846dba87868a5bd020bfaeffc3f37e1441af3
author Hall Liu <hallliu@google.com> 1502921111 -0700
committer Hall Liu <hallliu@google.com> 1502921891 -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