Commit Graph

727 Commits

Author SHA1 Message Date
Zhijun He
8dda7273db Camera2: Add partial flash state
Bug 13637334

Change-Id: Ife5d943851f3f47d33b05d7450765dd273eb1036
2014-03-25 13:49:30 -07:00
Ruben Brunk
0dfdcb1019 Merge "camera3: Update whiteLevel/greenSplit docs." 2014-03-25 00:12:21 +00:00
Ruben Brunk
e89b120eae camera3: Update whiteLevel/greenSplit docs.
Bug: 13191430
Change-Id: I61cab65da546bdf1a748f46c28b6fce218b27bc4
2014-03-24 17:10:35 -07:00
Jinsuk Kim
1c855178e4 am 775a097f: am 3c34e5db: am c01e1aeb: Merge "Add HdmiCecManager" into klp-modular-dev
* commit '775a097f01a349548d2124ae9d7dd562c72eaa27':
  Add HdmiCecManager
2014-03-24 21:25:21 +00:00
Jinsuk Kim
3c34e5dbbb am c01e1aeb: Merge "Add HdmiCecManager" into klp-modular-dev
* commit 'c01e1aeb0d86bd626684c97d709d4a8e995fddfb':
  Add HdmiCecManager
2014-03-24 12:26:51 +00:00
Jinsuk Kim
fbcd503645 Add HdmiCecManager
Introduces HdmiCecManager/HdmiCecClient to provide apps/system components
with the way to access HdmiCecService via Context.getSystemService(HDMI_CEC_SERVICE).

Change-Id: I39da071a328074a4b7b049947943688bd7779c26
2014-03-24 08:19:39 +09:00
Colin Cross
a42cb8b0e2 resolved conflicts for merge of a67e34c8 to master
Change-Id: I597525886260884c9b2dfc7945e01eb8138a58c2
2014-03-21 13:11:02 -07:00
Jinsuk Kim
f2fecf48f7 am c61f4dd7: Merge "Add HDMI-CEC service" into klp-modular-dev
* commit 'c61f4dd744b1b0396703aa58eb22fc31d2b7050e':
  Add HDMI-CEC service
2014-03-21 02:37:00 +00:00
Jinsuk Kim
c61f4dd744 Merge "Add HDMI-CEC service" into klp-modular-dev 2014-03-21 02:32:38 +00:00
Jinsuk Kim
4f512fb451 Add HDMI-CEC service
This CL adds a system service handling HDMI-CEC protocol. The service
is equipped with the capability sending/receiving HDMI-CEC messages

Not all the messages are in place. Currently it has messages to support
a few features only, as follows:

- One touch play
- System information
- Routing control (partially - active source status maintenance only)
- Device OSD transfer
- Power status

It will be extended to cover the wider usages in the follow up CLs.

The CEC standard version referenced in the implementation is 1.3a.

Change-Id: Ifed0b02f52ebf098eddb3bd0987efbf353b7e8fe
2014-03-20 16:40:22 +09:00
Igor Murashkin
7d9a8ffd08 camera: Fix setParameters for Preview FPS single/range values
Bug: 12609188
Change-Id: I82ea6f5de2183dd046d4bf5683600c97f37ab4db
2014-03-20 00:21:44 +00:00
John Spurlock
1af30c7ac4 Add stream-level suppression to vibrate/audio services.
- Add new audio restriction layer to app-ops.  Restrictions add
additional constraints to audio operations at a stream-level.
Restrictions do not affect the persistable state, and are purely
additive: that is, they can only impose additional contstraints, not
enable something that has already been disabled.  Restrictions
also support a whitelisted set of exempt package names.

- Add new audio stream-level checks to app-ops.

- Implement a provisional OP_PLAY_AUDIO suppression to three
java entry points MediaPlayer, AudioTrack, & SoundPool.

- Enhance vibrator api to take stream information as an optional
hint - the constants correspond to AudioManager stream types.
OP_VIBRATE now supports the stream-level restriction check.

- Simplify Vibrator subclasses by adding default implementations
for two .vibrate calls.

- Migrate NoMan's zen-mode control to use the new app-ops
stream-level restriction mechanism.

Change-Id: Ifae8952647202f728cf1c73e881452660c704678
2014-03-19 15:32:51 -04:00
Zhijun He
555084b3a5 Merge "Camera2: Update exposureTimeRange related docs" 2014-03-19 02:12:08 +00:00
Zhijun He
ca2926f83b Camera2: Update exposureTimeRange related docs
Bug: 13250951
Change-Id: I8a77feb1b9877c75fd5a41a324fe17605ed338e0
2014-03-18 16:21:45 -07:00
Ruben Brunk
6dc379c7bd hal3: Add missing available mode tags.
Change-Id: I588aacade5c5638967970e2e7eb04924c0ea9cc7
2014-03-18 11:13:44 -07:00
Igor Murashkin
5614cbe644 camera2: Don't log vendor tag errors when camera HAL too old
Change-Id: Id7fe9464d7599a566cea976cddc62ad101cf4a10
2014-03-17 14:00:55 -07:00
Ruben Brunk
9d454fd609 hal3: Add availableHotPixelModes, update modes.
Bug: 12957573
Change-Id: I2fd6ef60bf98c53288c2bc343d82a06602474916
2014-03-14 13:35:57 -07:00
Ruben Brunk
dba764426b Merge "camera3: Pass vendor tags through binder." 2014-03-13 20:18:37 +00:00
Ruben Brunk
85c4388de1 camera3: Pass vendor tags through binder.
Bug: 12134423

Change-Id: Icef3fe9e67160767bdb8244ac49c85b68b497123
2014-03-13 12:14:49 -07:00
RoboErik
306c46884e am ca9eef62: b/12068020 Make kb layouts only unique to vendor/product. Do not merge
* commit 'ca9eef6203b7cfb0084f8305d4dcc5d70a7a25cd':
  b/12068020 Make kb layouts only unique to vendor/product. Do not merge
2014-03-12 21:12:26 +00:00
RoboErik
ca9eef6203 b/12068020 Make kb layouts only unique to vendor/product. Do not merge
This is a cherry-pick of https://googleplex-android-review.git.corp.google.com/#/c/399886/

Instead of storing a kb layout per device descriptor (which is expected
to be unique), store it for each vendor/product. This way we can keep
a consistent layout between identical but physically different keyboards.

There are some corner cases this is expected to fail on, namely devices
that incorrectly have the same vendor/product id. Devices that don't
define a vendor/product id will continue to use the descriptor to store
layout files.

Change-Id: I1f2508561992080459310d5a644dad65a9c24f1a
2014-03-12 13:21:08 -07:00
Jeff Brown
22c38e67d4 am 3c6bb4d4: am f2e837e5: am e7f7af96: am 35c8ebab: Merge "take account of RotationVector\'s new extra parameter"
* commit '3c6bb4d4ec58d03f023280c8be8d95d984c8d1f1':
  take account of RotationVector's new extra parameter
2014-03-11 00:37:53 +00:00
Jeff Brown
f2e837e579 am e7f7af96: am 35c8ebab: Merge "take account of RotationVector\'s new extra parameter"
* commit 'e7f7af964baa3c5d36abd163e33ad139310049d2':
  take account of RotationVector's new extra parameter
2014-03-11 00:11:05 +00:00
Jeff Brown
35c8ebab0a Merge "take account of RotationVector's new extra parameter" 2014-03-11 00:04:49 +00:00
Jason Gerecke
d522074232 Support unique calibration per orientation
Updates the format of the calibration XML to store the Surface rotation
that a specific calibration applies to. Also updates the API to require
a rotation value for get/set, and has the native framework supply this
according to the current rotation whenever it changes.

Change-Id: I72b6703f646dd18db537365c5c9843f720a5f41e
2014-03-10 16:33:48 -07:00
Jason Gerecke
d6396d6720 Allow persistence of input device calibration
This patch extends the PersistentDataStore store to read and write
input device calibration data. A new SET_INPUT_CALIBRATION permission
grants apps the ability to update this information, and a new
TouchCalibration class is used to wrap the raw calibration data.

Change-Id: I4daac2b15ef03616ea5b068c1e77bebd0ce7b8c1
2014-03-10 15:54:21 -07:00
Zhijun He
add749f664 Camera2: make shading.mode key public
Change-Id: I94f506be19940b1881e65a8de9fe8198194932a3
2014-03-04 21:23:34 +00:00
Mike Lockwood
7531aa2235 Add support for USB devices with multiple configurations and alternate interfaces
Added UsbConfiguration class, as well as accessors to UsbDevice to get configuration list
Added methods to UsbDeviceConnection to select configurations and alternate interfaces.

Also added accessors for USB descriptor name strings and fixed some memory leaks in the JNI code.

Bug: 12425052
Change-Id: Idb990f4d5c054a8cb997eb3f440f6da9f83bce05
2014-02-27 09:59:02 -08:00
John Spurlock
a77cf87354 Merge "Tabs -> spaces in frameworks/base." 2014-02-25 19:57:33 +00:00
John Spurlock
8a985d24ce Tabs -> spaces in frameworks/base.
Change-Id: I5a84e8e93ac99b5ed0212b37bf66efa5e53864be
2014-02-25 09:49:29 -05:00
Zhijun He
cc28a41b48 Camera2: Correct some minor errors in awb region spec
Also correct some other typos.

Change-Id: Ib7ac65cd82d06a20aa47cce10a9976a3ac405142
2014-02-24 15:11:23 -08:00
Zhijun He
60b19dc2df Camera2: update 3A state related metadata key docs
Bug: 12840262
Change-Id: I2092e1d24b262a0568b880094b8ad6a87510b346
2014-02-24 10:19:20 -08:00
Ruben Brunk
9b30512e59 camera3: Fix raw/DNG tag visibilility.
Change-Id: Ie3beed773b27bf56689a750e695ac7cb82580639
2014-02-21 10:25:26 -08:00
Ruben Brunk
8eb91e9f28 Merge "camera3: Add green split property." 2014-02-21 18:07:05 +00:00
Ruben Brunk
844aa61960 Merge "camera3: Update whiteLevel tag." 2014-02-19 19:31:57 +00:00
Ruben Brunk
e60e29554b camera3: Update whiteLevel tag.
Change-Id: If5b5191b1c494bc6f86d36e1dc47dd38beb10f2b
2014-02-18 12:17:48 -08:00
Ruben Brunk
987d9f7a6b camera3: Add green split property.
Change-Id: I3d3fa48a0cd6e3a08bed5eb529e7c35676c25607
2014-02-18 11:11:05 -08:00
Zhijun He
870922be23 Camera2: Update java doc for tone.map.curveRed key
Change-Id: I39df3a14470a1f051ee3eb11866e7205ea7b16b6
2014-02-15 21:47:51 -08:00
Zhijun He
fa8cc5f680 Camera2: Unhide some capture request templates
Change-Id: I13a45b51c129ba562cce0374ae3c63e853144c10
2014-02-14 10:48:38 -08:00
Jeff Brown
ca9bc702df Add support for injecting events into ActivityContainers.
Modified ActivityView to inject touch events it receives back into
its activity container.  The container then injects the event into
the input system along with the display id of the underlying virtual
display.

Change-Id: I23d018a2f7dd30f1f833f522eb7f143b43d8e637
2014-02-11 14:47:48 -08:00
Jeff Brown
38f96e5020 Add support for injecting events into ActivityContainers. (DO NOT MERGE)
Modified ActivityView to inject touch events it receives back into
its activity container.  The container then injects the event into
the input system along with the display id of the underlying virtual
display.

Enhanced the input system to support concurrent dispatch of touch
events on multiple displays which is required for this to work.

Change-Id: I9cf1870db3be6f99a52ed9a1e3ceafe42c940093
2014-02-11 14:43:04 -08:00
Eino-Ville Talvala
d8fd67931e camera2: Clean up cross-references
Change-Id: I7410293a13f65768a2aeed1490662735f73987cb
2014-02-10 12:41:04 -08:00
Igor Murashkin
a0ab96d1a7 Merge "camera2: Simplify min frame durations and add available stream configs" 2014-02-08 02:54:03 +00:00
Igor Murashkin
a23ffb5f50 camera2: Simplify min frame durations and add available stream configs
Change-Id: I41951c9a50a333e8e47d0ba616c316c065b604e8
2014-02-07 18:52:50 -08:00
Ruben Brunk
ad0aa8383c Merge "camera2: Update hotpixel tags." 2014-02-08 02:39:22 +00:00
Ruben Brunk
eba1b3a843 camera2: Update hotpixel tags.
Change-Id: I6e2931d54a92f3852e8abe8c480f1762c92655ad
2014-02-07 18:38:46 -08:00
Igor Murashkin
d531f88fdd Merge "camera2: Add tags for querying capabilities of a camera device" 2014-02-08 02:35:49 +00:00
Igor Murashkin
e46c0dad37 camera2: Add tags for querying capabilities of a camera device
Change-Id: I955b514f9fe66205d241cd4072aa6ddf71efb53c
2014-02-07 18:35:11 -08:00
Igor Murashkin
672ad888d2 Merge "camera2: Add android.scaler.availableInputOutputFormatsMap" 2014-02-08 02:22:55 +00:00
Igor Murashkin
418f6df836 camera2: Add android.scaler.availableInputOutputFormatsMap
Change-Id: I2f0000614063f4004aa90ad1846936bf85db0389
2014-02-07 18:20:48 -08:00