Merge "Add a method to get empty camera parameters." (12f3e285) · Commits · e / os / android_frameworks_base

core/java/android/hardware/Camera.java

+18 −0

Original line number	Diff line number	Diff line
		@@ -303,6 +303,12 @@ public class Camera {
		native_setup(new WeakReference<Camera>(this), cameraId);
		}

		/**
		* An empty Camera for testing purpose.
		*/
		Camera() {
		}

		protected void finalize() {
		release();
		}
		@@ -1350,6 +1356,18 @@ public class Camera {
		return p;
		}

		/**
		* Returns an empty {@link Parameters} for testing purpose.
		*
		* @return an Parameter object.
		*
		* @hide
		*/
		public static Parameters getEmptyParameters() {
		Camera camera = new Camera();
		return camera.new Parameters();
		}

		/**
		* Image size (width and height dimensions).
		*/