Merge remote-tracking branch 'origin/master' into dev_in_app_purchase

.gitmodules

@@ -33,7 +33,7 @@
 	url = git://git.linphone.org/msamr
 [submodule "submodules/externals/libvpx"]
 	path = submodules/externals/libvpx
-	url = http://git.chromium.org/webm/libvpx.git
+	url = https://chromium.googlesource.com/webm/libvpx
 	ignore = dirty
 [submodule "submodules/bzrtp"]
 	path = submodules/bzrtp

liblinphone_tester/custom_rules.xml

@@ -42,6 +42,7 @@
 				<resourcecontains resource="${output.file}" substring="Native crash" />
 				<resourcecontains resource="${output.file}" substring="longMsg=junit.framework.AssertionFailedError: View with id: '" />
 				<resourcecontains resource="${output.file}" substring="longMsg=java.lang.RuntimeException:" />
+				<resourcecontains resource="${output.file}" substring="longMsg=java.lang.NullPointerException:" />
 			</or>
 		</condition>
 		<exec executable="bash" unless:set="has.crashed">

liblinphone_tester/src/org/linphone/tester/LogsActivity.java

@@ -29,6 +29,7 @@ public class LogsActivity extends Activity {
 			list.addAll(Arrays.asList(mArgs));
 			String[] array = list.toArray(new String[list.size()]);
 			tester.run(array);
+			Tester.clearAccounts();
 			mLogsActivity.runOnUiThread(new Runnable() {
     			public void run() {
     				mLogsActivity.done();

liblinphone_tester/src/org/linphone/tester/Tester.java

@@ -25,6 +25,7 @@ public class Tester {
 	}
 	
 	static	{
+		System.loadLibrary("cunit");
 		List<String> cpuabis=Version.getCpuAbis();
 		String ffmpegAbi;
 		boolean libLoaded=false;

src/org/linphone/LinphoneManager.java

@@ -717,7 +717,9 @@ public class LinphoneManager implements LinphoneCoreListener {
 		try {
 			Contact contact = ContactsManager.getInstance().findContactWithAddress(mServiceContext.getContentResolver(), from);
 			if (!mServiceContext.getResources().getBoolean(R.bool.disable_chat__message_notification)) {
-				if(LinphoneActivity.isInstanciated() && LinphoneActivity.instance().displayChatMessageNotification(from.asStringUriOnly())) {
+				if (LinphoneActivity.isInstanciated() && !LinphoneActivity.instance().displayChatMessageNotification(from.asStringUriOnly())) {
+					return;
+				} else {
 					if (contact != null) {
 						LinphoneService.instance().displayMessageNotification(from.asStringUriOnly(), contact.getName(), textMessage);
 					} else {

src/org/linphone/compatibility/ApiFivePlus.java

@@ -268,14 +268,15 @@ public class ApiFivePlus {
 		String sipUri = username + "@" + domain;
 		
 		Cursor cursor = getSIPContactCursor(cr, sipUri);
+		if(cursor != null) {
 			Contact contact = getContact(cr, cursor, 0);
 			if (contact != null && contact.getNumbersOrAddresses().contains(sipUri)) {
 				address.setDisplayName(contact.getName());
 				cursor.close();
 				return contact.getPhotoUri();
 			}
-
 			cursor.close();
+		}
 		return null;
 	}
 
@@ -286,8 +287,6 @@ public class ApiFivePlus {
 			cursor.close();
 			return contactDisplayName;
 		}
-		
-		cursor.close();
 		return null;
 	}
 	

submodules/belle-sip

@@ -1 +1 @@
-Subproject commit 6fd479005cf9e9be15449cab34717fe17bda6dc5
+Subproject commit 1ffd890571879bba9a58251dfe7dd5249c011517

submodules/linphone

@@ -1 +1 @@
-Subproject commit 2cfc9ecfd8c3d670e54fc6d4a75e6982bf42f74e
+Subproject commit ad1d7c12c9b459660b34d63408b144bf5890f3b6

tests/custom_rules.xml

@@ -34,8 +34,8 @@
 				<resourcecontains resource="${output.file}" substring="Native crash" />
 				<resourcecontains resource="${output.file}" substring="longMsg=junit.framework.AssertionFailedError: View with id: '" />
 				<resourcecontains resource="${output.file}" substring="longMsg=java.lang.RuntimeException:" />
+				<resourcecontains resource="${output.file}" substring="longMsg=java.lang.NullPointerException:" />
 			</or>
-
 		</condition>
 		<exec executable="bash" unless:set="has.crashed">
 			<arg value="-c"/>