Commit Graph

3735 Commits

Author SHA1 Message Date
TreeHugger Robot
ae2e299142 Merge "Camera: Clarify SCALER_CROP_REGION usage" into rvc-dev am: 601e34fdd7 am: bf6e731010 am: f5c645e8a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12586676

Change-Id: Iad9a7e2ebc41345877c6f230c13f9ae818861826
2020-09-29 17:32:54 +00:00
TreeHugger Robot
f5c645e8a2 Merge "Camera: Clarify SCALER_CROP_REGION usage" into rvc-dev am: 601e34fdd7 am: bf6e731010
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12586676

Change-Id: I8a0f378dd8a8ff5709783edaba56a89e5253398d
2020-09-29 17:10:38 +00:00
TreeHugger Robot
bf6e731010 Merge "Camera: Clarify SCALER_CROP_REGION usage" into rvc-dev am: 601e34fdd7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12586676

Change-Id: I75a21c0eb76f5245776c1c3fb02711839118078e
2020-09-29 17:09:37 +00:00
Jayant Chowdhary
606a55e65f Merge changes I6de585de,Id0f9b5a9 am: c681633836 am: e563c30208 am: beb9c4fe58 am: db33922c54
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1438913

Change-Id: I1d17ce9ff6d4f2532c9f0bb11d23205408fbd425
2020-09-29 01:05:38 +00:00
Jayant Chowdhary
db33922c54 Merge changes I6de585de,Id0f9b5a9 am: c681633836 am: e563c30208 am: beb9c4fe58
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1438913

Change-Id: Ia65bd1446439b3816e2941fa12de39f7f8015025
2020-09-29 00:09:26 +00:00
Jayant Chowdhary
beb9c4fe58 Merge changes I6de585de,Id0f9b5a9 am: c681633836 am: e563c30208
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1438913

Change-Id: I328035ef7ef359993219baa263529960b38b5560
2020-09-28 23:48:29 +00:00
Jayant Chowdhary
47a455af03 camera2: Remove partial result nodes for error frames.
When there's an capture error reported for a frame, remove its nodes in
mPartialResults map node, since they'll not be used by clients of
FrameTracker. This should also reduce slow memory pressure build up
because of mPartialResult growth as and when there are error frames
which have some partial results as well.

Bug: 167944895

Test: GCA on Pixel2, constant mode changes don't show steady state increase in
      mPartialResults map size (Basic validity)

Change-Id: I6de585deb24039321310ddbd5dccd9119b25b23d
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
(cherry picked from commit 91e64e2d3a)
2020-09-25 19:23:34 +00:00
Jayant Chowdhary
9fa99145a9 camera2: Improve code readability for FrameNumberTracker.
Bug: 168713666

Test: builds
Test: GCA (basic validity)

Change-Id: Id0f9b5a9a6363f40daa9384ee5f01b47d36ad139
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
(cherry picked from commit 91f7bc0b3b)
2020-09-25 19:14:19 +00:00
Treehugger Robot
cec2a6d20f Merge "Fix setType() return value for high angle sensor" am: 5a2d80de45 am: 89d18e94e4 am: 1e97e64bf2 am: a57b4b75c5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1436893

Change-Id: I4a6974cab2f97b5c9f2a550c99857788592f3db1
2020-09-25 05:24:31 +00:00
Treehugger Robot
a57b4b75c5 Merge "Fix setType() return value for high angle sensor" am: 5a2d80de45 am: 89d18e94e4 am: 1e97e64bf2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1436893

Change-Id: If7aabccc5c08ec1d6e640a0b3361abaf96346f59
2020-09-24 21:52:53 +00:00
Treehugger Robot
1e97e64bf2 Merge "Fix setType() return value for high angle sensor" am: 5a2d80de45 am: 89d18e94e4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1436893

Change-Id: I5d4a833884e9c732b9f96cd0ca6f72a889b89254
2020-09-24 21:24:53 +00:00
Wang Han
fcf671890f Fix setType() return value for high angle sensor
Change-Id: I712fd77f8079fc17c45dcbc1c2fdf1be72d338f2
2020-09-24 13:16:18 +00:00
Shuzhen Wang
477c23ed89 Camera: Clarify SCALER_CROP_REGION usage
1. Document same SCALER_CROP_REGION may map to different aspect
ratio/output size for different sessions.
2. Remove the text in ZOOM_RATIO about using SCALER_CROP to change
aspect ratio.

Test: Build and read docs
Bug: 168493526
Change-Id: I405fe52d0e0a14e6a1cfbec169d33f20715fa4fb
2020-09-16 11:53:38 -07:00
Jeff Sharkey
487d394296 Merge changes from topic "sep11" am: c0b288133a am: 69e6f07347 am: 741c0a78cc am: da7478b570
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426195

Change-Id: I79488866c538bf9e76d0a6429e30262978f6fdab
2020-09-15 00:13:08 +00:00
Jeff Sharkey
da7478b570 Merge changes from topic "sep11" am: c0b288133a am: 69e6f07347 am: 741c0a78cc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426195

Change-Id: I9b79dbf3e9983523db11599d8ae289b05aabf80c
2020-09-14 23:42:34 +00:00
Jeff Sharkey
741c0a78cc Merge changes from topic "sep11" am: c0b288133a am: 69e6f07347
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426195

Change-Id: I7da537200efe31e803234bd1a0236843064186c8
2020-09-14 23:10:42 +00:00
Jeff Sharkey
705f6bec2d Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference

Test: none
Bug: 168334533
Exempt-From-Owner-Approval: docs updates
Change-Id: I53003332717baf57dc088b2f6b969cdb1863f65e
2020-09-14 09:59:01 -06:00
Santos Cordon
64bff5c814 Merge "Allow Power-button to temporarily ignore proximity sensor." into rvc-d1-dev am: fdc35a2491 am: 69603f319e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12282513

Change-Id: Ic968b220382b9b9e6bd919e55b63f92072bd3e02
2020-08-07 09:56:32 +00:00
Santos Cordon
69603f319e Merge "Allow Power-button to temporarily ignore proximity sensor." into rvc-d1-dev am: fdc35a2491
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12282513

Change-Id: I4913d33ac3e20e97ebdc524189e40f772f4dbbe3
2020-08-07 09:46:31 +00:00
Santos Cordon
31c24e048f Allow Power-button to temporarily ignore proximity sensor.
If a device has an active proximity wakelocks while proximity
is in the "near" state, a press of the power button will temporarily
ignore proximity sensor allowing the screen to turn back on.
It will stop being ignored where there is a change to the
proximity sensor state.

Bug: 162443904
Test: atest PowerManagerServiceTests, atest DisplayManagerTests
Change-Id: I2656cca3e643e278cd5e5fedc2d74d9cbca82c2b
2020-08-03 16:26:51 +00:00
TreeHugger Robot
01b5557a64 Merge "Update mandatory concurrent stream docs to specify support for lower resolutions." into rvc-dev am: 83578eaa95 am: 8d514c97e4 am: efe49adcec
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12230970

Change-Id: Ib5a05b8f8071437badb2f58fe97cf72c57a1056c
2020-07-28 02:34:05 +00:00
TreeHugger Robot
efe49adcec Merge "Update mandatory concurrent stream docs to specify support for lower resolutions." into rvc-dev am: 83578eaa95 am: 8d514c97e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12230970

Change-Id: Ic36c15cc74651f8c5b55d1ce57f79ec3baa6126f
2020-07-28 02:20:56 +00:00
TreeHugger Robot
7118a40917 Merge "Update mandatory concurrent stream docs to specify support for lower resolutions." into rvc-dev am: 83578eaa95
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12230970

Change-Id: Iaceb8a0974fcc4cf562a7046423019fc816ce07a
2020-07-28 02:07:53 +00:00
TreeHugger Robot
83578eaa95 Merge "Update mandatory concurrent stream docs to specify support for lower resolutions." into rvc-dev 2020-07-28 01:47:32 +00:00
Jayant Chowdhary
d537ce04fb Update mandatory concurrent stream docs to specify support for lower resolutions.
Bug: 162110784

Test: make doc-comment-check-docs

Change-Id: I8a2677df320f8f496b185fd80234f04dd9eed97f
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2020-07-27 17:18:12 -07:00
Kevin Chyn
91d593209e Merge changes I9ded8efd,Ic26e47c1 into rvc-qpr-dev am: 09ba528a9d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12166802

Change-Id: I0c18e32b9258e2c0a9e42b4cd2bfae1b718a736e
2020-07-16 19:09:12 +00:00
Kevin Chyn
d24084e95a Update authentication when encrypted or lockout
Fingerprint authentication should not expose accept/reject/lockout
when the user is encrypted or locked out. This is possible with
IBiometricsFingerprint@2.1 since lockout is controlled by the framework.

IBiometricsFace@1.0 does not support this since lockout is controlled
in the HAL (or lower).

Bug: 79776455

Test: On fingerprint device, during encrypted or lockdown, any finger
      works, lockout never occurs
Test: BiometricPromptDemo, normal path is run (e.g. incorrect fingers
      are rejected)
Test: Test no effect on face device
Test: atest KeyguardUpdateMonitorTest

Change-Id: I9ded8efd80d4f8b92ce054262e721853703c6437
Merged-In: I6c9717d1f8ed3e844b3d92727396e2ce2e7fd94f
2020-07-15 21:59:10 -07:00
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