Merge "Camera2 API: Rename package to android.hardware.camera2" (92ed6451) · Commits · e / os / android_frameworks_base

Android.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -121,8 +121,8 @@ LOCAL_SRC_FILES += \
		core/java/android/hardware/ICameraClient.aidl \
		core/java/android/hardware/IProCameraUser.aidl \
		core/java/android/hardware/IProCameraCallbacks.aidl \
		core/java/android/hardware/photography/ICameraDeviceUser.aidl \
		core/java/android/hardware/photography/ICameraDeviceCallbacks.aidl \
		core/java/android/hardware/camera2/ICameraDeviceUser.aidl \
		core/java/android/hardware/camera2/ICameraDeviceCallbacks.aidl \
		core/java/android/hardware/ISerialManager.aidl \
		core/java/android/hardware/display/IDisplayManager.aidl \
		core/java/android/hardware/display/IDisplayManagerCallback.aidl \

api/current.txt

+136 −136

Original line number	Diff line number	Diff line
		@@ -10648,6 +10648,142 @@ package android.hardware {

		}

		package android.hardware.camera2 {

		public class CameraAccessException extends android.util.AndroidException {
		ctor public CameraAccessException(int);
		ctor public CameraAccessException(int, java.lang.String);
		ctor public CameraAccessException(int, java.lang.String, java.lang.Throwable);
		ctor public CameraAccessException(int, java.lang.Throwable);
		method public final int getReason();
		field public static final int CAMERA_DISABLED = 3; // 0x3
		field public static final int CAMERA_DISCONNECTED = 4; // 0x4
		field public static final int CAMERA_IN_USE = 1; // 0x1
		field public static final int MAX_CAMERAS_IN_USE = 2; // 0x2
		}

		public abstract interface CameraDevice implements java.lang.AutoCloseable {
		method public abstract void capture(android.hardware.camera2.CaptureRequest, android.hardware.camera2.CameraDevice.CaptureListener) throws android.hardware.camera2.CameraAccessException;
		method public abstract void captureBurst(java.util.List<android.hardware.camera2.CaptureRequest>, android.hardware.camera2.CameraDevice.CaptureListener) throws android.hardware.camera2.CameraAccessException;
		method public abstract void close() throws java.lang.Exception;
		method public abstract void configureOutputs(java.util.List<android.view.Surface>) throws android.hardware.camera2.CameraAccessException;
		method public abstract android.hardware.camera2.CaptureRequest createCaptureRequest(int) throws android.hardware.camera2.CameraAccessException;
		method public abstract android.hardware.camera2.CameraProperties getProperties() throws android.hardware.camera2.CameraAccessException;
		method public abstract void setErrorListener(android.hardware.camera2.CameraDevice.ErrorListener);
		method public abstract void setRepeatingBurst(java.util.List<android.hardware.camera2.CaptureRequest>, android.hardware.camera2.CameraDevice.CaptureListener) throws android.hardware.camera2.CameraAccessException;
		method public abstract void setRepeatingRequest(android.hardware.camera2.CaptureRequest, android.hardware.camera2.CameraDevice.CaptureListener) throws android.hardware.camera2.CameraAccessException;
		method public abstract void stopRepeating() throws android.hardware.camera2.CameraAccessException;
		method public abstract void waitUntilIdle() throws android.hardware.camera2.CameraAccessException;
		field public static final int TEMPLATE_MANUAL = 5; // 0x5
		field public static final int TEMPLATE_PREVIEW = 1; // 0x1
		field public static final int TEMPLATE_RECORD = 3; // 0x3
		field public static final int TEMPLATE_STILL_CAPTURE = 2; // 0x2
		field public static final int TEMPLATE_VIDEO_SNAPSHOT = 4; // 0x4
		}

		public static abstract interface CameraDevice.CaptureListener {
		method public abstract void onCaptureComplete(android.hardware.camera2.CameraDevice, android.hardware.camera2.CaptureRequest, android.hardware.camera2.CaptureResult);
		method public abstract void onCaptureFailed(android.hardware.camera2.CameraDevice, android.hardware.camera2.CaptureRequest);
		}

		public static abstract interface CameraDevice.ErrorListener {
		method public abstract void onCameraDeviceError(android.hardware.camera2.CameraDevice, int);
		field public static final int DEVICE_DISCONNECTED = 1; // 0x1
		field public static final int DEVICE_ERROR = 2; // 0x2
		field public static final int SERVICE_ERROR = 3; // 0x3
		}

		public final class CameraManager {
		method public android.hardware.camera2.CameraProperties getCameraProperties(java.lang.String) throws android.hardware.camera2.CameraAccessException;
		method public java.lang.String[] getDeviceIdList() throws android.hardware.camera2.CameraAccessException;
		method public android.hardware.camera2.CameraDevice openCamera(java.lang.String) throws android.hardware.camera2.CameraAccessException;
		method public void registerCameraListener(android.hardware.camera2.CameraManager.CameraListener);
		method public void unregisterCameraListener(android.hardware.camera2.CameraManager.CameraListener);
		}

		public static abstract interface CameraManager.CameraListener {
		method public abstract void onCameraAvailable(java.lang.String);
		method public abstract void onCameraUnavailable(java.lang.String);
		}

		public class CameraMetadata implements java.lang.AutoCloseable android.os.Parcelable {
		ctor public CameraMetadata();
		method public void close() throws java.lang.Exception;
		method public int describeContents();
		method public T get(android.hardware.camera2.CameraMetadata.Key<T>);
		method public void readFromParcel(android.os.Parcel);
		method public void set(android.hardware.camera2.CameraMetadata.Key<T>, T);
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator CREATOR;
		}

		public static class CameraMetadata.Key {
		ctor public CameraMetadata.Key(java.lang.String, java.lang.Class<T>);
		method public final boolean equals(java.lang.Object);
		method public final java.lang.String getName();
		method public final int hashCode();
		}

		public final class CameraProperties extends android.hardware.camera2.CameraMetadata {
		ctor public CameraProperties();
		field public static final android.hardware.camera2.CameraMetadata.Key INFO_IDENTIFIER;
		field public static final android.hardware.camera2.CameraMetadata.Key INFO_MODEL;
		field public static final android.hardware.camera2.CameraMetadata.Key INFO_REMOVABLE;
		field public static final android.hardware.camera2.CameraMetadata.Key INFO_SUPPORTED_HARDWARE_LEVEL;
		field public static final int INFO_SUPPORTED_HARDWARE_LEVEL_FULL = 1; // 0x1
		field public static final int INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED = 0; // 0x0
		field public static final android.hardware.camera2.CameraMetadata.Key SCALER_AVAILABLE_FORMATS;
		field public static final android.hardware.camera2.CameraMetadata.Key SCALER_AVAILABLE_JPEG_SIZES;
		field public static final android.hardware.camera2.CameraMetadata.Key SCALER_AVAILABLE_PROCESSED_SIZES;
		field public static final android.hardware.camera2.CameraMetadata.Key SCALER_AVAILABLE_RAW_SIZES;
		field public static final android.hardware.camera2.CameraMetadata.Key SENSOR_ACTIVE_ARRAY_SIZE;
		field public static final android.hardware.camera2.CameraMetadata.Key SENSOR_PIXEL_ARRAY_SIZE;
		}

		public final class CaptureRequest extends android.hardware.camera2.CameraMetadata implements android.os.Parcelable {
		method public void addTarget(android.view.Surface);
		method public void removeTarget(android.view.Surface);
		field public static final android.os.Parcelable.Creator CREATOR;
		field public static final android.hardware.camera2.CameraMetadata.Key SENSOR_EXPOSURE_TIME;
		field public static final android.hardware.camera2.CameraMetadata.Key SENSOR_SENSITIVITY;
		}

		public final class CaptureResult extends android.hardware.camera2.CameraMetadata {
		field public static final android.hardware.camera2.CameraMetadata.Key CONTROL_AE_STATE;
		field public static final int CONTROL_AE_STATE_CONVERGED = 2; // 0x2
		field public static final int CONTROL_AE_STATE_FLASH_REQUIRED = 4; // 0x4
		field public static final int CONTROL_AE_STATE_INACTIVE = 0; // 0x0
		field public static final int CONTROL_AE_STATE_LOCKED = 3; // 0x3
		field public static final int CONTROL_AE_STATE_PRECAPTURE = 5; // 0x5
		field public static final int CONTROL_AE_STATE_SEARCHING = 1; // 0x1
		field public static final android.hardware.camera2.CameraMetadata.Key SENSOR_TIMESTAMP;
		field public static final android.hardware.camera2.CameraMetadata.Key STATISTICS_DETECTED_FACES;
		}

		public static class CaptureResult.Face {
		ctor public CaptureResult.Face();
		method public android.graphics.Rect getBounds();
		method public int getId();
		method public android.graphics.Point getLeftEye();
		method public android.graphics.Point getMouth();
		method public android.graphics.Point getRightEye();
		method public int getScore();
		}

		public final class Rational {
		ctor public Rational(int, int);
		method public int getDenominator();
		method public int getNumerator();
		}

		public final class Size {
		ctor public Size(int, int);
		method public final int getHeight();
		method public final int getWidth();
		}

		}

		package android.hardware.display {

		public final class DisplayManager {
		@@ -10750,142 +10886,6 @@ package android.hardware.location {

		}

		package android.hardware.photography {

		public class CameraAccessException extends android.util.AndroidException {
		ctor public CameraAccessException(int);
		ctor public CameraAccessException(int, java.lang.String);
		ctor public CameraAccessException(int, java.lang.String, java.lang.Throwable);
		ctor public CameraAccessException(int, java.lang.Throwable);
		method public final int getReason();
		field public static final int CAMERA_DISABLED = 3; // 0x3
		field public static final int CAMERA_DISCONNECTED = 4; // 0x4
		field public static final int CAMERA_IN_USE = 1; // 0x1
		field public static final int MAX_CAMERAS_IN_USE = 2; // 0x2
		}

		public abstract interface CameraDevice implements java.lang.AutoCloseable {
		method public abstract void capture(android.hardware.photography.CaptureRequest, android.hardware.photography.CameraDevice.CaptureListener) throws android.hardware.photography.CameraAccessException;
		method public abstract void captureBurst(java.util.List<android.hardware.photography.CaptureRequest>, android.hardware.photography.CameraDevice.CaptureListener) throws android.hardware.photography.CameraAccessException;
		method public abstract void close() throws java.lang.Exception;
		method public abstract void configureOutputs(java.util.List<android.view.Surface>) throws android.hardware.photography.CameraAccessException;
		method public abstract android.hardware.photography.CaptureRequest createCaptureRequest(int) throws android.hardware.photography.CameraAccessException;
		method public abstract android.hardware.photography.CameraProperties getProperties() throws android.hardware.photography.CameraAccessException;
		method public abstract void setErrorListener(android.hardware.photography.CameraDevice.ErrorListener);
		method public abstract void setRepeatingBurst(java.util.List<android.hardware.photography.CaptureRequest>, android.hardware.photography.CameraDevice.CaptureListener) throws android.hardware.photography.CameraAccessException;
		method public abstract void setRepeatingRequest(android.hardware.photography.CaptureRequest, android.hardware.photography.CameraDevice.CaptureListener) throws android.hardware.photography.CameraAccessException;
		method public abstract void stopRepeating() throws android.hardware.photography.CameraAccessException;
		method public abstract void waitUntilIdle() throws android.hardware.photography.CameraAccessException;
		field public static final int TEMPLATE_MANUAL = 5; // 0x5
		field public static final int TEMPLATE_PREVIEW = 1; // 0x1
		field public static final int TEMPLATE_RECORD = 3; // 0x3
		field public static final int TEMPLATE_STILL_CAPTURE = 2; // 0x2
		field public static final int TEMPLATE_VIDEO_SNAPSHOT = 4; // 0x4
		}

		public static abstract interface CameraDevice.CaptureListener {
		method public abstract void onCaptureComplete(android.hardware.photography.CameraDevice, android.hardware.photography.CaptureRequest, android.hardware.photography.CaptureResult);
		method public abstract void onCaptureFailed(android.hardware.photography.CameraDevice, android.hardware.photography.CaptureRequest);
		}

		public static abstract interface CameraDevice.ErrorListener {
		method public abstract void onCameraDeviceError(android.hardware.photography.CameraDevice, int);
		field public static final int DEVICE_DISCONNECTED = 1; // 0x1
		field public static final int DEVICE_ERROR = 2; // 0x2
		field public static final int SERVICE_ERROR = 3; // 0x3
		}

		public final class CameraManager {
		method public android.hardware.photography.CameraProperties getCameraProperties(java.lang.String) throws android.hardware.photography.CameraAccessException;
		method public java.lang.String[] getDeviceIdList() throws android.hardware.photography.CameraAccessException;
		method public android.hardware.photography.CameraDevice openCamera(java.lang.String) throws android.hardware.photography.CameraAccessException;
		method public void registerCameraListener(android.hardware.photography.CameraManager.CameraListener);
		method public void unregisterCameraListener(android.hardware.photography.CameraManager.CameraListener);
		}

		public static abstract interface CameraManager.CameraListener {
		method public abstract void onCameraAvailable(java.lang.String);
		method public abstract void onCameraUnavailable(java.lang.String);
		}

		public class CameraMetadata implements java.lang.AutoCloseable android.os.Parcelable {
		ctor public CameraMetadata();
		method public void close() throws java.lang.Exception;
		method public int describeContents();
		method public T get(android.hardware.photography.CameraMetadata.Key<T>);
		method public void readFromParcel(android.os.Parcel);
		method public void set(android.hardware.photography.CameraMetadata.Key<T>, T);
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator CREATOR;
		}

		public static class CameraMetadata.Key {
		ctor public CameraMetadata.Key(java.lang.String, java.lang.Class<T>);
		method public final boolean equals(java.lang.Object);
		method public final java.lang.String getName();
		method public final int hashCode();
		}

		public final class CameraProperties extends android.hardware.photography.CameraMetadata {
		ctor public CameraProperties();
		field public static final android.hardware.photography.CameraMetadata.Key INFO_IDENTIFIER;
		field public static final android.hardware.photography.CameraMetadata.Key INFO_MODEL;
		field public static final android.hardware.photography.CameraMetadata.Key INFO_REMOVABLE;
		field public static final android.hardware.photography.CameraMetadata.Key INFO_SUPPORTED_HARDWARE_LEVEL;
		field public static final int INFO_SUPPORTED_HARDWARE_LEVEL_FULL = 1; // 0x1
		field public static final int INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED = 0; // 0x0
		field public static final android.hardware.photography.CameraMetadata.Key SCALER_AVAILABLE_FORMATS;
		field public static final android.hardware.photography.CameraMetadata.Key SCALER_AVAILABLE_JPEG_SIZES;
		field public static final android.hardware.photography.CameraMetadata.Key SCALER_AVAILABLE_PROCESSED_SIZES;
		field public static final android.hardware.photography.CameraMetadata.Key SCALER_AVAILABLE_RAW_SIZES;
		field public static final android.hardware.photography.CameraMetadata.Key SENSOR_ACTIVE_ARRAY_SIZE;
		field public static final android.hardware.photography.CameraMetadata.Key SENSOR_PIXEL_ARRAY_SIZE;
		}

		public final class CaptureRequest extends android.hardware.photography.CameraMetadata implements android.os.Parcelable {
		method public void addTarget(android.view.Surface);
		method public void removeTarget(android.view.Surface);
		field public static final android.os.Parcelable.Creator CREATOR;
		field public static final android.hardware.photography.CameraMetadata.Key SENSOR_EXPOSURE_TIME;
		field public static final android.hardware.photography.CameraMetadata.Key SENSOR_SENSITIVITY;
		}

		public final class CaptureResult extends android.hardware.photography.CameraMetadata {
		field public static final android.hardware.photography.CameraMetadata.Key CONTROL_AE_STATE;
		field public static final int CONTROL_AE_STATE_CONVERGED = 2; // 0x2
		field public static final int CONTROL_AE_STATE_FLASH_REQUIRED = 4; // 0x4
		field public static final int CONTROL_AE_STATE_INACTIVE = 0; // 0x0
		field public static final int CONTROL_AE_STATE_LOCKED = 3; // 0x3
		field public static final int CONTROL_AE_STATE_PRECAPTURE = 5; // 0x5
		field public static final int CONTROL_AE_STATE_SEARCHING = 1; // 0x1
		field public static final android.hardware.photography.CameraMetadata.Key SENSOR_TIMESTAMP;
		field public static final android.hardware.photography.CameraMetadata.Key STATISTICS_DETECTED_FACES;
		}

		public static class CaptureResult.Face {
		ctor public CaptureResult.Face();
		method public android.graphics.Rect getBounds();
		method public int getId();
		method public android.graphics.Point getLeftEye();
		method public android.graphics.Point getMouth();
		method public android.graphics.Point getRightEye();
		method public int getScore();
		}

		public final class Rational {
		ctor public Rational(int, int);
		method public int getDenominator();
		method public int getNumerator();
		}

		public final class Size {
		ctor public Size(int, int);
		method public final int getHeight();
		method public final int getWidth();
		}

		}

		package android.hardware.usb {

		public class UsbAccessory implements android.os.Parcelable {

core/java/android/app/ContextImpl.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -50,7 +50,7 @@ import android.graphics.drawable.Drawable;
		import android.hardware.ISerialManager;
		import android.hardware.SerialManager;
		import android.hardware.SystemSensorManager;
		import android.hardware.photography.CameraManager;
		import android.hardware.camera2.CameraManager;
		import android.hardware.display.DisplayManager;
		import android.hardware.input.InputManager;
		import android.hardware.usb.IUsbManager;

core/java/android/content/Context.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -2292,7 +2292,7 @@ public abstract class Context {

		/**
		* Use with {@link #getSystemService} to retrieve a
		* {@link android.hardware.photography.CameraManager} for interacting with
		* {@link android.hardware.camera2.CameraManager} for interacting with
		* camera devices.
		*
		* @see #getSystemService

core/java/android/hardware/ICameraService.aidl

+2 −2

Original line number	Diff line number	Diff line
		@@ -20,8 +20,8 @@ import android.hardware.ICamera;
		import android.hardware.ICameraClient;
		import android.hardware.IProCameraUser;
		import android.hardware.IProCameraCallbacks;
		import android.hardware.photography.ICameraDeviceUser;
		import android.hardware.photography.ICameraDeviceCallbacks;
		import android.hardware.camera2.ICameraDeviceUser;
		import android.hardware.camera2.ICameraDeviceCallbacks;
		import android.hardware.ICameraServiceListener;
		import android.hardware.CameraInfo;