Commit Graph

1124 Commits

Author SHA1 Message Date
Jinsuk Kim
98f4c16a7b Merge "CEC: Replace the usage of logical address with id for HdmiDeviceInfo" into lmp-dev 2014-08-16 04:12:14 +00:00
Ruben Brunk
e364aecf17 Merge "camera2: Add jpeg metadata for LEGACY shim." into lmp-dev 2014-08-15 18:45:09 +00:00
Ruben Brunk
1dc1326eae camera2: Add jpeg metadata for LEGACY shim.
Bug: 15116722
Change-Id: I8abef3ca9a47b2f93978a758aa59c3b915a7e000
2014-08-16 00:03:04 +00:00
Ruben Brunk
a9bc355910 camera2: Fix shim aspect ratio scaling.
Bug: 16494207
Change-Id: I4bd40dee1caaf8c83a0853d48d44cc97151f9b41
2014-08-15 23:51:52 +00:00
Jinsuk Kim
8960d1b155 CEC: Replace the usage of logical address with id for HdmiDeviceInfo
Introduced 'id' of HdmiDeviceInfo to replace the direct use of logical address
as id. This accomodates the identification of MHL device with ease. Also updated
TIF to use id instead of logical address.

Bug: 16986744
Change-Id: Ifa827fb5e5fcf1d2f612f0845accbfe5c03734aa
2014-08-14 10:52:23 +09:00
Jinsuk Kim
d38bf476f6 Move input change event handling out of TVInputManager
HDMI input change event should be handled best in TIS implementation
of HDMI input since the input change request from TV/other device
needs to be properly coordinated. This requires the listener be
moved the input service.

Provided an interface in HdmiTvClient for the input service to access
the API through getSystemService(Context.HDMI_CONTROL_SERVICE).

Conflicts:
	services/core/java/com/android/server/tv/TvInputHardwareManager.java

Bug: 15570939
Change-Id: Ie2ad10d77907de3d4501f9c892ca553b75365467
2014-08-12 08:27:32 +09:00
Igor Murashkin
d42a5fd3e7 camera2: (legacy) Fix the comparison for fixed-focus cameras
* Use #equals instead of == for string comparison
* Also make sure lens.info.minimumFocusDistance shows up in
  CameraCharacteristics#getKeys() for fixed-focus cameras

Bug: 16900875
Change-Id: I3b9248c5cb62ddcfb13587c6349525e145e353ac
2014-08-11 13:25:01 -07:00
Igor Murashkin
7336f470e3 camera: (LEGACY) - Add captureIntent and physicalSize metadata
Bug: 16900182
Change-Id: I159f2416da71c2d7ea803d61b63476da90e03b1c
2014-08-11 13:25:01 -07:00
Igor Murashkin
8c4486c141 camera: (Legacy) Add support for SCENE_MODE == FACE_PRIORITY
Bug: 16898478
Change-Id: I4306f6380ea06e8bd95af8738e5dde1a42a8098c
2014-08-11 13:25:01 -07:00
Sandeep Siddhartha
6df952ec22 Add debugging info to VIS via dump()
Change-Id: I9e8f4536de309256db835b30d94765bfc27d4e80
2014-08-11 09:38:38 -07:00
Jungshik Jang
61daf6b38e Hook up device power status change to TIF
Instead of introducing new api update existing
IDeviceEventListener

Bug: 16445063
Change-Id: I93bfc736a06a78e83c95877a53f4f241b51ed9c0
2014-08-11 10:40:29 +09:00
Igor Murashkin
696bbee963 camera2: Fix TotalCaptureResult#getKeys not to return empty list
Bug: 16680352
Change-Id: Ie6b8a8bff6f9b87d058a21b07eb3447371a62b6b
2014-08-08 22:45:00 +00:00
Jinsuk Kim
5008486b09 CEC: Content observer to handle TV Setting update
Replaced the API setOption with content observer to read/get informed of
the CEC settings.

Bug: 16855247

Change-Id: Ieff2399bbfe83f05af4448e7337f91ef40d1e24d
2014-08-08 21:30:14 +00:00
Igor Murashkin
6d8a97e139 camera2: (LEGACY) Don't stop preview when there are no requests left
* This allows flash mode=TORCH to keep working if only a single
request is submitted and the device goes to the idle state.

Bug: 16305644
Change-Id: Id2e3451f85dbf9b545d3a70977b8fcfb0922a0eb
2014-08-07 22:05:33 +00:00
Igor Murashkin
cd3a994e50 Merge "camera2: (LEGACY) Add face detection support and vstab modes" into lmp-dev 2014-08-07 17:50:16 +00:00
Igor Murashkin
0a1ef4dbf3 camera2: (LEGACY) Add face detection support and vstab modes
Also work-around CTS freezing forever in Camera#setPreviewTexture

* Set preview texture to null after unconfiguring (Camera#stopPreview)
* Remove all uses of recording hint

(Some devices disable face detection unconditionally when recording is not
using HDR mode; recording hints will be introduced after we add
capture intent support)

Change-Id: I2f0a80f1d580af214cb0f53abcbf33c7391790f1
2014-08-07 13:46:25 -07:00
Eino-Ville Talvala
d3b85f69a8 Camera2: Fix session shutdown race, frequent warning log
- Make sure that session.close followed by device.createCaptureSession cannot race on
  configureOutputs calls
- Silence warning about RAW_OPAQUE format

Change-Id: I02e4a048e8b26ea61aadcf115b029e9fbb58ad4e
2014-08-07 13:16:53 -07:00
Eino-Ville Talvala
a6b5ba5603 Camera2: Remove hidden parts of public CameraDevice
- Remove everything @hide in CameraDevice
- Move bits that are still needed into CameraDeviceImpl

Change-Id: Ie22059a0eb5c4238142a8a1e8dbcf1a422e845aa
2014-08-07 13:16:53 -07:00
Eino-Ville Talvala
7875a886b8 Camera2: Fix null-listener capture for CameraCaptureSession
Correctly allow null listener/handler when invoked on a thread with no
looper; otherwise all capture/repeating requests will fail even if listener
is null.

Change-Id: I4c64c81ad7f14b5cb309b4f92822cb50dbd74ba6
2014-08-07 13:16:22 -07:00
Michael Wright
6720be4e8c Allow media projections to create public presentations.
Change-Id: I3b6e0b54d658352942a38be6a24486bdfc179efd
2014-08-07 20:07:04 +00:00
Sandeep Siddhartha
cb4e81c7fe Handle microphone contention/Phone calls while recognition is active
Internally we pause the recognition when:
 - a phone call is active/off-hook/ringing
 - or some other application grabs the microphone

we auto-resume when the condition that caused us to pause reverses.

Both these events are notified to the client via callbacks so that they can choose to display on their UI,
that the recognition is paused for some reason.

Bug: 16515468
Bug: 16740806
Bug: 16514535
Change-Id: Ib274d68522c8cf37d42402c875b16159957657f0
2014-08-07 11:53:02 -07: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
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
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