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
Ian Chang
cb12c60411
Merge "Add tracepoints for potential performance issues" into qt-dev
...
am: 28cb4d23db
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
2019-04-23 21:48:02 -07:00
Shuzhen Wang
578e1637bd
Merge "Camera: Relax BURST_CAPTURE FPS requirements" into qt-dev
...
am: b9177522ff
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
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
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
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
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
Eino-Ville Talvala
6000bb9884
Merge "Camera: Document LEGACY not being allowed on new devices" into qt-dev
...
am: 9943f8db84
2019-04-12 12:19:27 -07:00
Kevin Chyn
8d2694a351
Authenticate with the correct user from KeyguardUpdateMonitor
...
Fixes: 130242795
Test: manual
Change-Id: I5c5e400de9d204d89abbe07bc6b3265dbc4ea973
2019-04-12 11:48:12 -07:00
Eino-Ville Talvala
9943f8db84
Merge "Camera: Document LEGACY not being allowed on new devices" into qt-dev
2019-04-12 18:11:06 +00:00
Amy
d23043a255
Resolve CEC related API requests from API Council
...
Test: manual
Bug: 128427908
Change-Id: I1c8cd3ed843c91ecb94076160fd1bd93295c619b
2019-04-12 00:55:29 +00:00
Kevin Chyn
76fa5f0060
Merge "Update documentation for fingerprint -> biometric" into qt-dev
...
am: 3fe3dc7f5f
2019-04-11 14:43:32 -07:00
TreeHugger Robot
3fe3dc7f5f
Merge "Update documentation for fingerprint -> biometric" into qt-dev
2019-04-11 21:25:52 +00:00
Neil Fuller
a76674f153
resolve merge conflicts of fe9b32e4be to qt-dev-plus-aosp
...
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Exempt-From-Owner-Approval: Merge conflict resolution for approved change
Change-Id: I39bda8417f709f86b5b389a75ff34df8a28a3d8d
2019-04-11 18:09:18 +00:00
Neil Fuller
b5d1c15ec2
Switch from Byte.toHexString() to HexEncoding
...
Switch from Byte.toHexString() to HexEncoding equivalents.
Bug: 124232146
Test: build only
Exempt-From-Owner-Approval: Cherry-picking OWNERS approved internal version
Merged-In: Id244e5247eb87c67446cbd65eb5d320f3617b8cd
Change-Id: Id244e5247eb87c67446cbd65eb5d320f3617b8cd
2019-04-11 09:27:45 +00:00
Eino-Ville Talvala
2a303a492b
Camera: Document LEGACY not being allowed on new devices
...
Bug: 130315905
Test: Builds, docs look ok.
Change-Id: I9e1bd8561819f84419cac4d048085700b4694473
2019-04-11 00:42:36 +00:00
