diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4ae956218..e14f2d402 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -68,7 +68,8 @@
-
+
diff --git a/libs/armeabi-v7a/liblinphone.so b/libs/armeabi-v7a/liblinphone.so
index 418e0c751..a2f4deded 100755
Binary files a/libs/armeabi-v7a/liblinphone.so and b/libs/armeabi-v7a/liblinphone.so differ
diff --git a/libs/armeabi/liblinphone.so b/libs/armeabi/liblinphone.so
index 4a3f3bfe7..620b944a9 100755
Binary files a/libs/armeabi/liblinphone.so and b/libs/armeabi/liblinphone.so differ
diff --git a/src/org/linphone/core/AndroidCameraRecord.java b/src/org/linphone/core/AndroidCameraRecord.java
index 138912f57..eb6a10865 100644
--- a/src/org/linphone/core/AndroidCameraRecord.java
+++ b/src/org/linphone/core/AndroidCameraRecord.java
@@ -183,9 +183,11 @@ public abstract class AndroidCameraRecord {
private static void stopPreview() {
- camera.setPreviewCallback(null); // TODO check if used whatever the SDK version
- camera.stopPreview();
- camera.release();
+ if (camera!=null){
+ camera.setPreviewCallback(null); // TODO check if used whatever the SDK version
+ camera.stopPreview();
+ camera.release();
+ }
camera=null;
previewStarted = false;
}
diff --git a/src/org/linphone/core/AndroidVideoWindowImpl.java b/src/org/linphone/core/AndroidVideoWindowImpl.java
index ca9968e4c..9f6281bec 100644
--- a/src/org/linphone/core/AndroidVideoWindowImpl.java
+++ b/src/org/linphone/core/AndroidVideoWindowImpl.java
@@ -80,3 +80,4 @@ public class AndroidVideoWindowImpl {
}
}
+
diff --git a/src/org/linphone/core/LinphoneCoreImpl.java b/src/org/linphone/core/LinphoneCoreImpl.java
index c67c18dc9..745c8c358 100644
--- a/src/org/linphone/core/LinphoneCoreImpl.java
+++ b/src/org/linphone/core/LinphoneCoreImpl.java
@@ -200,7 +200,7 @@ class LinphoneCoreImpl implements LinphoneCore {
throw new RuntimeException("object already destroyed");
}
}
- public void setNetworkStateReachable(boolean isReachable) {
+ public void setNetworkReachable(boolean isReachable) {
setNetworkStateReachable(nativePtr,isReachable);
}
public void setPlaybackGain(float gain) {
@@ -415,8 +415,4 @@ class LinphoneCoreImpl implements LinphoneCore {
// TODO Auto-generated method stub
return false;
}
- public void setNetworkReachable(boolean isReachable) {
- // TODO Auto-generated method stub
-
- }
}