Commit Graph

922 Commits

Author SHA1 Message Date
Eino-Ville Talvala
bb373e601f am e941070b: Merge "Camera2: Misc + enum value documentation updates" into lmp-preview-dev
* commit 'e941070bd7ab910b558bbace38e2ff813fa0327c':
  Camera2: Misc + enum value documentation updates
2014-06-12 16:53:54 +00:00
Eino-Ville Talvala
486ed08899 Merge "Camera2: Misc + enum value documentation updates" into lmp-preview-dev 2014-06-11 08:41:11 +00:00
Eino-Ville Talvala
e600d6ad60 Camera2: Misc + enum value documentation updates
- Update enum values for many entries
- Reword various sections of documentation for clarity.

Bug: 15475465
Change-Id: I2b03cac8d478e945c7d93717845a9ae44b97639b
2014-06-10 15:12:46 -07:00
Eino-Ville Talvala
ac4dcf6d90 am bc4b6859: Merge "Camera2: Many docs updates" into lmp-preview-dev
* commit 'bc4b6859cb12564d7dfe37abffd77465b4be75d0':
  Camera2: Many docs updates
2014-06-11 17:03:11 +00:00
Eino-Ville Talvala
73b1d94baf Merge "Camera2: Many docs updates" into lmp-preview-dev 2014-06-10 22:12:51 +00:00
Ruben Brunk
937c4dbb1f Merge "DO NOT MERGE: camera2: Disallow shim usage for preview." into lmp-preview-dev 2014-06-10 22:18:15 +00:00
Ruben Brunk
d8c21e8bd0 DO NOT MERGE: camera2: Disallow shim usage for preview.
Bug: 15515564
Change-Id: I14ab73b130ee5355d9cc8b3602738022a5a18710
2014-06-10 19:45:43 +00:00
Igor Murashkin
f1d758867a am 69729adf: Merge "camera2: Fix session-related CTS test failures" into lmp-preview-dev
* commit '69729adf04bddb2e5b67d625412151b4bcbc1ca4':
  camera2: Fix session-related CTS test failures
2014-06-10 17:22:22 +00:00
John Reck
1a2f7a1e29 resolved conflicts for merge of 2d2aa0cc to master
Change-Id: Ib7bb0e40569a8f6a7f856eef54980d70d9769cdc
2014-06-10 07:53:03 -07:00
Igor Murashkin
3721cbaf01 Merge "camera2: Fix session-related CTS test failures" into lmp-preview-dev 2014-06-10 04:02:28 +00:00
Igor Murashkin
e1442204c1 camera2: Fix session-related CTS test failures
Bug: 15474402
Change-Id: I4ae86166b5ce99a854c754c8ac6d6c23c683b14a
2014-06-09 17:51:24 -07:00
Jinsuk Kim
66d1eb285b Tag HdmiControlService API classes with @hide/@SystemApi
Bug: 15516329, Bug: 15516710
Change-Id: Ie814513a642660b6c5fdc9e891ad1eec1b2d689b
2014-06-09 23:49:21 +00:00
Eino-Ville Talvala
b67a3b36fd Camera2: Many docs updates
- Improve CameraManager.AvailabilityListener docs
- Fix references to createCaptureSession immediately returning a session
- Remove most docs from deprecated methods, to minimize confusion.
- Remove references to deprecated methods from non-deprecated methods.
- Improve acronym use in metadata keys, and other minor metadata doc fixes.
- Improve package-level docs.

Bug: 15394187
Bug: 15394241
Bug: 15394242
Bug: 15394526

Change-Id: I48de626a33ef9b834578f7bb890de9b98d3122d2
2014-06-09 11:45:55 -07:00
Ed Heyl
5adb67d4ce merge 4ce22057, regen api/current.txt
Change-Id: I39186b5c4d41753c729c5d1ee7ee96b03a45c514
2014-06-09 10:41:21 -07:00
Jinsuk Kim
3f48068d78 Remove HdmiCecService
The service is replaced with HdmiControlService. Removing all the related
classes and the initialization of the service.

Change-Id: Ic7baaddffb9873613ddd1096e874f226da983939
2014-06-09 07:55:47 +09:00
Aravind Akella
acbf10ce5c Merge "Hide Sensor.getRequiredPermission API." into lmp-preview-dev 2014-06-06 01:57:25 +00:00
Sol Boucher
fca5f52347 am af9a77d6: camera2: Fix ordering issue between #onOpened and createCaptureSession
* commit 'af9a77d64912985a3fa9f91cd0e372316e790b9f':
  camera2: Fix ordering issue between #onOpened and createCaptureSession
2014-06-06 01:51:25 +00:00
Sol Boucher
4b3f800438 camera2: Fix ordering issue between #onOpened and createCaptureSession
This resolves an issue where the CameraDevice.StateListener callbacks were
erroneously called before the CameraCaptureSession.StateListener ones,
preventing e.g. creating a capture session from the
CameraDevice.StateListener#onOpened() callback.
It also explicitly ignores CameraDevice.StateListener#onUnconfigured() calls
occurring before the first call to #close .

Bug: 15449190
Change-Id: Ic0094d53a65e42108201d7bb50734d17290fa9bf
2014-06-06 01:43:00 +00:00
Yin-Chia Yeh
abfaf964a5 am 6d892689: Merge "Camera2: Do not hide TonemapCurve construtor" into lmp-preview-dev
* commit '6d892689f569871e2e711669c0262a7d25b3e091':
  Camera2: Do not hide TonemapCurve construtor
2014-06-05 23:37:07 +00:00
Yin-Chia Yeh
ffff217134 Merge "Camera2: Do not hide TonemapCurve construtor" into lmp-preview-dev 2014-06-05 23:33:38 +00:00
Zhijun He
169a149d55 am b67beb8e: Merge "Camera2: Hide input stream related key and enum" into lmp-preview-dev
* commit 'b67beb8e8b9115c1ba796a57f1bb59822e6a1ce1':
  Camera2: Hide input stream related key and enum
2014-06-05 23:21:03 +00:00
Aravind Akella
5271e0b890 Hide Sensor.getRequiredPermission API.
Bug: 15089664
Change-Id: Ia0f4e64a563ca409849cf53721b4836abbb0be68
(cherry picked from commit e7213150abbe33c71dbdc3295a1fa1feaafb069d)
2014-06-05 22:24:25 +00:00
Eric Laurent
7de8c849d7 Merge "Add SoundTrigger native service interface" 2014-06-05 21:04:09 +00:00
Zhijun He
6593acd95d Camera2: Hide input stream related key and enum
Bug: 14622091
Change-Id: Id8fc20b752da876f00a94d0262cd9468951bb36d
2014-06-05 12:49:56 -07:00
Yin-Chia Yeh
83a9e4d864 Camera2: Do not hide TonemapCurve construtor
Do not @hide TonemapCurve constructor since it's also a
control key.

bug: 14628001
Change-Id: I17384f42f5c2db2371d1c09030d04a1b9637045e
2014-06-05 11:34:48 -07:00
Eino-Ville Talvala
85e5f85f2e am 4b1b33ef: Merge "Camera2: Invoke onError callbacks for failure to open" into lmp-preview-dev
* commit '4b1b33eff0eabd17f1078d55188b40e9a27d047a':
  Camera2: Invoke onError callbacks for failure to open
2014-06-05 02:30:08 +00:00
Eric Laurent
e48188ce35 Add SoundTrigger native service interface
Add JAVA framework interface for native sound trigger service.
The interface allows for:
- enumeration of sound trigger hardware modules and their properties
- load/unload sound models
- start, stop and receive recognition events on sound models.

Change-Id: I51542f38f5359ffbbf79d2cbd7c9ea1ee10c9c18
2014-06-04 17:58:56 -07:00
Eino-Ville Talvala
7fcb357811 Camera2: Invoke onError callbacks for failure to open
When the initial attempt to connect to the remote camera device fails,
fire the onError callback as documented, instead of throwing an
exception from open().

Also ensure the correct exception is sent when methods are called
while in the error state, and make sure onClosed() is called correctly
if closing the device after an initial startup error.

Bug: 14413756
Bug: 14413363
Change-Id: I0822261dad52bcd428a0c4556202f00032499990
2014-06-04 16:52:00 -07:00
Igor Murashkin
2ac6c43312 am 97b2bc9a: Merge "camera2: Change CaptureListener callbacks to include the session (api)" into lmp-preview-dev
* commit '97b2bc9a05a56dad609360f8fec1e5a51059e656':
  camera2: Change CaptureListener callbacks to include the session (api)
2014-06-04 23:42:58 +00:00
Igor Murashkin
21547d66a9 camera2: Change CaptureListener callbacks to include the session (api)
* Also makes CameraDevice an abstract class (API)

Bug: 15428219
Bug: 14964443
Change-Id: I0e8c8309186aad59570aac7e0f998bb615405f0a
2014-06-04 16:03:32 -07:00
Ruben Brunk
fcab516cd4 am 37532379: Merge "DNG: Hide unimplemented methods." into lmp-preview-dev
* commit '37532379e7c770555b140332112a34fe716fed22':
  DNG: Hide unimplemented methods.
2014-06-04 22:58:48 +00:00
Ruben Brunk
35677d1762 Merge "DNG: Hide unimplemented methods." into lmp-preview-dev 2014-06-04 22:25:18 +00:00
Zhijun He
dcb65c3125 am b4f18bf1: Merge "Camera2: Update availableStreamConfigurations for JPEG sizes" into lmp-preview-dev
* commit 'b4f18bf11d7f0ca574ed9477486fd50e7c923023':
  Camera2: Update availableStreamConfigurations for JPEG sizes
2014-06-04 22:11:31 +00:00
Zhijun He
df9b74781a Camera2: Update availableStreamConfigurations for JPEG sizes
Also Fix some doc issue in availableCapabilities

Bug: 12035686
Change-Id: Ie517a587f4a9e6cd9731fcca042e24adf832d9e3
2014-06-04 20:56:20 +00:00
Ruben Brunk
8e783f7a52 DNG: Hide unimplemented methods.
Bug: 15112503
Change-Id: I31187a92b610af68fb854a27a564abf7d0635478
2014-06-04 13:21:04 -07:00
Igor Murashkin
da525e542b am 1a68eb96: Merge "camera2: Implement most of CameraCaptureSession" into lmp-preview-dev
* commit '1a68eb968f77af341a60708b85072ae805e6dc10':
  camera2: Implement most of CameraCaptureSession
2014-06-04 18:44:46 +00:00
Ruben Brunk
ccee3b158a am c354b069: Merge "DNG: Write out additional fields." into lmp-preview-dev
* commit 'c354b06955508816af29daefdac5ef9ea9b89fbb':
  DNG: Write out additional fields.
2014-06-04 18:43:50 +00:00
Igor Murashkin
c6b4d9b8d1 Merge "camera2: Implement most of CameraCaptureSession" into lmp-preview-dev 2014-06-04 01:00:06 +00:00
Ruben Brunk
3f6680ad48 Merge "DNG: Write out additional fields." into lmp-preview-dev 2014-06-03 23:38:57 +00:00
Ruben Brunk
b8df8e07d6 DNG: Write out additional fields.
Bug: 15112503

Change-Id: Ib06d9a5e70e6e3d5063a95a7109538ef64f03334
2014-06-03 15:07:50 -07:00
Igor Murashkin
0b27d3453d camera2: Implement most of CameraCaptureSession
Bug: 14964443
Change-Id: I8203842c77a94a3a6e5f89494fce658b00a4160d
2014-06-03 14:55:52 -07:00
Jinsuk Kim
b9e60f35ef DO NOT MERGE: Added missing entries in the cec device array
Change-Id: Ibb775f47cb9fb53df0a1baf67d09d76c4cb42392
2014-06-03 10:15:39 +09:00
Jinsuk Kim
cf6527ca98 Added missing entries in the cec device array
Change-Id: Ibb775f47cb9fb53df0a1baf67d09d76c4cb42392
2014-06-02 18:25:00 +09:00
Jinsuk Kim
e74282b70b DO NOT MERGE: Stop publishing HdmiCecService, start publishing HdmiControlService
HdmiCecService will soon be deprecated and replaced with HdmiControlService.
Stopped publishing the service, and turned the corresponding manager to
stub so that it will do nothing but print out a warning msg instead.

Will help the app transition to the new service in the meantime. Once
the migration is finished, will gut out all the HdmiCecService/
HdmiCecManager stuff.

Change-Id: Ic34a69c4fb99f4e5a2c8323538195204ab16a545
2014-06-02 11:02:51 +09:00
Jinsuk Kim
a8fd44b74b DO NOT MERGE: Fix a couple of bugs in CEC services
- Correct conversion for byte to int for cec opcode
- Use the right Handler.obtainMessage() to pass an integer variable

Change-Id: Ie3e86225f1702decce454aeb197911a371f51c17
2014-06-02 10:58:02 +09:00
Jinsuk Kim
304b4a7281 DO NOT MERGE: Fix a bug calling a wrong HDMI-CEC Binder API
Change-Id: I75e5de3ab820288f0fe6bebdc63d6dd680e18f8a
2014-06-02 10:56:57 +09:00
Yuncheol Heo
61ced38d61 DO NOT MERGE: Add the constants for the callback result of SendCecCommand().
- Move the send failure warning messages into HdmiCecController.sendCommand()
  from each Actions.
- Stringfy with more detail messages for some opcodes.

Change-Id: Ib7ce24dd2a1f290e6c3a0b26738772ef1d4a9630
2014-06-02 10:46:36 +09:00
Yin-Chia Yeh
ee36492fac am 7ebaa1ef: Merge "Camera2: update the range of metering weight" into lmp-preview-dev
* commit '7ebaa1ef18fd20500efb87f75e933b9e35fb5470':
  Camera2: update the range of metering weight
2014-05-30 21:43:55 +00:00
Yin-Chia Yeh
f41799e7f7 Merge "Camera2: update the range of metering weight" into lmp-preview-dev 2014-05-30 21:41:42 +00:00
Igor Murashkin
dbce83bf20 am 511b84d2: Merge "camera2: Change android.lens.focusRange to Pair<Float,Float>" into lmp-preview-dev
* commit '511b84d26b3e4acfcee9ca2864588538b9801708':
  camera2: Change android.lens.focusRange to Pair<Float,Float>
2014-05-30 21:39:30 +00:00