Commit Graph

3851 Commits

Author SHA1 Message Date
TreeHugger Robot
403287ad1b Merge "Update GeomagneticField coefficients to WMM-2020" 2020-06-24 23:37:26 +00:00
TreeHugger Robot
fec442c59d Merge "camera2: Add mandatory stream combinations for depth only cameras." into rvc-dev am: a0637ae24b am: 3a9c937f4f am: 70ca9c6884 am: 7113365f65
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11967540

Change-Id: I7fc255b32bb92aeac977ed12c290d39ac22ecba2
2020-06-24 22:44:59 +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
Cory Hockenbury
bf2f69f416 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.

Test: CTS test passes
Signed-off-by: Cory Hockenbury <chockenbury@gmail.com>
Merged-In: I7614d420ad55129b04e0dfa9310e39d715ed2da7
Change-Id: Ica9182053359e5387da57bb0b3b93347040160ed
2020-06-24 12:41:53 -07: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
a5741fa92a Merge "Camera: Add post-submit CTS tests for camera2 Java code" 2020-06-22 19:06:42 +00:00
TreeHugger Robot
aac2759552 Merge "Camera: Adjust documentation and comments for insensitive language." into rvc-dev am: 8b3783c8e5 am: 1a4d6dcd73 am: 67a920be4e am: f87666cedc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11936406

Change-Id: Ifa575335ccfeed2ebf533825b6909bd5a176d852
2020-06-22 00:03:12 +00:00
TreeHugger Robot
67a920be4e Merge "Camera: Adjust documentation and comments for insensitive language." into rvc-dev am: 8b3783c8e5 am: 1a4d6dcd73
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11936406

Change-Id: I08626e1a55fe1a01f23bac71c8b1146ea0a98365
2020-06-21 23:39:08 +00: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
Kevin Chyn
e084b633e5 Merge "12/n: Remove the need for setActiveUser(int)" 2020-06-20 01:02:23 +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
7cfe271bc0 Merge "Camera: Relax physical stream cropping behavior" into rvc-dev am: 08465447a2 am: 67d8e4ba14 am: 4fef74f41d am: 0f041ff67f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11457099

Change-Id: Ib6a4c7b5f6fd847b87eae37b2a81309149079fa3
2020-06-19 21:56:46 +00:00
Kevin Chyn
2fdab353c8 12/n: Remove the need for setActiveUser(int)
This is already semi-combined in the Fingerprint/FaceService layer,
for example authenticate() already updates the active group. This
change makes the remainder of user-specific operations (resetLockout,
enroll, etc) atomic from a caller's perspective.

Also fixed some fingerprint naming (passing userId through groupId
parameter since groupId is not used). GroupId is going to be removed
in a follow-up CL.

Removed unused rename() from IFaceService.aidl / FaceService.java

Bug: 157790417
Test: For fingerprint/face, do each of the following
Test: Enroll, rename, auth, remove each for multiple users
Test: 1) Set up work profile with shared challenge
      2) Lock out owner and work profile
      3) Unlock keyguard via password
      4) BiometricPromptDemo for work profile and owner have
         lockout reset
Change-Id: I71d33cccba40e0df09e0faa8a4d3973e77470b93
2020-06-19 14:49:10 -07:00
TreeHugger Robot
0f041ff67f Merge "Camera: Relax physical stream cropping behavior" into rvc-dev am: 08465447a2 am: 67d8e4ba14 am: 4fef74f41d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11457099

Change-Id: I497d4b68a631dd6d978d8acf64d157175cb72750
2020-06-19 21:44:25 +00:00
TreeHugger Robot
2f3a185397 Merge "Camera: Allow reprocessing session to configure physical streams" into rvc-dev am: 861a8178f9 am: a616d5d75f am: ad6498c556 am: 43f12c65c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11669678

Change-Id: Ie5c61b7da3113d35da67ad1203cd727ef2c941b5
2020-06-19 21:12:18 +00: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
43f12c65c2 Merge "Camera: Allow reprocessing session to configure physical streams" into rvc-dev am: 861a8178f9 am: a616d5d75f am: ad6498c556
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11669678

Change-Id: Ie3b0362cfbcf9dd2a70db0d15b29784865edcf44
2020-06-19 20:58:57 +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
TreeHugger Robot
c2f54dd7ea Merge "Camera: Fix race for onCaptureBufferLost callback (take 2)" into rvc-dev am: a2dbc3b3ee am: 00d630d449 am: b69e5095ef am: f053b9b12a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838748

Change-Id: I9de69a1c2122e62b25094ae51342c79abd8d3fbf
2020-06-18 23:08:02 +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
b69e5095ef Merge "Camera: Fix race for onCaptureBufferLost callback (take 2)" into rvc-dev am: a2dbc3b3ee am: 00d630d449
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838748

Change-Id: Ic6cc3ea9cb286c490734690a1329bb2c36c66ce9
2020-06-18 22:35:31 +00: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
688cc37408 Merge "Update biometric/keystore documentation" into rvc-dev am: 9cd814be2a am: 18dbde4e86 am: f7fac3c761 am: 19d5aad574
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11876678

Change-Id: If3befb2015c70e87b698221ea80c160c20394ed3
2020-06-17 02:52:29 +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
1225b9cb16 Merge changes from topic "clientmonitor-cleanup"
* changes:
  11/n: Remove unnecessary things from BiometricAuthenticator
  10/n: Split ClientMonitor functionality into appropriate subclasses
  9/n: Remove MetricsLogger and Constants from biometrics
  8/n: Move acquire message ignoring to face subclasses
  7/n: Move Fingerprint/Face AuthenticationClients to their own file
  6/n: Decouple remainder of lockout stuff
  5/n: Virtualize biometric performance stats
  4/n: Start moving fingerprint lockout to its own class
  3/n: Move internal cleanup to its own ClientMonitor subclass
  2/n: Clean up ClientMonitor
  1/n: Move modality-specific files into new subdirectory
2020-06-16 23:01:18 +00:00
Kevin Chyn
01ab00121b Update biometric/keystore documentation
Fixes: 158883515

Test: Builds
Change-Id: I22aa2345fcb05c2f43344398dd5357dc1874414a
2020-06-16 13:51:33 -07:00
Kevin Chyn
c2d34d4d12 11/n: Remove unnecessary things from BiometricAuthenticator
This interface was created before the existence of BiometricService.
Since the sensor registration, arbitration, etc all exist in
BiometricService layer, most of the things here can be removed and
split into separate classes.

Bug: 157790417
Test: Builds

Change-Id: I91ebc13959943b86b93d4fff46ee99050f2cb7bc
2020-06-16 13:45:24 -07:00
Charles Chen
8f6b6dffe7 Merge "Trust System UI owned display to receive keys" into rvc-dev am: 94deecfda2 am: d09b0f10bf am: 8fccd6e144 am: a7050e9667
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11570100

Change-Id: I6fcea62dffe51d3cbc522beb8e63e90ab27fb6d1
2020-06-16 14:56:54 +00:00
Charles Chen
a7050e9667 Merge "Trust System UI owned display to receive keys" into rvc-dev am: 94deecfda2 am: d09b0f10bf am: 8fccd6e144
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11570100

Change-Id: I75db01ccbe3e051b0fe21522efe771387632e31f
2020-06-16 14:37:56 +00: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
Eino-Ville Talvala
3efa9892a3 Camera: Add post-submit CTS tests for camera2 Java code
Test: atest :postsubmit runs CtsCameraTestCases
Bug: 158797957
Change-Id: I6bd0962357b376ba5b1efa8d4f2a5b598a86a6ba
2020-06-14 15:07:39 -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
037429a71a Merge changes Ibf4ecdb4,I1e4adf9f into rvc-dev am: 3917b729a6 am: 0cc8dbca10 am: e637e1212b am: ed1835f3b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11815381

Change-Id: I6827e6a7aa16ea1a21d79a2cf9c0a45f9fe85173
2020-06-10 20:03:59 +00:00
Ytai Ben-tsvi
ed1835f3b0 Merge changes Ibf4ecdb4,I1e4adf9f into rvc-dev am: 3917b729a6 am: 0cc8dbca10 am: e637e1212b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11815381

Change-Id: I46357e2d4872ef2346177be8df155fd91d22f26b
2020-06-10 19:48:05 +00: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
e0e12b18e2 Merge "Camera: clarify eviction behavior within the same application" into rvc-dev am: 8aa60f69e9 am: aa254d926e am: 422cf7af19 am: 733003e74a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11798679

Change-Id: I37e9d67601b2b4fbeef2434f226a5a61db44424e
2020-06-10 18:52:33 +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
01f6702064 Merge "Revert "Camera: Fix race for onCaptureBufferLost callback"" into rvc-dev am: a27465258a am: 7fbce095b3 am: 929d7d9b2e am: b2b6bd3154
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818440

Change-Id: I681b4aba2a250d585805532546f6cacb284727ee
2020-06-10 17:39:24 +00:00
TreeHugger Robot
b2b6bd3154 Merge "Revert "Camera: Fix race for onCaptureBufferLost callback"" into rvc-dev am: a27465258a am: 7fbce095b3 am: 929d7d9b2e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818440

Change-Id: I1a8db46ab0c7cd48d0d764fa36f04fcec7dd3f79
2020-06-10 17:21:07 +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