Commit Graph

3708 Commits

Author SHA1 Message Date
Curtis Belmonte
9ffc191719 Merge "Update biometric constant docs from tier to class" into rvc-dev am: 29d2bf129a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11840347

Change-Id: Ie2ffff68e4ab98267dfb00dbf5ab12331d4c402a
2020-06-26 20:28:32 +00:00
Curtis Belmonte
29d2bf129a Merge "Update biometric constant docs from tier to class" into rvc-dev 2020-06-26 20:10:50 +00:00
Treehugger Robot
3e42674367 Merge "Update GeomagneticField coefficients to WMM-2020" am: cbbd953695 am: d74a6fe6bb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1247703

Change-Id: I4407e02dbfffb9c3ca56fde50581181785b3335d
2020-06-26 18:10:03 +00:00
Cory Hockenbury
793dad3164 Update GeomagneticField coefficients to WMM-2020
Update the GeomagneticField coefficients according to the World
Magnetic Model 2020-2025 values and specify the base time in UTC since
calls to System.currentTimeMillis() will return a UTC based time.

Signed-off-by: Cory Hockenbury <chockenbury@gmail.com>
Change-Id: I7614d420ad55129b04e0dfa9310e39d715ed2da7
2020-06-25 14:19:20 +00:00
TreeHugger Robot
3a9c937f4f Merge "camera2: Add mandatory stream combinations for depth only cameras." into rvc-dev am: a0637ae24b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11967540

Change-Id: I45ba2c05e353fba0cba79fce62b57b9b3e7b1b9c
2020-06-24 22:22:08 +00:00
Jayant Chowdhary
d7feae01a5 camera2: Add mandatory stream combinations for depth only cameras.
Bug: 159247271

Test: atest ConcurrentCameraTest.java

Change-Id: I89d6209d36f76aa8ec19aaafd81abf1cfd025463
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2020-06-23 17:45:23 -07:00
TreeHugger Robot
a6426587e0 Merge "Camera: Adjust documentation and comments for insensitive language." into rvc-dev am: 8b3783c8e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11936406

Change-Id: Ia0a513bb6b827f41deffa9af9e2603b422b15122
2020-06-21 23:14:06 +00:00
TreeHugger Robot
8b3783c8e5 Merge "Camera: Adjust documentation and comments for insensitive language." into rvc-dev 2020-06-21 22:53:21 +00:00
Eino-Ville Talvala
14c753626e Camera: Adjust documentation and comments for insensitive language.
Test: Builds
Bug: 159480149
Change-Id: I0daadbfa6505339bdcec4a49c6e4577424832f75
2020-06-19 15:26:39 -07:00
TreeHugger Robot
aaee7513c7 Merge "Camera: Relax physical stream cropping behavior" into rvc-dev am: 08465447a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11457099

Change-Id: I826b131674313c5de03838709e97f1dc927b316c
2020-06-19 21:11:59 +00:00
TreeHugger Robot
08465447a2 Merge "Camera: Relax physical stream cropping behavior" into rvc-dev 2020-06-19 21:10:22 +00:00
TreeHugger Robot
7841de0683 Merge "Camera: Allow reprocessing session to configure physical streams" into rvc-dev am: 861a8178f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11669678

Change-Id: I8ae6d4f5f6c175d8df4c7e76512ddb29ec254a6a
2020-06-19 20:47:06 +00:00
Shuzhen Wang
84a475a20f Camera: Allow reprocessing session to configure physical streams
Do not disallow reprocessable session to use physical streams.

At the same time, we cannot claim reprocessing to/from physical streams
work because:
1. It's undefined behavior to reprocess an input buffer into a physical
stream of different physical camera, or an input physical stream buffer
into an output buffer of different physical camera.
2. If the reprocessing input buffer comes from different physical cameras
with different sizes, because the current HAL API doesn't support sending
different size buffers through input stream, there isn't a
non-vendor-specific solution available.

Bug: 157123506
Test: vendor testing
Change-Id: I1ccf2b3918c1cb475b1baec10d35c6785b25208d
2020-06-19 17:23:52 +00:00
Shuzhen Wang
9c9b1085c3 Camera: Relax physical stream cropping behavior
Allow physical stream's field-of-view to be larger than that of the
logical stream, thus enabling more robust depth-from-stereo or motion
tracking.

Test: Build
Bug: 153583897
Bug: 157676445
Bug: 157138779
Bug: 155393103
Change-Id: Ibc059396e9d5e7db80b6c2632d26f48774aad4d4
2020-06-18 15:53:49 -07:00
TreeHugger Robot
bfaa2fed21 Merge "Camera: Fix race for onCaptureBufferLost callback (take 2)" into rvc-dev am: a2dbc3b3ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838748

Change-Id: I2499cd268896b11b78d6828142749dda181b1a0b
2020-06-18 22:16:16 +00:00
TreeHugger Robot
a2dbc3b3ee Merge "Camera: Fix race for onCaptureBufferLost callback (take 2)" into rvc-dev 2020-06-18 22:00:11 +00:00
Kevin Chyn
18dbde4e86 Merge "Update biometric/keystore documentation" into rvc-dev am: 9cd814be2a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11876678

Change-Id: I173d8bafb4a02c925721b75eec2f42c398a49c43
2020-06-17 01:57:45 +00:00
Kevin Chyn
9cd814be2a Merge "Update biometric/keystore documentation" into rvc-dev 2020-06-17 01:43:09 +00:00
Kevin Chyn
01ab00121b Update biometric/keystore documentation
Fixes: 158883515

Test: Builds
Change-Id: I22aa2345fcb05c2f43344398dd5357dc1874414a
2020-06-16 13:51:33 -07:00
Charles Chen
dd7e0fded2 Merge "Trust System UI owned display to receive keys" into rvc-dev am: 94deecfda2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11570100

Change-Id: I93a7522c1ce94e379269b9a1a0de802916dcbb32
2020-06-16 14:14:14 +00:00
Charles Chen
b28fb721f5 Trust System UI owned display to receive keys
A11y service cannot get focus of bubbles because it's not a
System owned display. This patch makes System UI owned display
a trusted display. Moreover, this patch refactors the logic to
identify a trusted display by introducing FLAG_TRUSTED and
removes the trusted display check along with supportsSystemDecorations()
because the check has been included in supportsSystemDecorations().

fixes: 155823002
Bug: 152416787
Test: atest DisplayContentTests
Test: atest WindowFocusTests
Test: atest TaskDisplayAreaTests
Test: atest MultiDisplaySystemDecorationTests
Test: atest DisplayTest
Change-Id: Ie684c6488904e5aa8cae166a455c6d55455e5f55
2020-06-16 02:10:21 +08:00
Curtis Belmonte
e8aa66a061 Update biometric constant docs from tier to class
Same as ag/11711578, but updates the names of the biometric security
constants in documentation from "Tier 1/2/3" to "Class 1/2/3". This
matches the latest language in the Android 11 CDD.

Test: m -j
Bug: 157266312
Change-Id: Ic5c5674232737f468aa750e60c60dd6a3637a6f8
2020-06-11 11:56:38 -07:00
Shuzhen Wang
e16fed203a Camera: Fix race for onCaptureBufferLost callback (take 2)
The callback holder was removed when the capture sequence is
completed, which is too soon because the buffer loss callback could
potentially arrives later than the capture sequence completion.

Defer the deletion of the callback holder to when the native inflight
request is removed, which takes into consideration of error
notifications.

Test: Camera CTS
Bug: 155353799
Change-Id: I56b9bfbe182ba6fc0ec2cb543fc32774ed3f6f1a
2020-06-11 09:59:47 -07:00
Ytai Ben-tsvi
72daaeb263 Merge changes Ibf4ecdb4,I1e4adf9f into rvc-dev am: 3917b729a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11815381

Change-Id: I6fec22000cbf048a1532afe951c5e2f7b495c921
2020-06-10 19:38:52 +00:00
Ytai Ben-tsvi
3917b729a6 Merge changes Ibf4ecdb4,I1e4adf9f into rvc-dev
* changes:
  Correctly propagate service state change
  Support null audio format in recognition event
2020-06-10 19:31:42 +00:00
TreeHugger Robot
aa254d926e Merge "Camera: clarify eviction behavior within the same application" into rvc-dev am: 8aa60f69e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11798679

Change-Id: I02b9837b7d6ecbcd86c102e83eba1c790918e3d8
2020-06-10 18:25:49 +00:00
TreeHugger Robot
8aa60f69e9 Merge "Camera: clarify eviction behavior within the same application" into rvc-dev 2020-06-10 18:17:42 +00:00
TreeHugger Robot
f7f596f902 Merge "Revert "Camera: Fix race for onCaptureBufferLost callback"" into rvc-dev am: a27465258a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818440

Change-Id: Ia5c7fc3891176b2c0a0de7576ec58ff57f5f0bed
2020-06-10 16:49:04 +00:00
TreeHugger Robot
a27465258a Merge "Revert "Camera: Fix race for onCaptureBufferLost callback"" into rvc-dev 2020-06-10 16:33:37 +00:00
Greg Kaiser
22abb8d0c1 Revert "Camera: Fix race for onCaptureBufferLost callback"
Revert submission 11415576-bufferErrorLossFix

Reason for revert: Breaks Camera on at least the wembley device
Reverted Changes:
I12b716acc:Camera: Fix race for onCaptureBufferLost callback
I43f0f5ea1:Camera: Add lastCompletedFrameNumber in CaptureRes...

Bug: 158622719
Change-Id: Id95d0f157c0f940cc80d0fb3c8f95d62968a4745
Test: Locally tried this revert on rvc-dev on a wembley, and now the Camera works
2020-06-10 05:41:44 +00:00
Ytai Ben-Tsvi
46d87b7927 Correctly propagate service state change
Due to a surprising behavior of Handler.obtainMessage(), the argument
that indicated whether the service is available was always read as 0
(enabled), and we never correctly handled the service being
unavailable (due to concurrent capture).

Bug: 157496890
Test: Enabled debug logging and verified that the message is now
      passed correctly and that indeed that models get inactivated
      when capture starts and reactivated when it stops.
Change-Id: Ibf4ecdb4e4dd0f5a02d5a388afddb205c29eb2ea
2020-06-09 16:05:25 -07:00
Ytai Ben-Tsvi
7caef40ad0 Support null audio format in recognition event
The audio format doesn't always make sense in recognition events, for
example in a failure or abort event, so we allow it to be null.
However since the SoundTrigger.java API doesn't allow that, we inject
a default if it is not available.

Bug: 157496890
Test: Simulated a device that doesn't support concurrent capture,
      reproduced the bug, applied the fix, verified.
Change-Id: I1e4adf9f3ccdc0f62cb9ca5e8c07df3c40a9d2cd
2020-06-09 16:05:19 -07:00
Yin-Chia Yeh
92256e773a Camera: clarify eviction behavior within the same application
Test: build (doc only change)
Bug: 153699385
Change-Id: Ic2d9a72e9aad71f4b47583900f1093a1c7a0f4f8
2020-06-09 14:31:46 -07:00
TreeHugger Robot
6732f25854 Merge "Camera: Fix race for onCaptureBufferLost callback" into rvc-dev am: 918942f462
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11510012

Change-Id: Idb2078674c06125f282668c7862fdb5d1b791467
2020-06-08 19:41:23 +00:00
TreeHugger Robot
918942f462 Merge "Camera: Fix race for onCaptureBufferLost callback" into rvc-dev 2020-06-08 19:28:31 +00:00
Amy Zhang
023916bd8a Merge "Expose necessary SystemApi as test API for CEC CTS" into rvc-dev am: a7dc4defd3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11625493

Change-Id: If1355f8fceabcccabaf0dc9abe299112123a40b1
2020-06-05 02:56:27 +00:00
Shuzhen Wang
db97350aa1 Camera: Fix race for onCaptureBufferLost callback
The callback holder was removed when the capture sequence is
completed, which is too soon because the buffer loss callback could
potentially arrives later than the capture sequence completion.

Defer the deletion of the callback holder to when the native inflight
request is removed, which takes into consideration of error
notifications.

Test: Camera CTS
Bug: 155353799
Change-Id: I12b716acc9fbaa9791f0498ac77d4470a7448d5a
2020-06-04 18:28:44 -07:00
Amy Zhang
e151e60843 Expose necessary SystemApi as test API for CEC CTS
This CL annotates multiple APIs in the HdmiControlManager as Test APIs.
Also creates a Test api wrapper for aidl interface IHdmiControlService.
HdmiPortInfo is the param under test that is also annotated as Test API.

Test: atest android.hardware.hdmi.cts
Bug: 155113872
Change-Id: I58b483eaaa5fe08f90415a7e044c30a28dc7d7c2
2020-06-04 13:47:37 -07:00
Nick Chalko
ba4ace3d63 Merge "CEC: Add listener for HDMI CEC volume control feature" into rvc-dev am: 75ef06daa5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11246196

Change-Id: I3b1ed61eba2a0bb46c5d1ac187ab0d1a42e35e73
2020-06-04 19:11:16 +00:00
Nick Chalko
75ef06daa5 Merge "CEC: Add listener for HDMI CEC volume control feature" into rvc-dev 2020-06-04 19:03:05 +00:00
TreeHugger Robot
80cafc7cb5 Merge "Update tier names in biometric constants documentation" into rvc-dev am: a3aac62786
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11711578

Change-Id: I014e4447bbdaa3b1764bcf22fe9a48234c1ae8d9
2020-06-03 01:38:11 +00:00
TreeHugger Robot
a3aac62786 Merge "Update tier names in biometric constants documentation" into rvc-dev 2020-06-03 01:25:11 +00:00
Curtis Belmonte
43825ac301 Update tier names in biometric constants documentation
Adds references to the new security tier names (Tier 1/2/3) in the
documentation for the corresponding biometric authenticator constants:
- Strong -> Tier 3
- Weak -> Tier 2
- Convenience -> Tier 1

Test: Builds
Fixes: 157266312
Change-Id: I80965e8e5c53f049d91f18f0e114d89f18593400
2020-06-02 16:58:08 -07:00
Marvin Ramin
7ddbb62ccd CEC: Add listener for HDMI CEC volume control feature
Adds a listener to receive updates to the state of the HDMI CEC volume
control features.

Interested parties can register and unregister to get notified about
state updates which are sent on every change to the value.

Test: atest HdmiControlServiceTest
Bug: 152018314
Change-Id: I342d748114bae99b3c3f236502d73bfeac9e9ac5
Merged-In: I342d748114bae99b3c3f236502d73bfeac9e9ac5
2020-06-01 20:13:54 +00:00
Kevin Chyn
9710f8eaab Merge "Send callingUserId from AuthService -> BiometricServiceBase" into rvc-dev am: 20534dcc8d
Change-Id: Ib44ff58a107d0e1e4c58b98f0d15234f1b2ea01c
2020-06-01 16:04:30 +00:00
Kevin Chyn
20534dcc8d Merge "Send callingUserId from AuthService -> BiometricServiceBase" into rvc-dev 2020-06-01 15:57:00 +00:00
Kevin Chyn
5433cd4070 Send callingUserId from AuthService -> BiometricServiceBase
Since authenticatorIds are collected from AuthService, which is
system_server, we need to get the callingUserId before the code
enters system_server, which clears calling identity.

Test: 1) Set up work profile, install BiometricPromptDemo
      2) Enroll work profile fingerprint
      3) Open work profile version of BiometricPromptDemo
      4) Create biometric-bound keys and authenticate with fingerprint
      Before this change, key was unusable. After this change,
      the key can be used

Fixes: 157486161
Change-Id: I4ec89b9cb13caff397b1a1acd844962736290040
Merged-In: I4ec89b9cb13caff397b1a1acd844962736290040
2020-05-29 23:21:57 +00:00
Nicholas Ambur
fcb6232fea Merge "add SoundTrigger TestApis" into rvc-dev am: 779a8966f5
Change-Id: I1d829629577e0516cf01fae69876a62070129cec
2020-05-29 03:19:17 +00:00
Nicholas Ambur
779a8966f5 Merge "add SoundTrigger TestApis" into rvc-dev 2020-05-29 03:17:09 +00:00
TreeHugger Robot
dd3baf3304 Merge "Generate ACTION_CANCEL event when screen turned off by proximity sensor." into rvc-dev am: aaec0d4ac3
Change-Id: Ib88a57ea042b5dd229bac8bf4f5212d8040b03fb
2020-05-28 18:40:02 +00:00