Make sure photo_uri rewrite logic doesn't cause FileNotFoundException
Now it strictly follows the following logic
1. display photo uri -> display photo corp uri
2. photo uri -> photo corp uri
3. otherwise, return null
It should make sure if OEM returns something different in photo_uri field,
the original implementation may cause FileNotFoundException as CP2 rewrites it into photo uri/display photo uri
It's actually the OEM's job to fix EnterpriseContactsCursorWrapper if they return something different photo_uri field.
This CL is just to prevent such case to happen. There is nothing wrong with the existing code in CP2.
It's just in case OEM changes implementation of photo_uri in CP2.
Unit test is also added to make sure OEMs understand EnterpriseContactsCursorWrapper.
Bug:26483932
Change-Id: I62be24e9cd171a74d85504ee93be0bd96cf0e0a0
2 files changed