Commit Graph

1146 Commits

Author SHA1 Message Date
Sandeep Siddhartha
a54cd53366 Fix an issue with locale for managing intent
Bug: 17187528
Change-Id: I254d838b6b37934ce81dd1fcd5a047b50d593887
2014-08-22 18:34:59 -07:00
Sandeep Siddhartha
dcf3068fcb Fix the Locale story in the hotword API
Tighten the API by taking in a locale rather than a string tag.
Tighten the checks when reading the enrollment metadata, bail out if any
attribute is missing or invalid.
Add missing recycle call for a TypedArray

Stop recognition when sound model(s) change. This is needed during
un-enrollment/re-enrollment.

Bug: 17187528
Bug: 17205230
Change-Id: Idb00b51ef8c4ea0a8f8993decea582223181fa3d
2014-08-22 17:23:13 -07:00
Jungshik Jang
f424932cfb Implement interfaces for MHL scratchpad command
1. Add sendScratchpadCommand to IHdmiControlService interface,
which is used to send scratchpad command.

2. Add IHdmiMhlScratchpadCommandListener to handle incoming
MHL scratchpad command.

Bug: 17146522

Change-Id: I8e8e743dc08a18c80867be470997ce79d3292c15
2014-08-22 11:45:50 +09:00
Eino-Ville Talvala
2d9a18e02e Merge "Camera2: Fix return type of CaptureFailure#getFrameNumber" into lmp-dev 2014-08-22 00:46:41 +00:00
Yin-Chia Yeh
6fc6748ffb Merge "Camera2: add toString for two params classes" into lmp-dev 2014-08-22 00:20:06 +00:00
Igor Murashkin
b68654ce84 Merge "camera2: Enable configuration failure to call #onConfigureFailed" into lmp-dev 2014-08-21 22:33:29 +00:00
Eino-Ville Talvala
edecaee1f2 Camera2: Fix return type of CaptureFailure#getFrameNumber
Should be long, not int.

Bug: 17188354
Change-Id: If90749f21cdf9dd493aa561769655211a70acf29
2014-08-21 14:28:50 -07:00
Yin-Chia Yeh
97376d90d6 Camera2: add toString for two params classes
Add toString for RggbChannelVector and ColorSpaceTransform.
Also change ColorSpaceTransform equals implementation to actually
compare the underlying rationals.

bug 16963063

Change-Id: I858153b405bc3541959be79962db750d429413a3
2014-08-21 08:28:17 -07:00
Zhijun He
9e4e439a68 Camera2: update aberration correction related tag name
This is for API review update.

Bug: 17008587
Change-Id: I67c2cffed8fcc106008b0fde6f01cd81f4ce6db0
2014-08-20 22:08:52 -07:00
Igor Murashkin
10fbbbb6ba camera2: Enable configuration failure to call #onConfigureFailed
Bug: 16629195
Change-Id: I0c365bc8f760466916dcc089217a43c43f9f4c9d
2014-08-20 13:41:38 -07:00
Igor Murashkin
3a6eba01c4 Merge "camera2: Fix StreamConfigurationMap#getOutputSizes for ImageReader" into lmp-dev 2014-08-19 02:43:23 +00:00
Igor Murashkin
517b74533a camera2: Fix StreamConfigurationMap#getOutputSizes for ImageReader
Return empty array since no implementation-defined sizes are supported

Bug: 17007153
Change-Id: I178e89ef6b2640896f8657765beb458022d66ae5
2014-08-19 10:51:30 -07:00
Igor Murashkin
ae0da7a81c Merge "camera2: (Legacy) Add control.sceneMode = DISABLED to templates" into lmp-dev 2014-08-19 02:43:23 +00:00
Igor Murashkin
981952d07a camera2: (Legacy) Add control.sceneMode = DISABLED to templates
Bug: 17024375
Change-Id: Ie4e2a7f22caa842b4f3850f3739f22c5f6a9b88f
2014-08-19 11:04:31 -07:00
Aravind Akella
be2ecae5fe Merge "Step Counter documentation fix." into lmp-dev 2014-08-20 16:06:26 +00:00
Aravind Akella
0c44d69dc5 Step Counter documentation fix.
Change-Id: I04921ca2bdfd10581f5582a025de617a506035b7
2014-08-19 18:28:12 -07:00
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
Jinsuk Kim
87f22a2870 CEC: Hook up device select API to MHL device RAP
This lets the input selection on UI perform MHL RAP signalling, and
CEC routing control.

Bug: 17141884
Change-Id: Ic1605175c5779a9a3c43df954baf9fdb6f154d36
2014-08-20 12:35:32 +09:00
Igor Murashkin
7064dd65d8 Merge "camera2: legacy: disable shutter sounds unconditionally via camera2 api" into lmp-dev 2014-08-19 02:43:23 +00:00
Igor Murashkin
6653362f6b camera2: legacy: disable shutter sounds unconditionally via camera2 api
Bug: 17109582
Change-Id: Ieb3fc61ff111d792cc657c018e278349c25472cf
2014-08-19 15:11:31 -07:00
Jinsuk Kim
8809f1e547 Merge "CEC: Invoke events listener upon MHL device state change" into lmp-dev 2014-08-16 04:25:55 +00:00
Jinsuk Kim
ed0864557b CEC: Invoke events listener upon MHL device state change
With this change, mobile devices state changes are propagated through
TIF to UI, hence the input pickers shows the mobile devices as
expected.

Bug: 16986744
Change-Id: Id633207acf4f814f57d43cc1de5f8cb88ac23ad6
2014-08-19 13:41:51 +09:00
destradaa
c4e1e59561 Add @SystemApi annotation to Geofence Hardware types.
b/17008446

Change-Id: Id3f92dd03309324d3343c87da8c3e30733d06a64
2014-08-18 10:22:23 -07: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