Commit Graph

1103 Commits

Author SHA1 Message Date
Jungshik Jang
61f4fbd2e8 Rename HdmiCecDeviceInfo into HdmiDeviceInfo.
In order to include mhl device info to device info,
rename HdmiCecDeviceInfo into HdmiDeviceInfo.

BUG: 16215362

Change-Id: I30fb0216061fbbdd6fdc1b82c63af83f1b678597
2014-08-07 11:14:15 +09:00
Jungshik Jang
8e93c84739 Prevent hot plug detection action from multiple device polling
Along with this removed unused code and wrong references in
java doc.

Change-Id: I8b2fd8065f582f60cde5ada0e1669515b6a60f3f
2014-08-07 09:13:04 +09:00
Igor Murashkin
733341bf0d camera2: (legacy) Support awb mode, test mode metadata keys
Change-Id: Ic013aa820bbea02a662d546eb9f70baa20c0136e
2014-08-06 14:35:40 -07:00
Jungshik Jang
d57ba99a5a Merge "More tweaks for recording" into lmp-dev 2014-08-05 00:07:36 +00:00
Jungshik Jang
e9e0f070e3 More tweaks for recording
1. Mask TimerClearedStatus message result.
2. Use proper mask for media info.

Change-Id: I7ed6f6839c333460a7bef5e5a84af2a9a34c6d97
2014-08-05 18:03:03 +09:00
Michael Wright
3f145a2f95 Add supported refresh rate to displays
Change-Id: I51231dd6dd231d57dd1ac499349d6335121f07d5
2014-08-06 02:03:49 +00:00
Jungshik Jang
2afd97698d Refine recode apis.
1. add return type, int, to toByteArray method so
that caller can know how many of bytes it consumes.

2. put final keyword

Change-Id: Ia942016fa35ecb04b49be51170739101644c3e31
2014-08-05 14:46:05 +09:00
Jungshik Jang
363c4efa51 Merge "Fix invalid annotation, @throw" into lmp-dev 2014-08-05 00:07:36 +00:00
Jungshik Jang
f406cc3442 Fix invalid annotation, @throw
Change-Id: Id22635414567a8b525032df792f2309102d7ae62
2014-08-05 14:27:17 +09:00
Jinsuk Kim
6ffb03816f Plumbing for HdmiTvClient and HdmiControlService
Added a few more methods in HdmiTvClient to use the API provided
by HdmiControlService

Change-Id: Ib506699b9661b99cefc837b96ac64347a4e9420c
2014-08-05 13:05:49 +09:00
Jungshik Jang
e5a9337ebe Implement clear timer.
This change implements clear timer, which sends
<Clear xxx Timer> to recorder, and reponse of it,
<Timer Cleared Status>.
Along with it, add result parser for [Timer Status Data].

Bug: 16160962

Change-Id: I1f48ec055aa93dc836156525de8b7ef921aad8b5
2014-08-05 09:32:34 +09:00
Michael Wright
01e840ff94 Add resize method for virtual displays
Change-Id: I2632fc56c2d2cba356379e42f5c1a3e283b11d1e
2014-08-05 21:10:03 +00:00
Eric Laurent
40b8ef99a5 Merge "SoundTrigger API update." into lmp-dev 2014-08-05 00:34:22 +00:00
Eric Laurent
d3b8223377 SoundTrigger API update.
Add sound model update callback.
Add native service state change callback.
Add vendor UUID in sound model description.
Add coarse confidence level in recognition event.
Add capture format in recognition event.

Bug: 12378680.

Change-Id: Id63437819ec7b9a4a69e1ff6185b747e20cad95e
2014-08-04 16:35:27 -07:00
Jungshik Jang
b634ca8f5f Fix several bugs on timer recoder code.
Change-Id: I331d5c61fa11513584c926fdeea55a5d7adbbad9
2014-08-04 16:27:48 +09:00
Sandeep Siddhartha
2c0273e50a Add a flag for multiple triggers with same recognition session
Also annotate the flags with @IntDef to make things clearer and safer

Add more debug logging

Revert to start/stop being synchronous since telephony and microphone will
need to be handled internally.

Bug: 16731586
Bug: 16514535
Bug: 16549061
Change-Id: I83695d52e9547269c95d443e4d921c9238b7401e
2014-08-01 17:46:27 -07:00
Jinsuk Kim
7e74206693 System API HdmiControlService.getActiveSource
Added getActiveSource to provide Tv Input Service with the information
on HDMI active source/routing path. TIS side will be handled separately.

Change-Id: I3d7c12a6c9da9f96a7f22ba1f66ac2559928858d
2014-08-01 10:13:40 +09:00
Wonsik Kim
c2b74b73a1 Fix NPE when fused geofence hardware is not available.
b/16690237

Change-Id: I3ac50c8fd50fc799afcfc76126a5fd0c9ba0a5f4
2014-07-31 18:24:23 +00:00
destradaa
f9a274c9b8 Add support for sources in Geofencing APIs.
Support setting the source when adding geofences.
b/14117199

Surface the source when FLP geofence changes state.
b/14119200

Change-Id: I50dc40a9caee400594e1778c98e284e0db0d5e66
2014-07-30 23:35:08 +00:00
Ruben Brunk
6a7d8c4289 camera2: Implement request templates for LEGACY.
Bug: 15116722
Change-Id: Ic32e2f597997489642e98bfd8c7582a300f6f29b
2014-07-30 23:15:16 +00:00
Ruben Brunk
3fe9eba904 camera2: Add scene and effect mode for LEGACY.
Bug: 15116722

Change-Id: I0797fccb5fdd8b959622c100f25b2950cfe4e115
2014-07-30 22:09:41 +00:00
Sandeep Siddhartha
1ed12ddb8c Make startRecognition async
- This is needed for telephony and audio integration which should happen via async callbacks
that'll end up starting/stopping recognition.

e.g. if a startRecognition happens when in a phone call - the onDetectionStarted will get called once the phone
call ends.

For now the transient stoppages due to internal reasons will not be propagated back to the client.

Bug: 16514535
Bug: 16515468
Change-Id: I1b2b8edd28f5c5e67c453f66c23e1a67a626114e
2014-07-30 11:43:41 -07:00
Aravind Akella
6fc1901b1a Merge "SensorManager API changes." into lmp-dev 2014-07-28 22:45:16 +00:00
Aravind Akella
0288ca63e3 SensorManager API changes.
i) Remove WAKE_UP_* sensor constants and corresponding string constants.
     ii) Add getDefaultSensor(int, boolean) API.

Bug: 16399898
Change-Id: I53cb7dec02568503ebd35983e6b0c64e9c5070d7
2014-07-29 17:41:02 -07:00
Eino-Ville Talvala
abd9d3c5c7 Camera2: API review updates
- Rename CameraCharacteristics#SENSOR_INFO_TIMESTAMP_CALIBRATION
  to TIMESTAMP_SOURCE
- Remove StreamConfigurationMap#NO_MIN_FRAME_DURATION

Bug: 16402755
Change-Id: I6c30a1e931c9f064c22092d362bcc61bd88e2f8a
2014-07-29 23:30:34 +00:00
Jinsuk Kim
b2b3151a42 Send TV app the intent for the new active source
When signalled by an external CEC device about to become a new active
source, TIF(TvInputHardwareManager) sends an intent for TV app to tune to
the input mapped to the device. For non-CEC devices or MHL device
the device info comes with port ID only, which should be used to find
the right input.

Change-Id: I71c8454fead037d880ee440b0a8d64dd361ed558
2014-07-29 22:41:57 +00:00
Igor Murashkin
ffdfcd7f27 Merge "camera2: legacy: Don't set the @hide frame number metadata" into lmp-dev 2014-07-25 21:16:23 +00:00
Igor Murashkin
56678d8778 camera2: legacy: Don't set the @hide frame number metadata
Change-Id: Id1c8292444a45a97228d5c95f23f6d1f8171d3b5
2014-07-29 15:14:57 -07:00
Igor Murashkin
bdf366cc70 camera2: Api change (#getFrameNumber -> long; @hide REQUEST_FRAME_COUNT)
Change-Id: I164011c97a57fb9fb9c504ae4c5f394dcb36a4bc
2014-07-29 15:09:45 -07:00
Igor Murashkin
3676164462 Merge "camera2: Api change (#getFrameNumber -> long; @hide REQUEST_FRAME_COUNT)" into lmp-dev 2014-07-29 21:36:00 +00:00
Igor Murashkin
3a3eb15741 camera2: legacy: fix cached results bug and fix focus modes
- Also add request.frameCounter and request.pipelineDepth results

Change-Id: I104c8243fa525622cb4ab7b5535cbca8588862f3
2014-07-29 14:23:27 -07:00
Igor Murashkin
83d8639e90 camera2: legacy: Add focus support
* Characteristics will list control.availableAfModes
* Request/result for control.afMode and control.afState

(Does not yet support control.afRegions)

Change-Id: I828111425fa587114d5159f7fb2b1e53a2c74e61
2014-07-29 14:20:41 -07:00
Igor Murashkin
3f2757a305 Merge changes I104c8243,I82811142 into lmp-dev
* changes:
  camera2: legacy: fix cached results bug and fix focus modes
  camera2: legacy: Add focus support
2014-07-25 21:16:23 +00:00
Michael Wright
9469cdde2c Add paragraph tags to MediaProjection docs
Change-Id: Ia881f9bcf3b93bd699f9ddf80d51ec7d0e74d2ed
2014-07-29 20:46:40 +00:00
Sandeep Siddhartha
6817337118 Read the keyphrase ID from the recognition event
Bug: 16516658
Change-Id: Ibeee81c9543aa1091bb075066cfc2269107f13c0
2014-07-29 11:24:51 -07:00
Jinsuk Kim
cfcdf12701 Merge "Add MHL getPortInfo" into lmp-dev 2014-07-24 16:04:26 +00:00
Jinsuk Kim
f4eb72d53b Add MHL getPortInfo
Allows MHL support flag to be put into port information

Bug: 16215362
Change-Id: I1873c8e60b02f47a97509576fc40d57efb056817
2014-07-28 06:57:04 +09:00
Michael Wright
5438e4e173 Add missing documentation for createVirtualDisplay
Fix incorrect access modifier in Activity documentation.

Change-Id: Id41da6ccbdfa8b53c89360c899f3a43aec899982
2014-07-25 23:01:32 +00:00
Ruben Brunk
971251f362 camera2: Update preview counter after request completed.
Bug: 15116722

- This was causing the preview counter to double decrement
  for requests where the jpeg callback was executed first.

Change-Id: I6bfdaa7da7f68e86e05dc7ac60ceb3c8d5a0104a
2014-07-25 22:53:32 +00:00
Yin-Chia Yeh
53bbf11f41 Merge "Camera2: Fix wrong usage of toArray" into lmp-dev 2014-07-24 15:36:21 +00:00
Yin-Chia Yeh
b0056642ca Camera2: Fix wrong usage of toArray
Change to use "<T> T[]" version of toArray.

Change-Id: I021ed5a4e446b34028810e8acea3395c1c3387e7
2014-07-28 13:17:05 -07:00
Eino-Ville Talvala
bd9b106806 Camera2: CameraManager refurbishing and error management
- Invoke availability listeners when first added
- Handle camera service crashes
 - Listen to service death
 - Attempt to rebind on every call if service died
 - If service is still dead, act as if no cameras are connected
- Fix bug in DeviceImpl that prevented proper handling of errors on open
- For clarity, don't UncheckedThrow for exceptions that are already unchecked

Bug: 16514157
Bug: 16483815
Bug: 16483222
Bug: 16561237

Change-Id: I3d54de1204f5a863882cf675fcee6280d53c4039
2014-07-28 20:21:12 +00:00
Sandeep Siddhartha
39c12fab49 Use blob (shared memory) for large data in sound model/recognition event/config
Also add a missing null check in writeBlob

Bug: 16516353
Change-Id: Ie702f8daae541cab7c2cee6e13d49e7fc84c84e1
2014-07-28 11:10:32 -07:00
Jinsuk Kim
68bed6c5d7 Merge "Add portID information in HdmiCecDeviceInfo" into lmp-dev 2014-07-24 16:04:26 +00:00
Jinsuk Kim
2b152015ff Add portID information in HdmiCecDeviceInfo
This change makes it convenient to get the HDMI port ID from the device
info without having to look it up through a separate HdmiPortInfo, which
happens in many places.

Also removed port information lookup loop by introducing two maps variable
in Control Service: port path ->port ID, and port ID -> port info.

Bug: 16547583
Change-Id: Ibfff722a16b626230766058efcc819e9c8ca0663
2014-07-25 02:14:55 +00:00
Jungshik Jang
1660611911 Merge "Replace osd message for record status with IHdmiRecordCallback." into lmp-dev 2014-07-24 16:05:03 +00:00
Jungshik Jang
12e5dcefe1 Replace osd message for record status with IHdmiRecordCallback.
Add new interface, IHdmiRecordCallback, in order to handle
result of all recording features, One Touch Record and
Timer Recording.
HdmiRecordCallback is clientside interface which uses
RecordSource as return of getOneTouchRecordSource,
instead of raw byte array.

Along with it, add TimerRecordingAction.

Bug: 16160962

Change-Id: If0ed7abc5f45b020b39555cac585becbe8ee7da4
2014-07-25 11:33:39 +09:00
Aravind Akella
96eb62c3b9 Define TYPE_PICK_UP_GESTURE.
Change-Id: Ic2c7963352ff954884ce05a0a3a71516ed417140
2014-07-24 17:45:05 -07:00
Ruben Brunk
91838ded36 camera2: Fix LEGACY mode timestamps.
Bug: 15116722

- Add CaptureCollector class to accumulate buffer timestamps
  and manage lifecycle callbacks for each request.
- Set correct timestamps for buffers, results, and callbacks.

Change-Id: I75fa1049cf100d9d14c5ba8992be93ba1048df19
2014-07-25 18:52:10 +00:00
Ruben Brunk
1b1f1b611c camera2: Move noise model to dynamic metadata.
Bug: 16369384

Change-Id: I7a540705176c7be68431a977e2b7218ffa1bddd0
2014-07-24 17:43:54 +00:00