From f8797d4bd7a11770ba1bf2e62558a596071d34dc Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 1 Apr 2016 13:58:14 +0200
Subject: [PATCH] Fixed crash at end on video call for a specific samsung
 device (GT-S7580)

---
 res/layout-land/video_no_opengl.xml         | 20 ++++++++++++++++++++
 res/layout-sw533dp-land/video_no_opengl.xml | 20 ++++++++++++++++++++
 res/layout-sw720dp-land/video_no_opengl.xml | 20 ++++++++++++++++++++
 res/layout/video_no_opengl.xml              | 20 ++++++++++++++++++++
 src/org/linphone/CallVideoFragment.java     |  7 ++++++-
 submodules/linphone                         |  2 +-
 6 files changed, 87 insertions(+), 2 deletions(-)
 create mode 100644 res/layout-land/video_no_opengl.xml
 create mode 100644 res/layout-sw533dp-land/video_no_opengl.xml
 create mode 100644 res/layout-sw720dp-land/video_no_opengl.xml
 create mode 100644 res/layout/video_no_opengl.xml

diff --git a/res/layout-land/video_no_opengl.xml b/res/layout-land/video_no_opengl.xml
new file mode 100644
index 000000000..7e71989de
--- /dev/null
+++ b/res/layout-land/video_no_opengl.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/video_frame"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    
+    <SurfaceView
+        android:visibility="visible" 
+        android:layout_height="match_parent" 
+        android:layout_width="match_parent" 
+        android:id="@+id/videoSurface" />
+	
+	<SurfaceView
+	    android:id="@+id/videoCaptureSurface"
+	    android:layout_width="145dp"
+	    android:layout_height="120dp"
+	    android:layout_alignParentBottom="true"
+	    android:layout_alignParentRight="true" />
+
+</RelativeLayout>
diff --git a/res/layout-sw533dp-land/video_no_opengl.xml b/res/layout-sw533dp-land/video_no_opengl.xml
new file mode 100644
index 000000000..4a20a7911
--- /dev/null
+++ b/res/layout-sw533dp-land/video_no_opengl.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/video_frame"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    
+    <SurfaceView
+        android:visibility="visible" 
+        android:layout_height="match_parent" 
+        android:layout_width="match_parent" 
+        android:id="@+id/videoSurface" />
+	
+	<SurfaceView
+	    android:id="@+id/videoCaptureSurface"
+	    android:layout_width="218dp"
+	    android:layout_height="160dp"
+	    android:layout_alignParentBottom="true"
+	    android:layout_alignParentRight="true" />
+
+</RelativeLayout>
diff --git a/res/layout-sw720dp-land/video_no_opengl.xml b/res/layout-sw720dp-land/video_no_opengl.xml
new file mode 100644
index 000000000..42131ad95
--- /dev/null
+++ b/res/layout-sw720dp-land/video_no_opengl.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/video_frame"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    
+    <SurfaceView
+        android:visibility="visible" 
+        android:layout_height="match_parent" 
+        android:layout_width="match_parent" 
+        android:id="@+id/videoSurface" />
+	
+	<SurfaceView
+	    android:id="@+id/videoCaptureSurface"
+	    android:layout_width="290dp"
+	    android:layout_height="240dp"
+	    android:layout_alignParentBottom="true"
+	    android:layout_alignParentRight="true" />
+
+</RelativeLayout>
diff --git a/res/layout/video_no_opengl.xml b/res/layout/video_no_opengl.xml
new file mode 100644
index 000000000..ea88c256d
--- /dev/null
+++ b/res/layout/video_no_opengl.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/video_frame"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    
+    <SurfaceView
+        android:visibility="visible" 
+        android:layout_height="match_parent" 
+        android:layout_width="match_parent" 
+        android:id="@+id/videoSurface" />
+	
+	<SurfaceView
+	    android:id="@+id/videoCaptureSurface"
+	    android:layout_width="120dp"
+	    android:layout_height="145dp"
+	    android:layout_alignParentBottom="true"
+	    android:layout_alignParentRight="true" />
+
+</RelativeLayout>
diff --git a/src/org/linphone/CallVideoFragment.java b/src/org/linphone/CallVideoFragment.java
index 13a3a91ce..1bc890fd6 100644
--- a/src/org/linphone/CallVideoFragment.java
+++ b/src/org/linphone/CallVideoFragment.java
@@ -57,7 +57,12 @@ public class CallVideoFragment extends Fragment implements OnGestureListener, On
 	@Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, 
         Bundle savedInstanceState) {		
-        View view = inflater.inflate(R.layout.video, container, false);
+		View view;
+		if (LinphoneManager.getLc().hasCrappyOpenGL()) {
+			view = inflater.inflate(R.layout.video_no_opengl, container, false);
+		} else {
+	        	view = inflater.inflate(R.layout.video, container, false);
+		}
         
 		mVideoView = (SurfaceView) view.findViewById(R.id.videoSurface);
 		mCaptureView = (SurfaceView) view.findViewById(R.id.videoCaptureSurface);
diff --git a/submodules/linphone b/submodules/linphone
index 18ee71bea..fae2bf32e 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 18ee71beab0920683f34d48afe0c8d30b1a4dfc7
+Subproject commit fae2bf32e5df948f7db07d849cfcf9f1260a8f82