OSDN Git Service
Glenn Kasten [Mon, 3 Feb 2014 17:36:13 +0000 (17:36 +0000)]
am
479801e5: am
69e382cc: Merge "audio_route: fix crash with unsupported control types"
* commit '
479801e51167f500d419fee919ab9fc5302aaf44':
audio_route: fix crash with unsupported control types
Glenn Kasten [Mon, 3 Feb 2014 17:29:47 +0000 (17:29 +0000)]
am
69e382cc: Merge "audio_route: fix crash with unsupported control types"
* commit '
69e382cc98d84c2fee6461a21a91b8dfbd66c6b5':
audio_route: fix crash with unsupported control types
Glenn Kasten [Mon, 3 Feb 2014 17:23:46 +0000 (17:23 +0000)]
Merge "audio_route: fix crash with unsupported control types"
Eric Laurent [Wed, 18 Dec 2013 17:58:04 +0000 (09:58 -0800)]
audio_route: fix crash with unsupported control types
Check if control type is supported before accessing xxx_value
fields in mixer_state structure.
Also remove unused parameter warning.
Change-Id: I9005d4760e55f0798d576bd4507700e198900311
Colin Cross [Mon, 27 Jan 2014 22:38:07 +0000 (22:38 +0000)]
am
e41370ac: am
b4522d54: Merge "fix compiling against 64-bit bionic"
* commit '
e41370ac58669544f6a8bebfef30069d65c8253f':
fix compiling against 64-bit bionic
Colin Cross [Mon, 27 Jan 2014 22:33:02 +0000 (22:33 +0000)]
am
b4522d54: Merge "fix compiling against 64-bit bionic"
* commit '
b4522d546444eb1f5ffe8f78c6ea6ef0d4de04d2':
fix compiling against 64-bit bionic
Colin Cross [Mon, 27 Jan 2014 22:26:06 +0000 (22:26 +0000)]
Merge "fix compiling against 64-bit bionic"
Colin Cross [Sat, 25 Jan 2014 02:20:15 +0000 (18:20 -0800)]
fix compiling against 64-bit bionic
64-bit bionic does not define pthread_cond_timedwait_relative_np,
fall back to pthread_cond_timedwait if
HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is not set.
Also fixes an incorrect calculation of nsecs from msecs.
Change-Id: I6f7dab2d2fcc32dd32d6cfe81146150770889f1c
Igor Murashkin [Sat, 18 Jan 2014 02:45:59 +0000 (02:45 +0000)]
Merge "camera_metadata: Add android.request.partialResultCount"
Ruben Brunk [Sat, 18 Jan 2014 02:31:04 +0000 (02:31 +0000)]
Merge "camera3: Update optical stabilization tags."
Igor Murashkin [Fri, 10 Jan 2014 22:18:30 +0000 (14:18 -0800)]
camera_metadata: Add android.request.partialResultCount
Change-Id: Ie21010767ad1e58b3a46e977e7f9ee7f1951bad2
Ruben Brunk [Thu, 16 Jan 2014 02:09:41 +0000 (18:09 -0800)]
camera3: Update optical stabilization tags.
Change-Id: Ic2bdec216c1685f2ea3036f9d027ea24679a8bfe
Igor Murashkin [Fri, 17 Jan 2014 01:51:36 +0000 (17:51 -0800)]
camera_metadata: Add synchronization definitions to enable LIMITED HAL3 devices
Change-Id: Ic5fda4bdc3dda0d21f4738c81b5742f86e4ef02c
Igor Murashkin [Fri, 10 Jan 2014 01:43:38 +0000 (17:43 -0800)]
camera_metadata: Add test patterns and pipeline depth information
Bug:
9625427
Change-Id: I11ff3a74f3a115ac9b699ce516400ed323c274f9
Ruben Brunk [Sat, 18 Jan 2014 01:43:49 +0000 (01:43 +0000)]
Merge "camera3: Update sceneMode tag spec."
Igor Murashkin [Sat, 18 Jan 2014 01:27:15 +0000 (17:27 -0800)]
camera_metadata: regenerate HTML
Change-Id: Ic6e765f98f8b34a388bef876a1b2852b6e86fcb2
Igor Murashkin [Tue, 14 Jan 2014 00:51:17 +0000 (16:51 -0800)]
camera_metadata: Update android.tonemap.* definitions
Change-Id: Icdabd02d892018b104955146a4d94b5042ea59d8
Zhijun He [Sat, 18 Jan 2014 00:45:32 +0000 (00:45 +0000)]
Merge "camera_metadata: Update android.shading.mode spec"
Ruben Brunk [Sat, 18 Jan 2014 00:44:20 +0000 (00:44 +0000)]
Merge "camera3: Update availableEffects, effectMode tags."
Zhijun He [Wed, 15 Jan 2014 18:34:02 +0000 (10:34 -0800)]
camera_metadata: Update android.shading.mode spec
Change-Id: I1860b8f80f8e9e25e40831e74475891ba3a81884
Ruben Brunk [Wed, 15 Jan 2014 01:17:19 +0000 (17:17 -0800)]
camera3: Update availableEffects, effectMode tags.
Change-Id: I1edc89f7af9ef15894cfd398116730afa6b0053c
Ruben Brunk [Fri, 17 Jan 2014 23:34:56 +0000 (23:34 +0000)]
Merge "camera3: Update availableSceneModes tag spec."
Ruben Brunk [Wed, 15 Jan 2014 01:46:58 +0000 (17:46 -0800)]
camera3: Update availableSceneModes tag spec.
Change-Id: Ic12f131e438d1370c9db0027a4c54a540a5cb78f
Ruben Brunk [Fri, 17 Jan 2014 23:29:12 +0000 (23:29 +0000)]
Merge "camera3: Update sceneModeOverrides tag spec."
Ruben Brunk [Wed, 15 Jan 2014 03:31:21 +0000 (19:31 -0800)]
camera3: Update sceneModeOverrides tag spec.
Change-Id: Ia16d283df2ffc1b21cb68a6f73280629dd259306
Ruben Brunk [Fri, 17 Jan 2014 23:24:06 +0000 (23:24 +0000)]
Merge "camera3: Update focalLength tags."
Igor Murashkin [Fri, 10 Jan 2014 23:58:35 +0000 (15:58 -0800)]
camera_metadata: Update spec for android.colorCorrection.*
Change-Id: I02ba758f3da9e7c9e304591c410ca5385ebf4b4b
Igor Murashkin [Tue, 14 Jan 2014 01:22:58 +0000 (17:22 -0800)]
camera_metadata: Specify frame durations and minimum frame durations
Change-Id: Ic52c54c3c26e3547a1064fc5afc8ebbac5b392ad
Ruben Brunk [Fri, 17 Jan 2014 22:09:05 +0000 (22:09 +0000)]
Merge "Revert "Revert "camera3: Update vendor tag spec for HAL 3.2."""
Ruben Brunk [Fri, 17 Jan 2014 22:08:53 +0000 (22:08 +0000)]
Revert "Revert "camera3: Update vendor tag spec for HAL 3.2.""
This reverts commit
706caa81e62a1ec7f44caa83f367d75f4b86413e.
Change-Id: Iaecc491ea585ec8353ad03995d753ea13462200e
Ruben Brunk [Wed, 15 Jan 2014 02:55:29 +0000 (18:55 -0800)]
camera3: Update sceneMode tag spec.
Change-Id: I495435397086a295280c556d94fe8efd442a12c3
Zhijun He [Thu, 16 Jan 2014 17:47:07 +0000 (09:47 -0800)]
camera_metadata: Update available formats and sizes
Below tag specs are updated:
- android.scaler.availableFormats
- android.scaler.availableJpegSizes
- android.scaler.availableProcessedSizes
Change-Id: Icbb25f64d0b19685db1ea024db44d54b197fab0b
Ruben Brunk [Fri, 17 Jan 2014 19:33:34 +0000 (19:33 +0000)]
Merge "Revert "camera3: Update vendor tag spec for HAL 3.2.""
Ruben Brunk [Fri, 17 Jan 2014 19:33:04 +0000 (19:33 +0000)]
Revert "camera3: Update vendor tag spec for HAL 3.2."
This reverts commit
90951279fb355334ec7173c95cd6c857a525f6ef.
Change-Id: I7795811b0fe25209bfcaaa9aa8b8a1062b2198fd
Ruben Brunk [Fri, 17 Jan 2014 19:05:00 +0000 (19:05 +0000)]
Merge "camera3: Update vendor tag spec for HAL 3.2."
Ruben Brunk [Thu, 16 Jan 2014 02:39:35 +0000 (18:39 -0800)]
camera3: Update focalLength tags.
Change-Id: I59614223ae65e602f3461029cb4b8848fb22950e
Ruben Brunk [Fri, 17 Jan 2014 18:32:07 +0000 (18:32 +0000)]
Merge "camera3: Update filterDensity, availableFilterDensity tags."
Zhijun He [Wed, 15 Jan 2014 21:47:59 +0000 (13:47 -0800)]
camera_metadata: Update flash mode tag specs
Also added some minor update for captureIntent tag.
Change-Id: Ia667395962bec0f3eb0fe6212570369d0e975c98
Ruben Brunk [Thu, 16 Jan 2014 00:12:07 +0000 (16:12 -0800)]
camera3: Update filterDensity, availableFilterDensity tags.
Change-Id: I27cdf25e370f30637a1e027a57145b0276e5fb0f
Zhijun He [Tue, 14 Jan 2014 00:24:31 +0000 (16:24 -0800)]
camera_metadata: Update 3A state related tags
Below tags are updated:
- android.control.afState: add state transition tables.
- android.control.aeState: add state transition tables.
- android.control.awbState: add state transition tables.
- android.control.afTrigger: some minor corrections.
- android.control.aePrecaptureTrigger: some minor corrections.
Change-Id: I9e134ef4ea4e56336165b80a5850bc602c50f170
Ruben Brunk [Tue, 14 Jan 2014 23:37:33 +0000 (15:37 -0800)]
camera3: Update vendor tag spec for HAL 3.2.
- Deprecates vendor_tag_query_ops struct.
- Moves vendor tag ops declaration to a separate header.
Change-Id: I8066efbea6df20ddb494892684e6571c4fd6d369
Eino-Ville Talvala [Fri, 17 Jan 2014 00:15:08 +0000 (16:15 -0800)]
camera_metadata: Make @see output stable.
Use a sorted list instead of a set for outputting summaries
for filter_tag.
Bug:
12591820
Change-Id: Ia91b4fafb7f1b0c55895e215efcc5e3564cce800
Zhijun He [Thu, 16 Jan 2014 20:13:35 +0000 (12:13 -0800)]
camera_metadata: Update tag spec tone
Minor update for the tag spec tone.
Change-Id: I331a9416969e4d72ff020450fd32f8f34d013970
Igor Murashkin [Thu, 16 Jan 2014 01:05:22 +0000 (17:05 -0800)]
camera_metadata: Enum notes now render via markdown and get linkified
Change-Id: I60189bda78c70e52d6817fb7831610be1c2119a1
Igor Murashkin [Tue, 14 Jan 2014 00:59:47 +0000 (16:59 -0800)]
camera_metadata: Deprecate android.statistics.predictedColor*
Change-Id: I1338a5452faf74ca99973bd7a884834b04c7236a
Igor Murashkin [Tue, 14 Jan 2014 22:57:46 +0000 (14:57 -0800)]
camera_metadata: Fix @see being emitted into middle of javadoc (+more)
Other minor fixes:
- javadoc optional/FULL correctly emitted for properties lacking details
- javadoc details being incorrectly dedented before being rendered by
markdown, causing spurious <code> blocks to be emitted
Bug:
12552669
Change-Id: Ifced75d3c7ff1a4ddd49e013747420f8da4cbe5a
Zhijun He [Wed, 15 Jan 2014 00:30:31 +0000 (16:30 -0800)]
camera_metadata: Update awb mode related tag specs
Below tag specs are updated:
- android.control.awbAvailableModes
- android.control.awbMode (control and dynamic)
Change-Id: Ib1eb5947d7bf2eb76015f120f75148759b7899b4
Zhijun He [Tue, 14 Jan 2014 17:59:04 +0000 (09:59 -0800)]
camera_metadata: Update afAvailableModes tag
Change-Id: I7301021a78c45f76ce2b133663552648712e78e8
Zhijun He [Fri, 10 Jan 2014 18:22:53 +0000 (10:22 -0800)]
camera_metadata: Update lens aperture related tags
Change-Id: I542630509a7bb867bcf780d5d5b4542c36dd74cf
Eino-Ville Talvala [Mon, 13 Jan 2014 23:38:52 +0000 (23:38 +0000)]
Merge "camera_metadata: Update android.control.aeMode, .aeAvailableModes"
Eino-Ville Talvala [Thu, 9 Jan 2014 00:16:53 +0000 (16:16 -0800)]
camera_metadata: Update android.control.aeMode, .aeAvailableModes
Change-Id: Iad60cb27ba7b150f958778e9965db9474252f769
Igor Murashkin [Mon, 13 Jan 2014 19:50:24 +0000 (11:50 -0800)]
camera_metadata: Add ascii table generation to markdown
Change-Id: Ic82c0427ceda0ee9935caee1f4d27d66cc6a2961
Igor Murashkin [Fri, 10 Jan 2014 23:12:40 +0000 (15:12 -0800)]
camera_metadata: Fix HTML range output not to swallow the > sign
- escape all uses of > with &gt; so that it gets converted to
'>' before markdown renders it.
- use regular > for markdown block quotes
Change-Id: Ib86f83102a308613153d09dc5bae2bdb97c3d14f
Igor Murashkin [Fri, 10 Jan 2014 01:44:57 +0000 (17:44 -0800)]
camera_metadata: Fix broken metadata-validate script
- also make validate more robust by checking <clone> target paths
Change-Id: If5652caa35056b640692ac69a17bbc9a76821ffb
Eino-Ville Talvala [Mon, 30 Dec 2013 20:03:45 +0000 (12:03 -0800)]
camera_metadata: Update android.control.aeAntibandingMode
As well as android.control.aeAvailableAntibandingModes.
Change-Id: I36270f47bd94905111ba567e4524c58b1099bcbc
Eino-Ville Talvala [Fri, 3 Jan 2014 00:11:44 +0000 (16:11 -0800)]
camera_metadata: Automatically linkify tag names
Change-Id: I5f07a99765174f519e5d1187b38fd0e7ab355d3f
Igor Murashkin [Fri, 27 Dec 2013 23:30:25 +0000 (15:30 -0800)]
camera_metadata: Make word breaks work for entry names
- Fixes a bug where word breaks were only inserted once into a string.
- Adds unit tests for word breaks
- Unit tests are now always run when generating metadata
Bug:
12301333
Change-Id: Id604ecd275d026bb8818e56f1af0f03eb66edd41
Eino-Ville Talvala [Thu, 26 Dec 2013 21:16:54 +0000 (13:16 -0800)]
camera_metadata: Update android.blackLevel.lock
Change-Id: I1e0ebcaf1c7ec3643464e3d92ac1fc116f85e67b
Eino-Ville Talvala [Fri, 27 Dec 2013 21:50:19 +0000 (13:50 -0800)]
camera_metadata: Add 'hal_details' field, rename 'notes' field to 'details'
- Details will contain the full documentation aimed at API users
- HAL details will contain additional notes for HAL implementors
Change-Id: I66452914382b8eca166a032bff4681d7fcef22cf
Eino-Ville Talvala [Thu, 26 Dec 2013 20:06:13 +0000 (12:06 -0800)]
camera_metadata: Move notes to its own row.
Since the notes field is the majority of the docs, give it more room, to
roughly match the width of the javadoc.
Change-Id: I44e206ec1c6411f57f26235fc8b18a7407d07c22
Zhijun He [Thu, 12 Dec 2013 01:03:24 +0000 (17:03 -0800)]
camera_metadata: update jpeg thumbnail related specs
Below tags are updated:
- android.jpeg.thumbnailSize
- android.jpeg.availableThumbnailSizes
Bug:
12135317
Change-Id: I8dc9122fd009051d5b83de3d8c14fc4903ade3c5
Eric Laurent [Wed, 18 Dec 2013 22:56:40 +0000 (22:56 +0000)]
am
c5b5f6b3: audio_route: fix crash with unsupported control types
* commit '
c5b5f6b344e3d8448e436835e5214364469614f6':
audio_route: fix crash with unsupported control types
Eric Laurent [Wed, 18 Dec 2013 17:58:04 +0000 (09:58 -0800)]
audio_route: fix crash with unsupported control types
Check if control type is supported before accessing xxx_value
fields in mixer_state structure.
Also remove unused parameter warning.
Change-Id: I9005d4760e55f0798d576bd4507700e198900311
Zhijun He [Mon, 16 Dec 2013 23:08:14 +0000 (15:08 -0800)]
camera_metadata: Update metadata tag specs
Below tags are updated:
- android.edge.mode
- android.noiseReduction.mode
Bug:
12135317
Change-Id: I0d3f1d920f37d3513ed64eeb5740a8017bf8f451
Zhijun He [Sat, 14 Dec 2013 01:48:53 +0000 (17:48 -0800)]
camera_metadata: Update metadata tag specs
Below tag specs are updated:
- android.control.mode
- android.control.aeMode
- android.control.afMode
- android.control.awbMode
Bug:
12135317
Change-Id: I187d4d404b5c30f0179bf85724c72f5303905fb7
Igor Murashkin [Wed, 11 Dec 2013 21:31:00 +0000 (13:31 -0800)]
camera_metadata: Add support for embedding images into html/javadoc
- Also finishes specifying the lensShadingMap related fields
Bug:
12135317
Change-Id: I488f76db4650fcc4f8ce6d45e420217016837fbc
Igor Murashkin [Wed, 11 Dec 2013 18:21:58 +0000 (18:21 +0000)]
Merge "camera_metadata: add markdown support to rendering HTML/javadoc"
Igor Murashkin [Mon, 9 Dec 2013 20:06:17 +0000 (12:06 -0800)]
camera_metadata: add markdown support to rendering HTML/javadoc
- Also update the android.blackLevel.lock description
(as an example of using markdown)
Change-Id: I1107cfc2a024d0dd8227ec6afa76f9fbc7f473ad
Zhijun He [Thu, 5 Dec 2013 15:44:56 +0000 (07:44 -0800)]
camera_metadata: add API to query metadata alignment
Bug:
12010193
Change-Id: I7d190a183fa89d96cc3cbd59228df3f2a2347c2e
Zhijun He [Tue, 26 Nov 2013 21:41:18 +0000 (13:41 -0800)]
camera_metadata: fix metadata clone bug
clone_camera_metadata fails at validation during camera start, then crashes
camera.
Bug:
11879762
Change-Id: I9437c6724dd290aec162ae8b68be898b2f9a5b9e
Alex Ray [Tue, 19 Nov 2013 00:02:26 +0000 (16:02 -0800)]
libcamera_metadata: export include dir
Change-Id: I7327205cceecc429ee048c1620d5ba9b660141f0
Zhijun He [Fri, 15 Nov 2013 20:58:50 +0000 (20:58 +0000)]
Merge "camera_metadata: update metadata type in metadata test"
Zhijun He [Thu, 14 Nov 2013 22:19:02 +0000 (14:19 -0800)]
camera_metadata: update metadata type in metadata test
android.colorCorrection.transform was updated to rational type in metadata
change.
Also cleanup the code a little bit.
Bug:
11691467
Change-Id: I71daefdfdf733d65016c51c90e04d9ac0b4b1d4a
Alex Ray [Wed, 13 Nov 2013 02:09:31 +0000 (18:09 -0800)]
libcamera_metadata: assert correct state on exit
Change-Id: I2d9138f61665baa6695ac086184246334038236d
Eino-Ville Talvala [Fri, 8 Nov 2013 17:54:24 +0000 (09:54 -0800)]
am
52a64a57: Camera: Make partialResult quirk fields hidden, not system.
* commit '
52a64a571f037c5b519b98c69a3b47466d4accce':
Camera: Make partialResult quirk fields hidden, not system.
Eino-Ville Talvala [Thu, 7 Nov 2013 22:43:43 +0000 (14:43 -0800)]
Camera: Make partialResult quirk fields hidden, not system.
Bug:
11115603
Change-Id: I39c51f0a7655736ff216143ece951102930af93c
Eino-Ville Talvala [Tue, 5 Nov 2013 23:53:22 +0000 (15:53 -0800)]
am
82ce3311: Camera: Add partialResult quirk metadata fields
* commit '
82ce3311c9430610330456412b0dfab208a7dee3':
Camera: Add partialResult quirk metadata fields
Eino-Ville Talvala [Thu, 10 Oct 2013 01:21:30 +0000 (18:21 -0700)]
Camera: Add partialResult quirk metadata fields
To be used by HALs to split up capture results into
multiple batches.
Bug:
11115603
Change-Id: I5cfc26b2812f9bf4613944c0679e0e29cfd43616
Zhijun He [Mon, 7 Oct 2013 18:23:30 +0000 (11:23 -0700)]
camera_metadata: hide some face metadata
Face ids, scores, rectangels, landmarks are not needed to be exposed to API.
Bug:
11082745
Change-Id: Iaf89f0d6c3e0391ba907a2167d1b56ad10fc6e98
Alex Ray [Thu, 24 Oct 2013 21:01:55 +0000 (14:01 -0700)]
libcamera_metadata: document return values
Change-Id: I940dc7c90f1b1491194e03120c70af4c3893defe
Alex Ray [Mon, 21 Oct 2013 19:57:05 +0000 (12:57 -0700)]
libcamera_metadata: Minor fixes
Add method to get read-only metadata entry by index.
Update some function descriptions to show return values.
Change-Id: Ib79ec1aab8f44f4ee7122fd56064514b2d6f78b4
Ed Heyl [Thu, 17 Oct 2013 00:48:28 +0000 (17:48 -0700)]
merge in klp-release (no-op)
The Android Automerger [Thu, 10 Oct 2013 13:01:53 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Zhijun He [Sun, 6 Oct 2013 20:03:07 +0000 (13:03 -0700)]
camera_metadata: Add CaptureResult cts test
Also remove the new line from CameraMetadataKeys.mako to avoid adding new line
to the generated file every time we run the script.
Bug:
11082745
Change-Id: I6bed9a71463d866adfe4178e00c33df7b9158ab8
Ed Heyl [Tue, 8 Oct 2013 23:03:11 +0000 (16:03 -0700)]
merge in KFS78N (no-op)
Ed Heyl [Tue, 8 Oct 2013 22:45:09 +0000 (15:45 -0700)]
merge in KQS81M
The Android Automerger [Tue, 8 Oct 2013 13:01:49 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Alex Ray [Mon, 7 Oct 2013 23:25:55 +0000 (23:25 +0000)]
Merge "camera_metadata: add non-full hw level optional tag" into klp-dev
The Android Automerger [Sun, 6 Oct 2013 13:02:26 +0000 (06:02 -0700)]
merge in klp-release history after reset to klp-dev
Alex Ray [Wed, 2 Oct 2013 00:52:33 +0000 (17:52 -0700)]
camera_metadata: add non-full hw level optional tag
Bug:
10838063
Change-Id: If6d1ef5bd58aca3a9a722e4317f5ce6804dd6680
Zhijun He [Wed, 2 Oct 2013 21:06:15 +0000 (14:06 -0700)]
camera_metadata: make face score range 1-100
1-100 is what we specified in API side.
Bug:
10406212
Change-Id: Id0180dc44b95c43ad820a307d9e3bd98b8fd74fb
The Android Automerger [Tue, 1 Oct 2013 13:01:49 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Igor Murashkin [Mon, 30 Sep 2013 19:19:19 +0000 (12:19 -0700)]
camera_metadata: Update CameraCharactericsTest to check #getKeys()
Bug:
11007040
Change-Id: If934f861db61cd23af029104d8120a08e52a27ae
The Android Automerger [Sun, 29 Sep 2013 13:01:56 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Zhijun He [Thu, 26 Sep 2013 17:27:47 +0000 (10:27 -0700)]
camera_metadata: Fix focusRange definition
It should be a pair of floats.
Bug:
10360518
Change-Id: Ia24741ce9bcae4473eee8be0adc3a190efeab0b8
The Android Automerger [Thu, 26 Sep 2013 13:02:21 +0000 (06:02 -0700)]
merge in klp-release history after reset to klp-dev
Zhijun He [Thu, 26 Sep 2013 00:03:56 +0000 (00:03 +0000)]
Merge "camera_metadata: Update CameraCharacteristicsTest" into klp-dev
Eino-Ville Talvala [Wed, 25 Sep 2013 19:27:27 +0000 (19:27 +0000)]
Merge "Camera: Add PASSIVE_UNFOCUSED AF state" into klp-dev
Zhijun He [Wed, 25 Sep 2013 17:08:37 +0000 (10:08 -0700)]
camera_metadata: Update CameraCharacteristicsTest
Replace CameraDevice#getProperties with CameraManager#getCameraCharacteristics.
Bug:
10360518
Change-Id: Id79ee8d984b79ed43bccf77bb571eb6d788e1a1a
The Android Automerger [Tue, 24 Sep 2013 13:02:16 +0000 (06:02 -0700)]
merge in klp-release history after reset to klp-dev
OSDN Git Service
