Yin-Chia Yeh
cff1749e52
Merge "Camera: block session init callback until ctor returns" into qt-dev am: 0e1eecd080 am: 0aa57fe073
...
am: e8ff13376f
2019-06-25 10:41:56 -07:00
Yin-Chia Yeh
e8ff13376f
Merge "Camera: block session init callback until ctor returns" into qt-dev am: 0e1eecd080
...
am: 0aa57fe073
2019-06-25 10:08:45 -07:00
Yin-Chia Yeh
0aa57fe073
Merge "Camera: block session init callback until ctor returns" into qt-dev
...
am: 0e1eecd080
2019-06-25 09:45:42 -07:00
Yin-Chia Yeh
0e1eecd080
Merge "Camera: block session init callback until ctor returns" into qt-dev
2019-06-25 16:26:54 +00:00
Yin-Chia Yeh
8b9b9f065c
Camera: block session init callback until ctor returns
...
To fix race condition where session init callback is executed
before the ctor finished (and mSessionImpl is initialized)
Test: manuall testing GCA
Bug: 134218348
Change-Id: I6985b489a8cb459d9b1dce4d56a9c3e97ceb366c
2019-06-24 11:32:34 -07:00
TreeHugger Robot
f62b91043c
Merge "Remove @Deprecated && @removed hardware methods."
2019-06-21 00:51:31 +00:00
TreeHugger Robot
0264147455
Merge "Camera: don't require (15, max) fps range for NIR camera"
2019-06-18 04:37:59 +00:00
Kweku Adams
26166043f6
Remove @Deprecated && @removed hardware methods.
...
The methods were marked @removed in Oreo. Finally removing it from code.
SensorDirectChannel.isValid is currently used by Roboelectric so it will
have to be removed separately.
Bug: 135214188
Test: Android builds
Change-Id: Ib357ad76654326d94f6873102de22451bf4f5b59
2019-06-17 14:15:40 -07:00
Kevin Chyn
534db6da6c
Merge changes I96ad00cb,I2b1193b9,I2850007f into qt-r1-dev am: 24c57b6a70
...
am: 0d9b47977b
2019-06-13 22:21:30 -07:00
Kevin Chyn
0d9b47977b
Merge changes I96ad00cb,I2b1193b9,I2850007f into qt-r1-dev
...
am: 24c57b6a70
2019-06-13 21:57:57 -07:00
Kevin Chyn
29692c5e8b
Return empty string when invalid error codes are received
...
Bug: 134857990
Test: Builds
Change-Id: I2850007f5aa5a00fa3ef7d95138200a3e6cec559
2019-06-13 16:28:44 -07:00
Yin-Chia Yeh
ae092f2a4f
Camera: don't require (15, max) fps range for NIR camera
...
Test: manually check generated doc
Bug: 132307219
Change-Id: Ifdf120936a26708ad203c90557977e7b6c303f9b
2019-06-12 15:08:36 -07:00
Kevin Chyn
6dd258b9db
Merge changes from topic "face-challenge-bug" into qt-r1-dev am: 01462c0b95
...
am: c4320f393f
2019-06-12 11:25:49 -07:00
Kevin Chyn
c4320f393f
Merge changes from topic "face-challenge-bug" into qt-r1-dev
...
am: 01462c0b95
2019-06-12 11:04:31 -07:00
Kevin Chyn
28623b6d29
LSS must check canAuthenticate(userId) for correct user/profile
...
Bug: 134834442
Test: With unified challenge enabled and work profile non-enrolled,
resetLockout is not invoked for work profile anymore
Change-Id: Ifb91df0ea66dbcd29d7f5fb648295b154074392c
2019-06-12 10:52:53 -07:00
Al Sutton
0acd9c8fdb
Merge "Add protection against an access-after-free issue if cancel() is called after a device connection has been closed."
2019-06-07 19:44:08 +00:00
Brian Duddie
cf2ff61cce
Merge "Clarify documentation for sensor placement" into qt-dev am: 6e9c0741b5 am: 985f1299cf
...
am: fc06205561
2019-06-05 14:06:45 -07:00
Brian Duddie
985f1299cf
Merge "Clarify documentation for sensor placement" into qt-dev
...
am: 6e9c0741b5
2019-06-05 13:53:01 -07:00
Brian Duddie
086d840d74
Clarify documentation for sensor placement
...
Update documentation to be in sync with new language added to HAL
interface, which better explains the expected payload, format, and
usage.
Fixes: 133264933
Test: make docs, view HTML
Change-Id: Ib602674d395cb8c8e6431d23b051685c8d172560
2019-06-05 11:44:44 -07:00
Al Sutton
ca53d07afe
Add protection against an access-after-free issue if cancel() is called
...
after a device connection has been closed.
Test: Existing tests will show if there is a chancel to cancel()
behavior expectations.
Fixes: 132319116
Change-Id: Ide7a41eca41b68868af93131dcd2155648e9fa8f
2019-06-04 09:06:03 +01:00
Shuzhen Wang
5c5e6da46d
Merge "Camera: Handle hidden physical camera without camcorder profile" into qt-dev am: 3960d2232d am: 3cc5d8d876
...
am: 36d2c4211e
2019-06-01 18:59:59 -07:00
Shuzhen Wang
36d2c4211e
Merge "Camera: Handle hidden physical camera without camcorder profile" into qt-dev am: 3960d2232d
...
am: 3cc5d8d876
2019-06-01 18:54:52 -07:00
Shuzhen Wang
0c65fb0931
Merge "Camera: Handle hidden physical camera without camcorder profile" into qt-dev
...
am: 3960d2232d
2019-06-01 18:49:56 -07:00
Shuzhen Wang
aae389639d
Camera: Handle hidden physical camera without camcorder profile
...
For hidden physical sub-camera, if there is no camcorder profile,
use stream configuration map to figure out maximum recording size.
Test: RobustnessTest
Bug: 133819902
Change-Id: Ie0e76b51b1942b6fd3612c0b849a07bbb5d205e9
2019-05-31 13:23:40 -07:00
Amy Zhang
98be786ea2
Merge "Exposing getPortInfo in HdmiControlService as an HdmiSwitchClient API"
2019-05-22 17:44:03 +00:00
Emilian Peev
be4d3d7d78
Merge "Merge "Camera: Always return 'null' for unsupported formats" into qt-dev am: c7c173389a am: 54d7219b0c" into qt-r1-dev-plus-aosp
...
am: 77be6638e5
2019-05-17 22:36:48 -07:00
Shuzhen Wang
7bac066244
Merge "Camera: Handle out-of-order frameNumber for ZSL requests" into qt-dev am: 34bc57f738 am: 400c6fc4ee
...
am: 3958b32857
2019-05-17 20:17:48 -07:00
Emilian Peev
54d7219b0c
Merge "Camera: Always return 'null' for unsupported formats" into qt-dev
...
am: c7c173389a
2019-05-17 15:17:49 -07:00
Shuzhen Wang
400c6fc4ee
Merge "Camera: Handle out-of-order frameNumber for ZSL requests" into qt-dev
...
am: 34bc57f738
2019-05-17 14:55:46 -07:00
TreeHugger Robot
c7c173389a
Merge "Camera: Always return 'null' for unsupported formats" into qt-dev
2019-05-17 21:35:23 +00:00
TreeHugger Robot
34bc57f738
Merge "Camera: Handle out-of-order frameNumber for ZSL requests" into qt-dev
2019-05-17 21:20:44 +00:00
Amy
6a58a34e14
Exposing getPortInfo in HdmiControlService as an HdmiSwitchClient API
...
Test: manual
Bug: 132724598
Change-Id: I482295728ef19ba0eca26a4349dc1ea8ce93fe2c
2019-05-17 13:54:46 -07:00
Emilian Peev
cebe6d2d4b
Merge "Merge "Camera: Fix some documentation typos" into qt-dev am: ee0d8180b6 am: 8698821cdf" into qt-r1-dev-plus-aosp
...
am: ea38cd80ee
2019-05-17 06:21:52 -07:00
Emilian Peev
bbee8372b6
Merge "Camera: Fix some documentation typos" into qt-dev am: ee0d8180b6
...
am: 8698821cdf
2019-05-16 13:35:33 -07:00
Emilian Peev
c9fe56e893
Merge "Camera: Fix some documentation typos" into qt-dev
...
am: ee0d8180b6
2019-05-16 12:23:44 -07:00
Emilian Peev
0105dfbe78
Camera: Fix some documentation typos
...
Bug: 132419505
Test: Successful build
Change-Id: Ifb610998422264f565a16eae005e7096a6a2f611
2019-05-15 12:00:13 -07:00
Emilian Peev
0fde6be448
Camera: Always return 'null' for unsupported formats
...
According to the API documentation, output size queries must
return 'null' in case the respective format is not supported.
Bug: 132594990
Test: Camera CTS
Change-Id: I832efe73dae8753baa635b359a68062f2ef63476
2019-05-15 11:12:19 -07:00
Shuzhen Wang
b45449b9bc
Camera: Handle out-of-order frameNumber for ZSL requests
...
Allow the frame number of ZSL capture to be out of order compared to
reprocessing or normal captures.
Test: Camera CTS, 3P camera app sanity test.
Bug: 120604717
Change-Id: I6bc81dc522329153c0ea27c3409d7237470d1850
2019-05-10 12:35:45 -07:00
Christine Franks
073c90857c
Merge "Validate vendor display color modes" into qt-dev am: 1da3d01b5e
...
am: 29e86faf4e
2019-05-08 11:44:01 -07:00
Christine Franks
29e86faf4e
Merge "Validate vendor display color modes" into qt-dev
...
am: 1da3d01b5e
2019-05-08 11:12:24 -07:00
Christine Franks
c5f0d146db
Validate vendor display color modes
...
Bug: 128607042
Test: atest FrameworksServicesTests:ColorDisplayServiceTest
Change-Id: I78dca7eeb9d4855007b5616b444b2b715860bed1
2019-05-06 12:26:08 -07:00
Brian Stack
880eec4135
Merge "Merge changes from topic "step_event_permission" into qt-dev am: 76d9f44133" into qt-dev-plus-aosp
...
am: 91a6a2f313
2019-05-03 13:46:33 -07:00
Shuzhen Wang
0d54a8bda5
Merge "Camera: Consider mPhysicalCameraId in OutputConfiguration comparison" into qt-dev am: 6c7014dd52
...
am: 4f4fa12784
2019-05-03 10:51:50 -07:00
Brian Stack
2e9b2b31a1
Merge changes from topic "step_event_permission" into qt-dev
...
am: 76d9f44133
2019-05-03 09:31:38 -07:00
Shuzhen Wang
4f4fa12784
Merge "Camera: Consider mPhysicalCameraId in OutputConfiguration comparison" into qt-dev
...
am: 6c7014dd52
2019-05-03 06:37:40 -07:00
TreeHugger Robot
76d9f44133
Merge changes from topic "step_event_permission" into qt-dev
...
* changes:
Update Step Detector and Step Counter docstring
Add support for retrieving targetSdkVersion
2019-05-02 22:56:56 +00:00
TreeHugger Robot
6c7014dd52
Merge "Camera: Consider mPhysicalCameraId in OutputConfiguration comparison" into qt-dev
2019-05-02 21:10:59 +00:00
Shuzhen Wang
46c390a1c6
Camera: Consider mPhysicalCameraId in OutputConfiguration comparison
...
Test: Camera CTS
Bug: 131714581
Change-Id: Ifbd44a0cd16116311e0eef9c194dd90c9210952c
2019-05-02 11:08:22 -07:00
Brian Stack
fef1a81593
Update Step Detector and Step Counter docstring
...
Explicitly states that the Step Detector and Step Counter require the
android.permission.ACTIVITY_RECOGNITION permission in order to be
used.
Bug: 130640415
Test: Builds
Change-Id: I3c6bb00128343dff8dbb97c71e9fe2a912662ff0
2019-05-01 19:18:27 +00:00
Ian Chang
5d4dec4732
Merge "Add tracepoints for potential performance issues" into qt-dev am: 28cb4d23db
...
am: cb12c60411
2019-05-01 09:59:56 -07:00
