Merge "camera2: Implement CameraDevice#getCameraInfo" (648e4fc7) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -10819,6 +10819,7 @@ package android.hardware.photography {
		}

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

core/java/android/hardware/photography/CameraMetadata.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -864,6 +864,8 @@ public class CameraMetadata implements Parcelable, AutoCloseable {
		+ values.length + " for type " + enumType);
		}

		Log.v(TAG, "Registered enum values for type " + enumType + " values");

		sEnumValues.put(enumType, values);
		}

		@@ -916,8 +918,10 @@ public class CameraMetadata implements Parcelable, AutoCloseable {
		if (ordinal < 0 \|\| ordinal >= values.length) {
		throw new IllegalArgumentException(
		String.format(
		"Argument 'value' (%d) was not a valid enum value for type %s", value,
		enumType));
		"Argument 'value' (%d) was not a valid enum value for type %s "
		+ "(registered? %b)",
		value,
		enumType, (registeredValues != null)));
		}

		return values[ordinal];

core/java/android/hardware/photography/CameraPropertiesKeys.java

+39 −32

Original line number	Diff line number	Diff line
		@@ -134,6 +134,7 @@ public final class CameraPropertiesKeys {
		private FacingKey(String name) {
		super(name, Lens.FacingKey.Enum.class);
		}

		}

		public static final Key<Lens.FacingKey.Enum> FACING =
		@@ -186,6 +187,17 @@ public final class CameraPropertiesKeys {
		private AvailableFormatsKey(String name) {
		super(name, Scaler.AvailableFormatsKey.Enum[].class);
		}

		static {
		CameraMetadata.registerEnumValues(Scaler.AvailableFormatsKey.Enum.class, new int[] {
		0x20, // RAW_SENSOR
		0x32315659, // YV12
		0x11, // YCrCb_420_SP
		0x22, // IMPLEMENTATION_DEFINED
		0x23, // YCbCr_420_888
		0x21 // BLOB
		});
		}
		}

		public static final Key<Scaler.AvailableFormatsKey.Enum[]> AVAILABLE_FORMATS =
		@@ -232,6 +244,7 @@ public final class CameraPropertiesKeys {
		private ColorFilterArrangementKey(String name) {
		super(name, Sensor.Info.ColorFilterArrangementKey.Enum.class);
		}

		}

		public static final Key<Sensor.Info.ColorFilterArrangementKey.Enum> COLOR_FILTER_ARRANGEMENT =
		@@ -318,6 +331,30 @@ public final class CameraPropertiesKeys {
		private ReferenceIlluminant1Key(String name) {
		super(name, Sensor.ReferenceIlluminant1Key.Enum.class);
		}

		static {
		CameraMetadata.registerEnumValues(Sensor.ReferenceIlluminant1Key.Enum.class, new int[] {
		1, // DAYLIGHT
		2, // FLUORESCENT
		3, // TUNGSTEN
		4, // FLASH
		9, // FINE_WEATHER
		10, // CLOUDY_WEATHER
		11, // SHADE
		12, // DAYLIGHT_FLUORESCENT
		13, // DAY_WHITE_FLUORESCENT
		14, // COOL_WHITE_FLUORESCENT
		15, // WHITE_FLUORESCENT
		17, // STANDARD_A
		18, // STANDARD_B
		19, // STANDARD_C
		20, // D55
		21, // D65
		22, // D75
		23, // D50
		24 // ISO_STUDIO_TUNGSTEN
		});
		}
		}

		public static final Key<Sensor.ReferenceIlluminant1Key.Enum> REFERENCE_ILLUMINANT1 =
		@@ -364,6 +401,7 @@ public final class CameraPropertiesKeys {
		private AvailableLedsKey(String name) {
		super(name, Led.AvailableLedsKey.Enum[].class);
		}

		}

		public static final Key<Led.AvailableLedsKey.Enum[]> AVAILABLE_LEDS =
		@@ -386,44 +424,13 @@ public final class CameraPropertiesKeys {
		private SupportedHardwareLevelKey(String name) {
		super(name, Info.SupportedHardwareLevelKey.Enum.class);
		}

		}

		public static final Key<Info.SupportedHardwareLevelKey.Enum> SUPPORTED_HARDWARE_LEVEL =
		new SupportedHardwareLevelKey("android.info.supportedHardwareLevel");

		}

		static {
		CameraMetadata.registerEnumValues(Scaler.AvailableFormatsKey.Enum.class, new int[] {
		0x20, // RAW_SENSOR
		0x32315659, // YV12
		0x11, // YCrCb_420_SP
		0x22, // IMPLEMENTATION_DEFINED
		0x23, // YCbCr_420_888
		0x21, // BLOB
		});
		CameraMetadata.registerEnumValues(Sensor.ReferenceIlluminant1Key.Enum.class, new int[] {
		1, // DAYLIGHT
		2, // FLUORESCENT
		3, // TUNGSTEN
		4, // FLASH
		9, // FINE_WEATHER
		10, // CLOUDY_WEATHER
		11, // SHADE
		12, // DAYLIGHT_FLUORESCENT
		13, // DAY_WHITE_FLUORESCENT
		14, // COOL_WHITE_FLUORESCENT
		15, // WHITE_FLUORESCENT
		17, // STANDARD_A
		18, // STANDARD_B
		19, // STANDARD_C
		20, // D55
		21, // D65
		22, // D75
		23, // D50
		24, // ISO_STUDIO_TUNGSTEN
		});
		}
		}

core/java/android/hardware/photography/CaptureRequestKeys.java

+50 −22

Original line number	Diff line number	Diff line
		@@ -56,6 +56,7 @@ public final class CaptureRequestKeys {
		private ModeKey(String name) {
		super(name, ColorCorrection.ModeKey.Enum.class);
		}

		}

		public static final Key<ColorCorrection.ModeKey.Enum> MODE =
		@@ -84,6 +85,7 @@ public final class CaptureRequestKeys {
		private AeAntibandingModeKey(String name) {
		super(name, Control.AeAntibandingModeKey.Enum.class);
		}

		}

		public static final Key<Control.AeAntibandingModeKey.Enum> AE_ANTIBANDING_MODE =
		@@ -104,6 +106,7 @@ public final class CaptureRequestKeys {
		private AeLockKey(String name) {
		super(name, Control.AeLockKey.Enum.class);
		}

		}

		public static final Key<Control.AeLockKey.Enum> AE_LOCK =
		@@ -128,6 +131,7 @@ public final class CaptureRequestKeys {
		private AeModeKey(String name) {
		super(name, Control.AeModeKey.Enum.class);
		}

		}

		public static final Key<Control.AeModeKey.Enum> AE_MODE =
		@@ -150,6 +154,7 @@ public final class CaptureRequestKeys {
		private AePrecaptureTriggerKey(String name) {
		super(name, Control.AePrecaptureTriggerKey.Enum.class);
		}

		}

		public static final Key<Control.AePrecaptureTriggerKey.Enum> AE_PRECAPTURE_TRIGGER =
		@@ -176,6 +181,7 @@ public final class CaptureRequestKeys {
		private AfModeKey(String name) {
		super(name, Control.AfModeKey.Enum.class);
		}

		}

		public static final Key<Control.AfModeKey.Enum> AF_MODE =
		@@ -198,6 +204,7 @@ public final class CaptureRequestKeys {
		private AfTriggerKey(String name) {
		super(name, Control.AfTriggerKey.Enum.class);
		}

		}

		public static final Key<Control.AfTriggerKey.Enum> AF_TRIGGER =
		@@ -216,6 +223,7 @@ public final class CaptureRequestKeys {
		private AwbLockKey(String name) {
		super(name, Control.AwbLockKey.Enum.class);
		}

		}

		public static final Key<Control.AwbLockKey.Enum> AWB_LOCK =
		@@ -248,6 +256,7 @@ public final class CaptureRequestKeys {
		private AwbModeKey(String name) {
		super(name, Control.AwbModeKey.Enum.class);
		}

		}

		public static final Key<Control.AwbModeKey.Enum> AWB_MODE =
		@@ -276,6 +285,7 @@ public final class CaptureRequestKeys {
		private CaptureIntentKey(String name) {
		super(name, Control.CaptureIntentKey.Enum.class);
		}

		}

		public static final Key<Control.CaptureIntentKey.Enum> CAPTURE_INTENT =
		@@ -308,6 +318,7 @@ public final class CaptureRequestKeys {
		private EffectModeKey(String name) {
		super(name, Control.EffectModeKey.Enum.class);
		}

		}

		public static final Key<Control.EffectModeKey.Enum> EFFECT_MODE =
		@@ -328,6 +339,7 @@ public final class CaptureRequestKeys {
		private ModeKey(String name) {
		super(name, Control.ModeKey.Enum.class);
		}

		}

		public static final Key<Control.ModeKey.Enum> MODE =
		@@ -376,6 +388,28 @@ public final class CaptureRequestKeys {
		private SceneModeKey(String name) {
		super(name, Control.SceneModeKey.Enum.class);
		}

		static {
		CameraMetadata.registerEnumValues(Control.SceneModeKey.Enum.class, new int[] {
		0, // UNSUPPORTED
		1, // FACE_PRIORITY
		2, // ACTION
		3, // PORTRAIT
		4, // LANDSCAPE
		5, // NIGHT
		6, // NIGHT_PORTRAIT
		7, // THEATRE
		8, // BEACH
		9, // SNOW
		10, // SUNSET
		11, // STEADYPHOTO
		12, // FIREWORKS
		13, // SPORTS
		14, // PARTY
		15, // CANDLELIGHT
		16 // BARCODE
		});
		}
		}

		public static final Key<Control.SceneModeKey.Enum> SCENE_MODE =
		@@ -394,6 +428,7 @@ public final class CaptureRequestKeys {
		private VideoStabilizationModeKey(String name) {
		super(name, Control.VideoStabilizationModeKey.Enum.class);
		}

		}

		public static final Key<Control.VideoStabilizationModeKey.Enum> VIDEO_STABILIZATION_MODE =
		@@ -416,6 +451,7 @@ public final class CaptureRequestKeys {
		private ModeKey(String name) {
		super(name, Demosaic.ModeKey.Enum.class);
		}

		}

		public static final Key<Demosaic.ModeKey.Enum> MODE =
		@@ -440,6 +476,7 @@ public final class CaptureRequestKeys {
		private ModeKey(String name) {
		super(name, Edge.ModeKey.Enum.class);
		}

		}

		public static final Key<Edge.ModeKey.Enum> MODE =
		@@ -470,6 +507,7 @@ public final class CaptureRequestKeys {
		private ModeKey(String name) {
		super(name, Flash.ModeKey.Enum.class);
		}

		}

		public static final Key<Flash.ModeKey.Enum> MODE =
		@@ -494,6 +532,7 @@ public final class CaptureRequestKeys {
		private ModeKey(String name) {
		super(name, Geometric.ModeKey.Enum.class);
		}

		}

		public static final Key<Geometric.ModeKey.Enum> MODE =
		@@ -520,6 +559,7 @@ public final class CaptureRequestKeys {
		private ModeKey(String name) {
		super(name, HotPixel.ModeKey.Enum.class);
		}

		}

		public static final Key<HotPixel.ModeKey.Enum> MODE =
		@@ -568,6 +608,7 @@ public final class CaptureRequestKeys {
		private OpticalStabilizationModeKey(String name) {
		super(name, Lens.OpticalStabilizationModeKey.Enum.class);
		}

		}

		public static final Key<Lens.OpticalStabilizationModeKey.Enum> OPTICAL_STABILIZATION_MODE =
		@@ -592,6 +633,7 @@ public final class CaptureRequestKeys {
		private ModeKey(String name) {
		super(name, NoiseReduction.ModeKey.Enum.class);
		}

		}

		public static final Key<NoiseReduction.ModeKey.Enum> MODE =
		@@ -622,6 +664,7 @@ public final class CaptureRequestKeys {
		private MetadataModeKey(String name) {
		super(name, Request.MetadataModeKey.Enum.class);
		}

		}

		public static final Key<Request.MetadataModeKey.Enum> METADATA_MODE =
		@@ -642,6 +685,7 @@ public final class CaptureRequestKeys {
		private TypeKey(String name) {
		super(name, Request.TypeKey.Enum.class);
		}

		}

		public static final Key<Request.TypeKey.Enum> TYPE =
		@@ -682,6 +726,7 @@ public final class CaptureRequestKeys {
		private ModeKey(String name) {
		super(name, Shading.ModeKey.Enum.class);
		}

		}

		public static final Key<Shading.ModeKey.Enum> MODE =
		@@ -708,6 +753,7 @@ public final class CaptureRequestKeys {
		private FaceDetectModeKey(String name) {
		super(name, Statistics.FaceDetectModeKey.Enum.class);
		}

		}

		public static final Key<Statistics.FaceDetectModeKey.Enum> FACE_DETECT_MODE =
		@@ -726,6 +772,7 @@ public final class CaptureRequestKeys {
		private HistogramModeKey(String name) {
		super(name, Statistics.HistogramModeKey.Enum.class);
		}

		}

		public static final Key<Statistics.HistogramModeKey.Enum> HISTOGRAM_MODE =
		@@ -744,6 +791,7 @@ public final class CaptureRequestKeys {
		private SharpnessMapModeKey(String name) {
		super(name, Statistics.SharpnessMapModeKey.Enum.class);
		}

		}

		public static final Key<Statistics.SharpnessMapModeKey.Enum> SHARPNESS_MAP_MODE =
		@@ -774,6 +822,7 @@ public final class CaptureRequestKeys {
		private ModeKey(String name) {
		super(name, Tonemap.ModeKey.Enum.class);
		}

		}

		public static final Key<Tonemap.ModeKey.Enum> MODE =
		@@ -796,34 +845,13 @@ public final class CaptureRequestKeys {
		private TransmitKey(String name) {
		super(name, Led.TransmitKey.Enum.class);
		}

		}

		public static final Key<Led.TransmitKey.Enum> TRANSMIT =
		new TransmitKey("android.led.transmit");

		}

		static {
		CameraMetadata.registerEnumValues(Control.SceneModeKey.Enum.class, new int[] {
		0, // UNSUPPORTED
		1, // FACE_PRIORITY
		2, // ACTION
		3, // PORTRAIT
		4, // LANDSCAPE
		5, // NIGHT
		6, // NIGHT_PORTRAIT
		7, // THEATRE
		8, // BEACH
		9, // SNOW
		10, // SUNSET
		11, // STEADYPHOTO
		12, // FIREWORKS
		13, // SPORTS
		14, // PARTY
		15, // CANDLELIGHT
		16, // BARCODE
		});
		}
		}

core/java/android/hardware/photography/CaptureResultKeys.java

+21 −3

Original line number	Diff line number	Diff line
		@@ -56,6 +56,7 @@ public final class CaptureResultKeys {
		private ModeKey(String name) {
		super(name, ColorCorrection.ModeKey.Enum.class);
		}

		}

		public static final Key<ColorCorrection.ModeKey.Enum> MODE =
		@@ -90,6 +91,7 @@ public final class CaptureResultKeys {
		private AeStateKey(String name) {
		super(name, Control.AeStateKey.Enum.class);
		}

		}

		public static final Key<Control.AeStateKey.Enum> AE_STATE =
		@@ -116,6 +118,7 @@ public final class CaptureResultKeys {
		private AfModeKey(String name) {
		super(name, Control.AfModeKey.Enum.class);
		}

		}

		public static final Key<Control.AfModeKey.Enum> AF_MODE =
		@@ -144,6 +147,7 @@ public final class CaptureResultKeys {
		private AfStateKey(String name) {
		super(name, Control.AfStateKey.Enum.class);
		}

		}

		public static final Key<Control.AfStateKey.Enum> AF_STATE =
		@@ -178,6 +182,7 @@ public final class CaptureResultKeys {
		private AwbModeKey(String name) {
		super(name, Control.AwbModeKey.Enum.class);
		}

		}

		public static final Key<Control.AwbModeKey.Enum> AWB_MODE =
		@@ -202,6 +207,7 @@ public final class CaptureResultKeys {
		private AwbStateKey(String name) {
		super(name, Control.AwbStateKey.Enum.class);
		}

		}

		public static final Key<Control.AwbStateKey.Enum> AWB_STATE =
		@@ -222,6 +228,7 @@ public final class CaptureResultKeys {
		private ModeKey(String name) {
		super(name, Control.ModeKey.Enum.class);
		}

		}

		public static final Key<Control.ModeKey.Enum> MODE =
		@@ -246,6 +253,7 @@ public final class CaptureResultKeys {
		private ModeKey(String name) {
		super(name, Edge.ModeKey.Enum.class);
		}

		}

		public static final Key<Edge.ModeKey.Enum> MODE =
		@@ -274,6 +282,7 @@ public final class CaptureResultKeys {
		private ModeKey(String name) {
		super(name, Flash.ModeKey.Enum.class);
		}

		}

		public static final Key<Flash.ModeKey.Enum> MODE =
		@@ -296,6 +305,7 @@ public final class CaptureResultKeys {
		private StateKey(String name) {
		super(name, Flash.StateKey.Enum.class);
		}

		}

		public static final Key<Flash.StateKey.Enum> STATE =
		@@ -320,6 +330,7 @@ public final class CaptureResultKeys {
		private ModeKey(String name) {
		super(name, HotPixel.ModeKey.Enum.class);
		}

		}

		public static final Key<HotPixel.ModeKey.Enum> MODE =
		@@ -372,6 +383,7 @@ public final class CaptureResultKeys {
		private OpticalStabilizationModeKey(String name) {
		super(name, Lens.OpticalStabilizationModeKey.Enum.class);
		}

		}

		public static final Key<Lens.OpticalStabilizationModeKey.Enum> OPTICAL_STABILIZATION_MODE =
		@@ -388,6 +400,7 @@ public final class CaptureResultKeys {
		private StateKey(String name) {
		super(name, Lens.StateKey.Enum.class);
		}

		}

		public static final Key<Lens.StateKey.Enum> STATE =
		@@ -412,6 +425,7 @@ public final class CaptureResultKeys {
		private ModeKey(String name) {
		super(name, NoiseReduction.ModeKey.Enum.class);
		}

		}

		public static final Key<NoiseReduction.ModeKey.Enum> MODE =
		@@ -438,6 +452,7 @@ public final class CaptureResultKeys {
		private MetadataModeKey(String name) {
		super(name, Request.MetadataModeKey.Enum.class);
		}

		}

		public static final Key<Request.MetadataModeKey.Enum> METADATA_MODE =
		@@ -482,6 +497,7 @@ public final class CaptureResultKeys {
		private ModeKey(String name) {
		super(name, Shading.ModeKey.Enum.class);
		}

		}

		public static final Key<Shading.ModeKey.Enum> MODE =
		@@ -506,6 +522,7 @@ public final class CaptureResultKeys {
		private FaceDetectModeKey(String name) {
		super(name, Statistics.FaceDetectModeKey.Enum.class);
		}

		}

		public static final Key<Statistics.FaceDetectModeKey.Enum> FACE_DETECT_MODE =
		@@ -534,6 +551,7 @@ public final class CaptureResultKeys {
		private HistogramModeKey(String name) {
		super(name, Statistics.HistogramModeKey.Enum.class);
		}

		}

		public static final Key<Statistics.HistogramModeKey.Enum> HISTOGRAM_MODE =
		@@ -554,6 +572,7 @@ public final class CaptureResultKeys {
		private SharpnessMapModeKey(String name) {
		super(name, Statistics.SharpnessMapModeKey.Enum.class);
		}

		}

		public static final Key<Statistics.SharpnessMapModeKey.Enum> SHARPNESS_MAP_MODE =
		@@ -584,6 +603,7 @@ public final class CaptureResultKeys {
		private ModeKey(String name) {
		super(name, Tonemap.ModeKey.Enum.class);
		}

		}

		public static final Key<Tonemap.ModeKey.Enum> MODE =
		@@ -606,15 +626,13 @@ public final class CaptureResultKeys {
		private TransmitKey(String name) {
		super(name, Led.TransmitKey.Enum.class);
		}

		}

		public static final Key<Led.TransmitKey.Enum> TRANSMIT =
		new TransmitKey("android.led.transmit");

		}

		static {
		}
		}