Brian Duddie
6710441150
Merge "docs: Correct sensor runtime permission documentation" into qt-dev
...
am: 119f1220cd
2019-08-14 13:10:45 -07:00
Brian Duddie
0fcaef12c0
docs: Correct sensor runtime permission documentation
...
The ACTIVITY_RECOGNITION permission applies to TYPE_STEP_DETECTOR, not
TYPE_GEOMAGNETIC_ROTATION_VECTOR.
Bug: 139363621
Test: n/a, comment update only
Change-Id: Ibce74be1e704ded04ae710988d0e03df43ab1cf9
2019-08-13 18:48:26 +00:00
Shuzhen Wang
6f14111467
Merge "Camera: Clarify manual capture behavior for logical camera" into qt-dev
...
am: 6da414a8f6
2019-06-28 17:48:51 -07:00
Shuzhen Wang
da189bddc2
Camera: Clarify manual capture behavior for logical camera
...
Test: Build and read docs
Bug: 136098496
Change-Id: I4a2e9ac66ef79379b9c50932ddc845f56d7d01b4
2019-06-27 10:29:38 -07:00
Yin-Chia Yeh
da073b4ac1
Merge "Camera: block session init callback until ctor returns" into qt-dev
...
am: 0e1eecd080
2019-06-25 09:53:03 -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
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
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
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
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
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
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
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
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
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
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
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
Kevin Chyn
76d5454a86
Merge "Handle cancellation properly for setDeviceCredentialAllowed(true)" into qt-dev
2019-04-10 08:34:34 +00:00
Kevin Chyn
5a90a653f5
Handle cancellation properly for setDeviceCredentialAllowed(true)
...
Keep the current auth session until ConfirmDeviceCredential succeeds
or fails. ConfirmDeviceCredential's BP and LSKF screens can be canceled
now.
Bug: 123378871
Bug: 128747871
Test: With modified BiometricPromptDemo, ConfirmDeviceCredential's
BiometricPrompt and LSKF screens can be canceled
Change-Id: Icaf3f0c55b07fd138a2ee9d214941ea83408f0ee
2019-04-09 22:04:05 -07:00
Rob Carr
f8f5f0290e
Merge "Careful with screenshots containing secure layers!" into qt-dev
2019-04-09 00:45:22 +00:00
