Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7ca2d11 authored by Mark Harman's avatar Mark Harman
Browse files

Fix Android Studio warnings.

parent 9b81bb8d

app/src/main/java/net/sourceforge/opencamera/HDRProcessor.java

+1 −2
Original line number Diff line number Diff line
@@ -87,8 +87,7 @@ public class HDRProcessor { 
		}



		static ResponseFunction createIdentity() {

			ResponseFunction function = new ResponseFunction(1.0f, 0.0f);

			return function;

			return new ResponseFunction(1.0f, 0.0f);

		}



		/** Computes the response function.

app/src/main/java/net/sourceforge/opencamera/MainActivity.java

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import android.hardware.SensorEventListener; 
import android.hardware.SensorManager;

import android.media.AudioAttributes;

import android.media.AudioManager;

import android.media.CamcorderProfile;

import android.media.SoundPool;

import android.net.Uri;

import android.os.AsyncTask;

app/src/main/java/net/sourceforge/opencamera/Preview/ApplicationInterface.java

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ import android.content.Context; 
import android.graphics.Canvas;

import android.hardware.camera2.DngCreator;

import android.location.Location;

import android.media.CamcorderProfile;

import android.media.Image;

import android.net.Uri;

import android.util.Pair;

app/src/main/java/net/sourceforge/opencamera/Preview/Preview.java

+4 −3
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import java.io.File; 
import java.io.IOException;

import java.text.DecimalFormat;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Date;

import java.util.List;

import java.util.Locale;
@@ -415,7 +416,7 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu 
		}

	}



	public Matrix getCameraToPreviewMatrix() {

	private Matrix getCameraToPreviewMatrix() {

		calculateCameraToPreviewMatrix();

		return camera_to_preview_matrix;

	}
@@ -1410,7 +1411,7 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu 
		// We pass a camera controller back to the UI thread rather than assigning to camera_controller here, because:

		// * If we set camera_controller directly, we'd need to synchronize, otherwise risk of memory barrier issues

		// * Risk of race conditions if UI thread accesses camera_controller before we have called cameraOpened().

		CameraController camera_controller_local = null;

		CameraController camera_controller_local;

		try {

			if( MyDebug.LOG ) {

				Log.d(TAG, "try to open camera: " + cameraId);
@@ -1870,7 +1871,7 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu 
				    @Override

				    public void onFaceDetection(CameraController.Face[] faces) {

						if( MyDebug.LOG )

							Log.d(TAG, "onFaceDetection: " + faces);

							Log.d(TAG, "onFaceDetection: " + Arrays.toString(faces));

						if( camera_controller == null ) {

							// can get a crash in some cases when switching camera when face detection is on (at least for Camera2)

							Activity activity = (Activity)Preview.this.getContext();

app/src/main/java/net/sourceforge/opencamera/Preview/VideoProfile.java

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ import android.media.CamcorderProfile; 
	 *  CamcorderProfile (needed for slow motion / high speed video recording).

	 */

public class VideoProfile {

    final CamcorderProfile camcorderProfile;

    final private CamcorderProfile camcorderProfile;

    public final int audioCodec;

    public final int fileFormat;

    public final int videoBitRate;