From 4c95b4ec8616211e784bfca2a3adca6e457b7eca Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 13 Dec 2017 12:53:49 +0100 Subject: [PATCH] Fixed crash when rotation device while video call + fixed video overlay on Android 8 --- src/android/org/linphone/ui/LinphoneOverlay.java | 12 +++++++++++- submodules/linphone | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/android/org/linphone/ui/LinphoneOverlay.java b/src/android/org/linphone/ui/LinphoneOverlay.java index 5e0e238a2..d5b174119 100644 --- a/src/android/org/linphone/ui/LinphoneOverlay.java +++ b/src/android/org/linphone/ui/LinphoneOverlay.java @@ -24,11 +24,13 @@ import org.linphone.LinphoneManager; import org.linphone.LinphoneService; import org.linphone.core.Call; import org.linphone.core.CallParams; +import org.linphone.mediastream.Version; import org.linphone.mediastream.video.AndroidVideoWindowImpl; import android.content.Context; import android.content.Intent; import android.graphics.PixelFormat; +import android.os.Build; import android.util.AttributeSet; import android.util.DisplayMetrics; import android.view.Gravity; @@ -51,10 +53,18 @@ public class LinphoneOverlay extends org.linphone.mediastream.video.display.GL2J public LinphoneOverlay(Context context, AttributeSet attrs, int defStyle) { super(context, attrs); wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE); + + int LAYOUT_FLAG; + if (Build.VERSION.SDK_INT >= Version.API26_O_80) { + LAYOUT_FLAG = WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY; + } else { + LAYOUT_FLAG = WindowManager.LayoutParams.TYPE_PHONE; + } + params = new WindowManager.LayoutParams( WindowManager.LayoutParams.WRAP_CONTENT, WindowManager.LayoutParams.WRAP_CONTENT, - WindowManager.LayoutParams.TYPE_PHONE, + LAYOUT_FLAG, WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE, PixelFormat.TRANSLUCENT); params.gravity = Gravity.TOP | Gravity.LEFT; diff --git a/submodules/linphone b/submodules/linphone index d2fd296e8..a7df6db77 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit d2fd296e8c8ba84c9f192dbb7b59e22e9080a8f6 +Subproject commit a7df6db770128fd0ba480cdae00de945feec9140