Conflicts:
	tester/flexisip_tester.c

 Conflicts:
	coreapi/bellesip_sal/sal_op_impl.c

This reverts commit 45e9c3a4.

This reverts commit d643672e.

-> Because of the cache of LinphoneAddress in some methods, a call of the method will invalidate previous returned value

(cherry picked from commit 8a946552)

(cherry picked from commit b9829e15)

(cherry picked from commit 4f85b8a5)

François Grisez authored 6 years ago and DanmeiChen committed 6 years ago

(cherry picked from commit 60031cdc)

(cherry picked from commit 3cdb4644)

(cherry picked from commit 7ffd7a93)

downgrade error traces in case of sdk resources not found to info as resources are now located into the aar.

Fix loading of ms2 plugins on Android. The nativeLibraryDir is found from java API and used directly in LinphoneCore instanciation, thanks to the AndroidPlatformHelper class.

update primary contact when network is up (so that in "guess" mode, we have an up to date ip address)

Merge branch 'dev_refactor_cpp_qrcode' of gitlab.linphone.org:BC/public/linphone into dev_refactor_cpp
Add QRCode API

Allow configuration of SIP error code to be used when declining a call because it has not been answered after the incoming call timeout.