oxen-io
/
session-android
mirror of https://github.com/oxen-io/session-android.git
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

reset surface on camera pause 

fixes #4657

// FREEBIE
This commit is contained in:
Jake McGinty 2015-11-23 15:03:54 -08:00 committed by Moxie Marlinspike
parent a04e737526
commit 3a5d4e7ebe
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/org/thoughtcrime/securesms/components/camera/CameraView.java
View File

@ -34,7 +34,7 @@ import android.support.annotation.Nullable;
import android.util.AttributeSet;
import android.util.Log;
import android.view.OrientationEventListener;
import android.widget.FrameLayout;
import android.view.ViewGroup;
import java.io.IOException;
import java.util.List;
@ -49,7 +49,7 @@ import org.whispersystems.jobqueue.JobParameters;
import org.whispersystems.libaxolotl.util.guava.Optional;
@SuppressWarnings("deprecation")
public class CameraView extends FrameLayout {
public class CameraView extends ViewGroup {
private static final String TAG = CameraView.class.getSimpleName();
private final CameraSurfaceView surface;
@ -162,6 +162,8 @@ public class CameraView extends FrameLayout {
onOrientationChange.disable();
displayOrientation = -1;
outputOrientation = -1;
removeView(surface);
addView(surface);
Log.w(TAG, "onPause() completed");
}
});
@ -284,7 +286,7 @@ public class CameraView extends FrameLayout {
camera.setPreviewDisplay(surface.getHolder());
startPreview(parameters);
} catch (Exception e) {
Log.w(TAG, "couldn't set preview display");
Log.w(TAG, "couldn't set preview display", e);
}
return null;
}