commit 76855c20de037a38b02716642cd27be674772f2d
author Makoto Onuki <omakoto@google.com> Tue Jul 08 17:56:03 2014 -0700
committer Makoto Onuki <omakoto@google.com> Thu Jul 10 11:22:47 2014 -0700
tree 31455880d2abf7a3ea271c468f6f68f9c7f7907e
parent 05d1440049e389568a9357a8b59bdfff05f26375

Use enterprise caller-id in incall.

- Use PhoneLookup.ENTERPRISE_CONTENT_FILTER_URI for caller-id.

- Removed a bunch of unused code.

- Renamed fields that will have different semantics.  e.g. contactId now will be
0 and lookupUri null for corp contacts.

- Simplify the sip caller-id lookup.  The regular caller-id lookup can also
do SIP.  The original code (http://ag/70555) was written before CP2 supported
it (http://ag/147367).  This needs QAing.

- Instead of passing around a contact-id to later load a contact picture,
use the picture URI returned from the API.

Bug 15779911

Change-Id: Ia755b9079d03d9236f824c2f1102a6fa902b2097