Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
138,223 Commits 3 Branches 0 Tags
585fc71ea71e594b179bf53522f6201b3858f91c
Commit Graph

896 Commits

Author SHA1 Message Date
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
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
Yin-Chia Yeh
97f1c85499 Camera2: update the range of metering weight 
Limit the range of metering weight to 0-1000.

Bug: 15315352
Change-Id: Iceb13b72508cb3c9f758bdcb1b69b6b11ec5aaf8
 2014-05-30 12:05:48 -07:00
Igor Murashkin
5743868e15 camera2: Change android.lens.focusRange to Pair<Float,Float> 
Since the focus range is defined in diopters (1/distance), it just so
happens that in a range [near, far] near >= far which is against the
android.util.Range contract.

Change it to pair instead.

Also adds a marshaler for Pairs since they didn't have one before
(and aren't parcelable).

Bug: 15335269
Change-Id: If2f3259aeec072438a1c18c1b9728a4c81e92a40
 2014-05-30 11:28:49 -07:00
Zhijun He
d1cc293a5b am 504d5486: Merge "Camera2: Fix availableCapabilities incorrect type" into lmp-preview-dev 
* commit '504d5486de89ef425d0acd04363e8131f3686991':
  Camera2: Fix availableCapabilities incorrect type
 2014-05-29 23:15:34 +00:00
Jinsuk Kim
8692fc68a4 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-05-29 21:09:43 +00:00
Zhijun He
421ddbe670 Camera2: Fix availableCapabilities incorrect type 
Bug: 15168075
Change-Id: I50553d740101b7db1b7695344bf4cdf9c5cd1cf9
 2014-05-29 21:00:26 +00:00
Zhijun He
d5a8d65b43 am 239ac054: Merge "Camera2: Update spec for thumbnail cropping behavior" into lmp-preview-dev 
* commit '239ac0541bf7e0fc8b301d077b40e3e52cf32161':
  Camera2: Update spec for thumbnail cropping behavior
 2014-05-29 00:42:32 +00:00
Jinsuk Kim
d618555e45 Merge "Fix a bug calling a wrong HDMI-CEC Binder API" 2014-05-28 23:17:22 +00:00
Yin-Chia Yeh
56c8711bc0 am b17e5f3d: Merge "Camera2: Fix wrong index in ColorSpaceTransform" into lmp-preview-dev 
* commit 'b17e5f3d9deeb3c80f4b45657897c138ff060bab':
  Camera2: Fix wrong index in ColorSpaceTransform
 2014-05-28 23:07:31 +00:00
Zhijun He
f5fe63c35c Merge "Camera2: Update spec for thumbnail cropping behavior" into lmp-preview-dev 2014-05-28 22:49:31 +00:00
Jinsuk Kim
5ac6225ea3 Fix a bug calling a wrong HDMI-CEC Binder API 
Change-Id: I75e5de3ab820288f0fe6bebdc63d6dd680e18f8a
 2014-05-29 07:47:51 +09:00
Zhijun He
50f7243ca0 Camera2: Update spec for thumbnail cropping behavior 
Also update FULL capability spec (remove ZSL from the requirement list).

Bug: 15168075
Change-Id: I864baf35ffab9047b52facb29011682e724bbc9b
 2014-05-28 15:23:21 -07:00
Yin-Chia Yeh
884cddcdf4 Camera2: Fix wrong index in ColorSpaceTransform 
Bug: 15309870
Change-Id: I89a043a005435695ac8649e20d4e0e58d0f62bc7
 2014-05-28 20:54:24 +00:00
Eino-Ville Talvala
5b02e9f65f am a4aad3d0: Merge changes Ia0f54124,I1e085f5e,Ic0a3ff0a,I141847df,I8ae4efa2 into lmp-preview-dev 
* commit 'a4aad3d0e5c258d6bbf6254ec5ab80a470b1b529':
  camera2: Update native/managed key mappings.
  Camera2: switch API interface to java classses
  Camera2: Use ColorSpaceTransform and RggbChannelVector, replace enum byte[]
  camera2: Add new metadata keys, change types for existing range keys
  Camera2: Replace int[] by MeteringRectangle
 2014-05-28 20:35:58 +00:00
Ruben Brunk
574936894d camera2: Update native/managed key mappings. 
Switches to using managed value classes for the following keys:
- android.sensor.info.sensitivityRange
- android.sensor.info.exposureTimeRange
- android.jpeg.gpsCoordinates
- android.jpeg.gpsTimestamp
- android.jpeg.gpsProcessingMethod
- android.statistics.lensShadingMap
- android.lens.info.shadingMapSize
Also fixes a minor bug in LensShadingMap

Bug: 14628001
Change-Id: Ia0f541242f529ab9ba3111db799306b198f2b40b
 2014-05-28 10:26:21 -07:00
Jinsuk Kim
b0674f0f7c 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-05-28 09:30:39 +00:00
Yin-Chia Yeh
8490ace76f Camera2: switch API interface to java classses 
android.sensor.info.physicalSize: float[] -> SizeF
android.statistics.hotPixelMap: int[] -> Point[]
android.tonemap.curve[Red|Green|Blue]: float[] -> TonemapCurve

Bug: 14628001
Change-Id: I1e085f5e640a059852fcb504b6dd5f884039e653
 2014-05-28 01:36:54 -07:00
Eino-Ville Talvala
2bb91a7a68 Camera2: Use ColorSpaceTransform and RggbChannelVector, replace enum byte[] 
Also fix a minor bug in ColorSpaceTransform copying validation.

Affected keys:
  android.colorCorrection.transform
  android.colorCorrection.gain
  android.control.aeAvailableAntibandingModes
  android.control.aeAvailableModes
  android.control.afAvailableModes
  android.control.availableEffects
  android.control.availableSceneModes
  android.control.availableVideoStabilizationModes
  android.control.awbAvailableModes
  android.edge.availableEdgeModes
  android.hotpixel.availableHotPixelModes
  android.lens.info.availableOpticalStabilization
  android.noiseReduction.availableNoiseReductionModes
  android.sensor.calibrationTransform1
  android.sensor.calibrationTransform2
  android.sensor.colorTransform1
  android.sensor.colorTransform2
  android.sensor.forwardTransform1
  android.sensor.forwardTransform2
  android.statistics.info.availableFaceDetectModes
  android.tonemap.availableToneMapModes

Bug: 14628001
Change-Id: Ic0a3ff0aaa6bfe872cf8fb740870618c3eee3008
 2014-05-28 01:36:53 -07:00
Igor Murashkin
78712a8bd7 camera2: Add new metadata keys, change types for existing range keys 
Also adds the following keys:
* android.control.maxRegionsAe
* android.control.maxRegionsAwb
* android.control.maxRegionsAf
* android.request.maxNumOutputRaw
* android.request.maxNumOutputProc
* android.request.maxNumOutputProcStalling

Changes the following keys' type
generations:
* android.control.aeTargetFpsRange
* (Range<Integer>)
* android.control.aeAvailableTargetFpsRanges
* (Range<Integer>[])
* android.control.aeCompensationRange
* (Range<Integer>)
* android.lens.focusRange
* (Range<Float>)

Bug: 14628001
Change-Id: I141847dffc4b0d89cea37c19a54d6d5faf24a9bb
 2014-05-28 01:36:53 -07:00
Yin-Chia Yeh
817f8933ee Camera2: Replace int[] by MeteringRectangle 
Bug: 14628001
Change-Id: I8ae4efa24d41043046a84b04e5209259a8a21063
 2014-05-28 01:36:53 -07:00
Igor Murashkin
5fe5bcaeaa am dc0230fc: Merge "camera2: Add partial results to the capture listener (API change)" into lmp-preview-dev 
* commit 'dc0230fc450e8880fb640cd476f2248bf0a401e4':
  camera2: Add partial results to the capture listener (API change)
 2014-05-27 23:57:36 +00:00
Aravind Akella
1a68f24ab7 Merge "Adding wakeup sensors, maxDelay to java SDK." 2014-05-27 19:25:41 +00:00
Igor Murashkin
db075afc85 camera2: Add partial results to the capture listener (API change) 
* Also adds capture sequence aborted callback

Bug: 12492876
Change-Id: I56ec8edbcda8b64c2262ff7472961ac78042c7f4
 2014-05-27 11:25:24 -07:00
Etienne Le Grand
ef0b88181e am 7326defe: am d7439d8c: Merge "Add confidence to the heart rate monitor definition and clarify onAccuracyChange" into klp-modular-dev 
* commit '7326defe2de7ace86236bf0c5353fe0687c3f99c':
  Add confidence to the heart rate monitor definition and clarify onAccuracyChange
 2014-05-27 18:10:52 +00:00
Etienne Le Grand
7326defe2d am d7439d8c: Merge "Add confidence to the heart rate monitor definition and clarify onAccuracyChange" into klp-modular-dev 
* commit 'd7439d8c59e4c5a82ad94a5080436cc94f72e0be':
  Add confidence to the heart rate monitor definition and clarify onAccuracyChange
 2014-05-27 18:06:13 +00:00
Yuncheol Heo
1178cd29b2 Merge "Add the constants for the callback result of SendCecCommand()." 2014-05-26 02:45:40 +00:00
Yuncheol Heo
ece603b795 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-05-26 11:35:09 +09:00