Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
194,935 Commits 3 Branches 0 Tags
acb7efd0d6dbde2506bb333e400a281f422df3fc
Commit Graph

1561 Commits

Author SHA1 Message Date
Ruben Brunk
25f3a7d19b Merge "Make CameraDeviceImpl#close() idempotent (for real)." into mnc-dev 2015-06-12 00:25:48 +00:00
Ruben Brunk
0953b6461a Make CameraDeviceImpl#close() idempotent (for real). 
- Also fixes onClosed() implementation in CameraDeviceImpl;
  this would never return true previously.

Bug: 21698939
Change-Id: I4dd56a1410b9fc64152acc5296514f5841794fa9
 2015-06-11 16:12:35 -07:00
Ruben Brunk
dcb9e169d7 Merge "Set scaling mode for legacy device surfaces." into mnc-dev 2015-06-11 22:15:58 +00:00
Ruben Brunk
a94c603345 Set scaling mode for legacy device surfaces. 
Bug: 19371754
Change-Id: I0dd762e7b1485ba2d3bec9604407125c35ad1218
 2015-06-11 15:15:17 -07:00
Ruben Brunk
c2b409267e Merge "Fix intermediate preview size selection for legacy." into mnc-dev 2015-06-11 20:29:28 +00:00
Yin-Chia Yeh
dba1cf3d51 Merge "Camera2: Legacy: handle FPS range properly" into mnc-dev 2015-06-11 20:29:28 +00:00
Yin-Chia Yeh
ec743ee9a4 Camera2: Legacy: handle FPS range properly 
Convert between the FPS range unit of API1 and API2.

Bug: 21754853
Change-Id: I823e533eeac3bf8beb7b975fe296b309300e2b05
 2015-06-11 12:57:49 -07:00
Ruben Brunk
c64e80ddda Fix intermediate preview size selection for legacy. 
Bug: 19606058
Change-Id: I4bf4c5bafdd5a50e46aa117b76d96381a3b82e5d
 2015-06-10 17:38:43 -07:00
Aravind Akella
0d07846f0f Merge "Use LOCATION_HARDWARE permission for data injection." into mnc-dev 2015-06-10 22:56:33 +00:00
Zhijun He
1527edbcf9 Merge "Camera2: fix high speed output surface format check" into mnc-dev 2015-06-10 22:56:22 +00:00
Aravind Akella
1b41cc9567 Use LOCATION_HARDWARE permission for data injection. 
Change-Id: I59c1e1e97a6a0457f6fc2984b214647814895cf2
 2015-06-10 15:21:03 -07:00
Zhijun He
47ac34997b Camera2: fix high speed output surface format check 
Preview surface default format is not ImageFormat.PRIVATE, the check need to
take this into consideration.

Change-Id: Ib99e64f7781dd15cc5634c66b2d5e5ab2a2d7d6c
 2015-06-10 14:41:57 -07:00
Nick Kralevich
5ac4a5fa38 Merge "Fix USB access control when adb is disabled." into mnc-dev 2015-06-10 21:11:38 +00:00
Chien-Yu Chen
a3a0ea3b1b Merge "Camera2: Clarify capture order for reprocess" into mnc-dev 2015-06-10 17:51:18 +00:00
Nick Kralevich
674019065b Fix USB access control when adb is disabled. 
When adb is disabled, the default usb mode would be "none", which
would turn off the driver and prevent UsbDeviceManager from receiving
any new USB connect / disconnect messages. This prevents the user
from ever enabling MTP and sharing data when adb is turned off.

As discussed in bug 21429947, we work around this problem by keeping
the USB driver in MTP mode most of the time, so that we continue to
receive USB connect / disconnect messages.

To avoid leaking confidential user photos, this change introduces an
unlocked state. Setting the mtp enabled function is now decoupled from
exposing data on the USB connection. Only if MTP is enabled and
USB data has been unlocked is confidential user data allowed to be
shared.

Bug: 21429947
Change-Id: Iefb5c7e22dc4962bf5226f2ed3d0155b5c7b413c
 2015-06-10 10:29:48 -07:00
Chien-Yu Chen
bf2d55b2b5 Camera2: Clarify capture order for reprocess 
Clarify the order of regular and reprocess requests in capture()
and captureBurst().

Bug: 21558022
Change-Id: I6bc3eda9614e43a954540ad271b4145a4dbcc8f2
 2015-06-09 18:09:11 -07:00
Jim Miller
e4c58e4641 Add documentation for possible AndroidKeyStore exceptions to authenticate() call 
Fixes bug 20864436

Change-Id: Ic3f7406a8a6f41283ccd63018787a20353510024
 2015-06-09 15:26:43 -07:00
Jim Miller
f501b58de8 Update and cleanup FingerprintManager API to new spec 
Fixes bug 21040383

Change-Id: Ib97d486535869814d5b449cccb31670e8f412552
 2015-06-08 16:36:29 -07:00
Wale Ogunwale
d8b9b642fe Merge "Use DisplayAdjustments when creating display in ResourceManager" into mnc-dev 2015-06-08 20:17:23 +00:00
Wale Ogunwale
26698514fb Use DisplayAdjustments when creating display in ResourceManager 
We were previous only taking the Configuration into account when
creating Display objects in the ResourceManager. This led to the
Display object not containing critical CompatibilityInfo. We now
take the entire DisplayAdjustment into account.

Bug: 21637615
Change-Id: Ide5ff49bfa12791ad17993764f312836216b1dd8
 2015-06-06 11:26:33 -07:00
Eino-Ville Talvala
76233f068b Merge "Camera2: Legacy: Do not remap EACCES error code to PERMISSION_DENIED" into mnc-dev 2015-06-06 00:40:16 +00:00
Zhijun He
d24e49bba8 Camera2: add missing HFR implementation 
Bug: 21442271
Change-Id: I08c0a5b75ccb0f737013026511cfe3bf9e15c744
 2015-06-05 14:55:04 -07:00
Zhijun He
16ed7e70c8 Merge "Camera2: fix doc build" into mnc-dev 2015-06-05 03:33:59 +00:00
Zhijun He
39d1461cf1 Camera2: fix doc build 
Bug: 21645842
Change-Id: Ibd4ce455d9906da858b98f17fd7859016c1730c3
 2015-06-04 20:21:23 -07:00
Zhijun He
0ccc940a0d Merge "Camera2: implement high speed video APIs" into mnc-dev 2015-06-05 01:07:52 +00:00
Eino-Ville Talvala
db70a97853 Camera2: Legacy: Do not remap EACCES error code to PERMISSION_DENIED 
This remap causes non-Legacy and Legacy devices to have different
error behavior when the camera permission is removed from a pre-M
application.

Without the remap, both routes map to CameraAccessException with
code CAMERA_DISABLED.

Bug: 21604925
Change-Id: I4ab18dca961cc7cedaccba0531253c9c4ef1d60e
 2015-06-04 16:15:35 -07:00
Zhijun He
a767772230 Camera2: implement high speed video APIs 
Bug: 21442271
Change-Id: Ia0ae5bbd3e8c81bad293c29987301a2457817d12
 2015-06-04 15:22:00 -07:00
Eino-Ville Talvala
05ae9b56ae Merge "Camera: Change origin of poseTranslation." into mnc-dev 2015-06-04 20:52:02 +00:00
Ruben Brunk
74fc1837e0 Merge "Fix CameraManager#open exception handling." into mnc-dev 2015-06-04 20:43:16 +00:00
Eino-Ville Talvala
d3dbfb3f75 Camera: Change origin of poseTranslation. 
No actual defined center for the Android sensor coordinate system
exists, so define the translation relative to the largest camera
device facing the same way.

Bug: 20123879
Change-Id: Ica33d23717c976c063c26b768af5b6148483909c
 2015-06-04 13:41:56 -07:00
Eino-Ville Talvala
ea7547f155 Merge "CameraManager: Ensure all public methods connect to camera service." into mnc-dev 2015-06-04 20:13:41 +00:00
Eino-Ville Talvala
2ef01737af CameraManager: Ensure all public methods connect to camera service. 
Otherwise, registerAvailabilityCallback won't actually cause caller to
receive callbacks, if no other methods on CameraManager are ever
invoked.

Bug: 21536556
Change-Id: I5cded8a59846a971d6272ac3bced44678a533165
 2015-06-04 12:58:01 -07:00
Ruben Brunk
a45aa0d549 Fix CameraManager#open exception handling. 
Bug: 21620938
Change-Id: I062989c5fed6f99c0566da2f56bfb6b657734a33
 2015-06-04 12:26:10 -07:00
Zhijun He
b1300e39c7 Camera2: add high speed video APIs 
Interface only.

Bug: 21442271
Change-Id: If81caa0f2dc9f7802af564abcd9541aff3e30901
 2015-06-03 17:50:22 -07:00
Zhijun He
fab663ebfd camera_metadata: update high speed video recording API 
Update high speed video recording API to support batch mode recording.

Bug: 21442271
Change-Id: I62de6067c75fcfbe6320dd987cce65843d810021
 2015-06-03 17:45:48 -07:00
Eino-Ville Talvala
717a2d09fa Merge "Camera2: Remove isLoggable" into mnc-dev 2015-06-01 23:47:32 +00:00
Eino-Ville Talvala
14438d122c Merge "Camera2: Add tangential distortion coefficients" into mnc-dev 2015-06-01 21:26:12 +00:00
Eino-Ville Talvala
a78791f22a Camera2: Remove isLoggable 
Change-Id: I83b2c8321ab6b48cf68ef7a4d724559ead1a1790
 2015-06-01 12:44:20 -07:00
Yin-Chia Yeh
254ed61671 Merge "Camera2: Add missing LEGACY available keys" into mnc-dev 2015-06-01 17:53:42 +00:00
Chien-Yu Chen
61bae6d8de Merge "Camera2: update docs for reprocess timestamp" into mnc-dev 2015-06-01 17:50:58 +00:00
Yin-Chia Yeh
71c605c54a Camera2: Add missing LEGACY available keys 
Add missing available characteristics keys.

Bug: 20883751
Change-Id: I6f07deca4b469de720f44a663ce9140658c346f1
 2015-06-01 10:44:04 -07:00
Chien-Yu Chen
6216e4e06f Camera2: update docs for reprocess timestamp 
Bug: 21112186
Change-Id: Ie49c00c96f7e69b672df5afa34e06e3dcd49490f
 2015-05-29 17:21:11 -07:00
Eino-Ville Talvala
66c73ba846 Camera2: Add tangential distortion coefficients 
Also improve the documentation for the radialDistortion tag in
general.

Bug: 20123879
Change-Id: I8a725dedb9432a29bb731d603ca5c9fa89b8f9a4
 2015-05-29 17:03:06 -07:00
Peng Xu
08ecf676e6 Merge "Bug fix and documentation clarification" into mnc-dev 2015-05-28 18:57:46 +00:00
Yin-Chia Yeh
f4b998153d Merge "Camera2: update legacy metadata" into mnc-dev 2015-05-28 17:48:17 +00:00
Yin-Chia Yeh
854b523e11 Camera2: update legacy metadata 
Bug: 21438559
Change-Id: Ic3c32b7706d2d8c7efae36e80e4e242111796520
 2015-05-26 11:52:55 -07:00
Yin-Chia Yeh
5cf9d8ac94 Merge "Camera: update available LSC map mode key type" into mnc-dev 2015-05-22 23:40:33 +00:00
Yin-Chia Yeh
656931d36d Camera: update available LSC map mode key type 
Bug: 21403373
Change-Id: I37101e2d0ef5cb8d66676dcdb16938ac8fe85c64
 2015-05-22 16:37:27 -07:00
Yin-Chia Yeh
9fbdc87422 Merge "Camera2: update FpsRange requirement" into mnc-dev 2015-05-22 20:57:08 +00:00
Yin-Chia Yeh
5855162f80 Camera2: update FpsRange requirement 
Codegen doc update only.

Bug:13639914
Change-Id: Id8a4a237c409725831a65b4f134422cd261cad52
 2015-05-22 13:50:10 -07:00