Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update ms2

Browse source
This commit is contained in:
Jehan Monnier 2018-07-27 10:26:48 +02:00
parent e91beec3eb
commit 93ed92b94a
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
AndroidManifest.xml
View file

@ -52,7 +52,7 @@
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/> <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
<!-- Needed for kill application yourself --> <!-- Needed for kill application yourself -->
<uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES"/> <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES"/>
<uses-feature android:name="android.hardware.camera.autofocus" />
<supports-screens <supports-screens
android:anyDensity="true" android:anyDensity="true"
android:largeScreens="true" android:largeScreens="true"

6
src/android/org/linphone/assistant/QrcodeFragment.java
View file

@ -113,7 +113,7 @@ public class QrcodeFragment extends Fragment {
launchQrcodeReader(); launchQrcodeReader();
if (androidVideoWindowImpl != null) { if (androidVideoWindowImpl != null) {
synchronized (androidVideoWindowImpl) { synchronized (androidVideoWindowImpl) {
LinphoneManager.getLc().setNativePreviewWindowId(androidVideoWindowImpl); //LinphoneManager.getLc().setNativePreviewWindowId(androidVideoWindowImpl);
} }
} }
super.onResume(); super.onResume();
@ -123,11 +123,11 @@ public class QrcodeFragment extends Fragment {
public void onPause() { public void onPause() {
if (androidVideoWindowImpl != null) { if (androidVideoWindowImpl != null) {
synchronized (androidVideoWindowImpl) { synchronized (androidVideoWindowImpl) {
LinphoneManager.getLc().setNativePreviewWindowId(null); //LinphoneManager.getLc().setNativePreviewWindowId(null);
} }
} }
enableQrcodeReader(false); enableQrcodeReader(false);
setBackCamera(false); //setBackCamera(false);
super.onPause(); super.onPause();
} }

2
submodules/mediastreamer2

@ -1 +1 @@
Subproject commit 1e53888bb49135c528a0bb32494bfb5ceaddb5f8 Subproject commit 89e89db483137c1bb65d30c2ecd9c1667a43dae1