Commit Graph

3191 Commits

Author SHA1 Message Date
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

Change-Id: I0a33e5c0f1a258d729fe06bbb8da6d6e44fa4fe4
2019-06-05 14:06:45 -07:00
Brian Duddie
985f1299cf Merge "Clarify documentation for sensor placement" into qt-dev
am: 6e9c0741b5

Change-Id: I56695e9ea76f802b171c47fbb3f2dead651eb697
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

Change-Id: I4671e39b54657849753e6b1c8678a8a0912cc614
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

Change-Id: Ie9591f5ea93465211fe99b8db0ae16f3f2af8264
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

Change-Id: I0be4d73cb018510ca49a498a895ac5aacf4463eb
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

Change-Id: I4d040080ffab3bc39a99eee64d6a26d39fd563e9
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

Change-Id: I1da19dcbfcb6aab0d326cb321c7fe99d39a23d60
2019-05-17 20:17:48 -07:00
Emilian Peev
54d7219b0c Merge "Camera: Always return 'null' for unsupported formats" into qt-dev
am: c7c173389a

Change-Id: I70498dcc38c16912230eb28f2975cd758f12e694
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

Change-Id: If601700de8ea43d1bf1538984951b0ec76151f88
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

Change-Id: I95317816a5775a3821b73541370e62a4a2b6cb6b
2019-05-17 06:21:52 -07:00
Emilian Peev
bbee8372b6 Merge "Camera: Fix some documentation typos" into qt-dev am: ee0d8180b6
am: 8698821cdf

Change-Id: Icf58cc04b610cf3bea60ff98ca13c4934b5b2bc9
2019-05-16 13:35:33 -07:00
Emilian Peev
c9fe56e893 Merge "Camera: Fix some documentation typos" into qt-dev
am: ee0d8180b6

Change-Id: Ib774bda31bd6aee67eaa88f8e840ba5930d6d9b3
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

Change-Id: I0d7f22a514eed669aae6f371021ac0fafdec745e
2019-05-08 11:44:01 -07:00
Christine Franks
29e86faf4e Merge "Validate vendor display color modes" into qt-dev
am: 1da3d01b5e

Change-Id: Iad3419fbbb43177bb137c17c45b34f494d34ff8b
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

Change-Id: Iad1b805d61a2360c9508ab3e279fca3b9cac52da
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

Change-Id: I529ca49c7d6c48162679b4df64c05646f33b17da
2019-05-03 10:51:50 -07:00
Brian Stack
2e9b2b31a1 Merge changes from topic "step_event_permission" into qt-dev
am: 76d9f44133

Change-Id: I595aac545678b7059c817c62a73ff88a473bf556
2019-05-03 09:31:38 -07:00
Shuzhen Wang
4f4fa12784 Merge "Camera: Consider mPhysicalCameraId in OutputConfiguration comparison" into qt-dev
am: 6c7014dd52

Change-Id: If661321a74436c850652e728e16cf13e8de83668
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

Change-Id: I0f0ff21e7e3b5e8306d41d65d0f2cf12e501499c
2019-05-01 09:59:56 -07:00
Ian Chang
cb12c60411 Merge "Add tracepoints for potential performance issues" into qt-dev
am: 28cb4d23db

Change-Id: I6de4fb84870d0e67d0b944b8fd7ad5307e6fe46e
2019-04-30 19:42:39 -07:00
Ian
fd4021c26a Add tracepoints for potential performance issues
Bug: 124521164
Test: Builds
Change-Id: Ie70f2aae6c5b2e70d9f6029281a761c872451337
2019-04-30 00:01:11 +00:00
Shuzhen Wang
690fde21dc Merge "Camera: Relax BURST_CAPTURE FPS requirements" into qt-dev am: b9177522ff
am: 578e1637bd

Change-Id: Ie1f96c91c50e56294e13475e976cb085cb129884
2019-04-23 21:48:02 -07:00
Shuzhen Wang
578e1637bd Merge "Camera: Relax BURST_CAPTURE FPS requirements" into qt-dev
am: b9177522ff

Change-Id: Ib1da89bbfafa3f5c1231d14aa071f6e22c268da0
2019-04-23 18:59:19 -07:00
Shuzhen Wang
062c22ba60 Camera: Relax BURST_CAPTURE FPS requirements
Allow resolutions larger than 24 megapixels to have fps lower than
10fps.

Test: Build
Bug: 129693371
Change-Id: Ie0403d80bf4c441e268d266eb30dacc2ea8184b9
2019-04-22 08:58:16 -07:00
Shuzhen Wang
0c2fbcddc6 Merge "Camera: Clarify multi-camera RAW and FOV behaviors" into qt-dev am: c901e419e3
am: d514575d59

Change-Id: Iad42221c9a9cdf06f46ea01dc65144b48850a0ae
2019-04-17 20:39:17 -07:00
Shuzhen Wang
d514575d59 Merge "Camera: Clarify multi-camera RAW and FOV behaviors" into qt-dev
am: c901e419e3

Change-Id: I51a7aa4c7246b6899f933cd3c8e82093f8f1b43a
2019-04-17 17:18:49 -07:00
TreeHugger Robot
c901e419e3 Merge "Camera: Clarify multi-camera RAW and FOV behaviors" into qt-dev 2019-04-17 23:23:29 +00:00
George Lu
35b94bdc9b Merge "Introduce ProgramInfoCache" 2019-04-17 17:37:09 +00:00
Shuzhen Wang
0fdc9358c6 Camera: Clarify multi-camera RAW and FOV behaviors
- RAW capability can exist for multi-camera even if physical cameras are
of different sizes/capabilities.
- FOV for all processes streams must be the same regardless of logical
or physical streams.

Test: Build and read docs
Bug: 118906351
Bug: 126220135
Change-Id: I14ab4844630a048e66a42ec3a776c87830565e49
2019-04-16 17:13:44 -07:00
George Lu
c769778571 Introduce ProgramInfoCache
ProgramInfoCache will be used in a future CL by BroadcastRadioService to
perform the multiple AIDL client to single HAL fanout of ITunerSession's
"program list update" API.

This CL also addresses a few issues with some of the AIDL classes:
- RadioMetadata.equals() was not defined despite being used by RadioManager.ProgramInfo.equals().
- Added ProgramList.Identifier.isCategoryType() to provide a formal definition of how ProgramList.Filter.areCategoriesIncluded() works.

Bug: 121305828
Test: atest com.android.server.broadcastradio.hal2.ProgramInfoCacheTest
Change-Id: I50befe3b16125a50d494899ba97aa0f9b6d76913
2019-04-15 15:11:59 -07:00
Amy Zhang
7a7ebecb9b Merge "Resolve CEC related API requests from API Council" into qt-dev
am: 64b51f91ff

Change-Id: I8c9f89d3bd8c4124e4d09115684a02156e19e1fb
2019-04-15 11:05:06 -07:00
Amy Zhang
64b51f91ff Merge "Resolve CEC related API requests from API Council" into qt-dev 2019-04-15 17:46:49 +00:00
Kevin Chyn
1ebd55b1f5 Merge "Authenticate with the correct user from KeyguardUpdateMonitor" into qt-dev
am: 9b92030ad5

Change-Id: Iee77d2830ea0837441c362f8d435511cfac7d5b0
2019-04-12 14:34:33 -07:00
Kevin Chyn
9b92030ad5 Merge "Authenticate with the correct user from KeyguardUpdateMonitor" into qt-dev 2019-04-12 21:10:23 +00:00