Commit Graph

5724 Commits

Author SHA1 Message Date
Cole Faust
247456d9e9 Merge "[conflict] Merge "Fix array-related errorprone warnings" am: a1eb8cf128 am: 44f8576073 am: 91d6c5b564 am: 6a79ae2567 am: 9b3a5fc03b" 2022-08-31 04:03:46 +00:00
Cole Faust
9acf46f66f [conflict] Merge "Fix array-related errorprone warnings" am: a1eb8cf128 am: 44f8576073 am: 91d6c5b564 am: 6a79ae2567 am: 9b3a5fc03b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2186016

Change-Id: I5e59b8549df348c181cd3b72311798a5d7602a67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 21:03:54 +00:00
Cole Faust
9b3a5fc03b Merge "Fix array-related errorprone warnings" am: a1eb8cf128 am: 44f8576073 am: 91d6c5b564 am: 6a79ae2567
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2186016

Change-Id: I7052a1f7391ed6701fe0e1036c27368609032e35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 20:44:00 +00:00
Cole Faust
6a79ae2567 Merge "Fix array-related errorprone warnings" am: a1eb8cf128 am: 44f8576073 am: 91d6c5b564
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2186016

Change-Id: I931e692e6d170d19a7492e44cc1333c10e96c897
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 20:00:09 +00:00
Joe Bolinger
95289da7cb Move ALS auth logging triggers to wakefullness events.
These were orignally tied to pointer up/down events, but change I4a217ef4a068c8b2cae0f345856912028f9a9525 removed these events entirely on many devices and left these triggers unreliable.

Bug: 243836005
Test: atest FingerprintAuthenticationClientTest BiometricContextProviderTest AuthControllerTest
Test: manual (verify on lockscreen via adb shell dumpsys sensorservice | grep -i Biometric)
Change-Id: I2db34ca561850eb1eddcc65c08c617a46dd3d845
2022-08-30 18:28:41 +00:00
Cole Faust
584140c83a Fix array-related errorprone warnings
The ArrayEquals, ArrayHashCode, ArrayToString, and
ArraysAsListPrimitiveArray errorprone findings were
demoted from errors to warnings. Fix existing
occurrences of them so they can be made errors again.

Bug: 242630963
Test: RUN_ERROR_PRONE=true m javac-check
Change-Id: Ia6f216cc36ad0a5758f39fd9b34962cd4adf9d8e
2022-08-25 10:57:12 -07:00
Joe Bolinger
9edabde2ee Merge "Revert "Revert "Copy startup & callback mechanism from fingerprint to face service.""" 2022-08-23 16:39:17 +00:00
Joe Bolinger
cbea2975d3 Revert "Revert "Copy startup & callback mechanism from fingerprint to face service.""
This reverts commit 8f5bb9d31c with a fix for change to the singleProvider method caused some tests on virtual devices to fail.

Refactors some fingerprint-only logic into a shared module so the face service can apply the same start & callback model. This will enable some keyguard optimizations for face auth that were previously made for fingerprint.

Bug: 221037350
Test: atest KeyguardUpdateMonitorTest AuthControllerTest DozeSensorsTest LockIconViewControllerTest FaceServiceRegistryTest FingerprintServiceRegistryTest BiometricStateCallbackTest
Test: manual (via BP test app)

Change-Id: I365c11858d8fbba74fad350932f3c7ae25c297fd
2022-08-20 00:53:27 +00:00
TreeHugger Robot
ec12c0742d Merge "Remove SoundTriggerMiddleware death notification" into tm-qpr-dev am: ee9494914b am: 6f988c39c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19668917

Change-Id: I890054a55f8a8a1b630b44219567c0539bc09c0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-19 20:45:56 +00:00
TreeHugger Robot
6f988c39c5 Merge "Remove SoundTriggerMiddleware death notification" into tm-qpr-dev am: ee9494914b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19668917

Change-Id: I16b18ee3086f1d249da3f490bef7899a2e81a5f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-19 20:42:23 +00:00
John Reck
bb756097dd Merge "HardwareBuffer API cleanups" 2022-08-19 19:06:02 +00:00
Atneya Nair
e6ac0c57d7 Remove SoundTriggerMiddleware death notification
The death notifier for the middleware service is unnecessary
- We don't use mService elsewhere (nor check its nullity)
- We re-query the service upon each call

Additionally, creating a new death notifier on each query is redundant,
and results in memory leaks (since each notifier takes state, and we
never unlink to death).

Test: Compiles
Bug: 237968209
Change-Id: Ib53ec65235d4284357e0f6649bb6f65b2de83b99
2022-08-18 18:04:07 +00:00
Joe Bolinger
64fce1104d Merge "Revert "Copy startup & callback mechanism from fingerprint to face service."" 2022-08-17 18:29:32 +00:00
Joe Bolinger
8f5bb9d31c Revert "Copy startup & callback mechanism from fingerprint to face service."
This reverts commit 294f4a1e79.

Reason for revert: b/242845336 (a few cts tests seem to pass on device locally but fail on cf postsubmit)

Change-Id: Icf36d403f96fc7a24d5191e7f43f43354a32b54f
2022-08-17 18:16:40 +00:00
Joe Bolinger
f87c0d1017 Merge "Copy startup & callback mechanism from fingerprint to face service." 2022-08-15 17:54:53 +00:00
Joe Bolinger
294f4a1e79 Copy startup & callback mechanism from fingerprint to face service.
Refactors some fingerprint-only logic into a shared module so the face service can apply the same start & callback model. This will enable some keyguard optimizations for face auth that were previously made for fingerprint.

Bug: 221037350
Test: atest KeyguardUpdateMonitorTest AuthControllerTest DozeSensorsTest LockIconViewControllerTest FaceServiceRegistryTest FingerprintServiceRegistryTest BiometricStateCallbackTest
Test: manual (via BP test app)
Change-Id: I88a489ef0eaf9a9e5645e5e6f9b9381187b25fab
2022-08-12 22:59:22 +00:00
John Reck
95d3e7b9a3 HardwareBuffer API cleanups
Add getId()
Remove invalid format check
Unify ISE throwing

Fixes: 241943759
Test: atest android.hardware.cts.HardwareBufferTest

Change-Id: I656c30365a2fbf826193c7a398b03e61102c625f
2022-08-12 12:08:17 -04:00
Chavi Weingarten
619dfd599a Merge "Use layer mirroring when screen recording via VD" 2022-08-10 21:58:58 +00:00
Jayant Chowdhary
68b009b02b Merge "Fix spacing for preview stabilization mandatory streams docs." into tm-qpr-dev am: 23ac6aceca am: 4bcb7914b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19572800

Change-Id: Iaf16a291dc42d40257a8a8d872460c66ce3d252b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-10 18:08:54 +00:00
Jayant Chowdhary
4bcb7914b8 Merge "Fix spacing for preview stabilization mandatory streams docs." into tm-qpr-dev am: 23ac6aceca
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19572800

Change-Id: Ibe4864a2f0b239f0ff8d3d642dbe5da01bfb0186
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-10 17:42:54 +00:00
Jayant Chowdhary
b723541a6e Fix spacing for preview stabilization mandatory streams docs.
Bug: 237717894

Test: Check output of make doc-comment-check-docs

Change-Id: Ia389f18746fd6c4c534a87ae6ad89261bdd8cc3a
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2022-08-10 00:10:37 +00:00
Chavi Weingarten
e64bae455e Use layer mirroring when screen recording via VD
When a Display has the flag VIRTUAL_DISPLAY_FLAG_AUTO_MIRROR, the
content on the display is expected to mirror another display. This was
previously done by setting the same layerStack. This change removes that
behavior and instead will create a mirror hierarchy of the other display
and place it at the root of the new Display. This is leveraging the work
done for ContentRecorder, but using it as default for all displays
instead of only for VD created by MediaProjection.

Test: Screen record via MediaProjection
Test: Screen record via DisplayManager
Test: ContentRecorderTests
Test: DisplayContentTests
Bug: 237664947
Change-Id: I18b36dadc43ba1c37f9516ff10d24bb8683c04ac
2022-08-09 16:45:56 +00:00
rockyfang
cc16eef601 Synchronized setClientProxy and callbackFinished to prevent NPE
During the gap between createClient and setClientProxy that sets up
mClientProxy, another thread callbackFinished on mClientProxy that will
causes NPE, this CL wait until mClientProxy is created then allow
callbackFinished to be called

Test: Added Thread.sleep(7000) to expand the gap between
mService.createClient and client.setClientProxy to expand the chance of creating race condition NPE then run PtsChreTestCases and passed (ab/I55000010077218265)
Fixes: 240691175
Change-Id: I8a729abf9f4368eab51c886a20035ccf879d9eff
2022-08-05 18:31:12 +00:00
TreeHugger Robot
2d3ab8bd84 Merge "Camera: Avoid NPE when extension results are not supported" into tm-d1-dev am: 8f42b2f8d6 am: 5c002a64a5 am: 3d698aabaa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19451689

Change-Id: I3d36b6323c6434f0ad0351a7026c8b4b51568b67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 18:03:39 +00:00
TreeHugger Robot
3d698aabaa Merge "Camera: Avoid NPE when extension results are not supported" into tm-d1-dev am: 8f42b2f8d6 am: 5c002a64a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19451689

Change-Id: I980d941daf2be5aef08b9695e993dbb76edffc3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 17:59:25 +00:00
TreeHugger Robot
5c002a64a5 Merge "Camera: Avoid NPE when extension results are not supported" into tm-d1-dev am: 8f42b2f8d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19451689

Change-Id: I7d641cea03f9f35889d0ebdcf66e9bf7a0f35609
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 17:51:59 +00:00
TreeHugger Robot
13dd5971c4 Merge "Camera: Avoid NPE when extension results are not supported" into tm-d1-dev am: 8f42b2f8d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19451689

Change-Id: Ie2118964e3072a9c3cf7b45a296b1aa4674084af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 17:51:57 +00:00
Bharatt Kukreja
563b92d6c6 Merge "Fix MandatoryStreamCombinations for ultra high resolution sensors" 2022-07-28 14:22:53 +00:00
Emilian Peev
671d613bcb Camera: Avoid NPE when extension results are not supported
Bug: 240017175
Test: atest -c -d cts/tests/camera/src/android/hardware/camera2/cts/CameraExtensionSessionTest.java#testRepeatingAndCaptureCombined
Change-Id: I0b82039a103ac2a55f71a6aea505d7c7c696d7be
2022-07-27 22:46:59 +00:00
Rucha Katakwar
656bb29f56 Merge "Update torch brightness max level description." into tm-d1-dev am: 7cdfd75b02 am: 77f3fe5709 am: 81d5ed723b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19386567

Change-Id: Ib0197be19c70ff8e6ffa6b016883a9da1b3ae7ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-27 19:44:48 +00:00
Rucha Katakwar
81d5ed723b Merge "Update torch brightness max level description." into tm-d1-dev am: 7cdfd75b02 am: 77f3fe5709
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19386567

Change-Id: I8cc7c95e80e21ad68847b749dd9f0b0d36bbf27b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-27 19:00:10 +00:00
Rucha Katakwar
ff800ef92c Merge "Update torch brightness max level description." into tm-d1-dev am: 7cdfd75b02
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19386567

Change-Id: Icf0a904563a9267e19c8efdc15bae4e29e39e392
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-27 18:37:46 +00:00
Rucha Katakwar
77f3fe5709 Merge "Update torch brightness max level description." into tm-d1-dev am: 7cdfd75b02
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19386567

Change-Id: Idc09acf8b2b185f873b45b7bad70e0a32fab5ac3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-27 18:37:45 +00:00
Rucha Katakwar
7cdfd75b02 Merge "Update torch brightness max level description." into tm-d1-dev 2022-07-27 18:14:04 +00:00
Joshua Mccloskey
315f6f124d Merge "SideFPS UX updates" into tm-qpr-dev am: 2ff2a64cfe
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19039844

Change-Id: I0e5645ff7a507ebd9c8c29f347ed6e45f3f365d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-26 20:56:14 +00:00
Joshua Mccloskey
2ff2a64cfe Merge "SideFPS UX updates" into tm-qpr-dev 2022-07-26 20:34:50 +00:00
Jayant Chowdhary
9623f2520a Merge "camera2: update original ByteBuffer using bulk get on 'viewed' ByteBuffer for correct position" into tm-d1-dev am: 138fc75ad4 am: 8023620746 am: aaee5102db
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19354614

Change-Id: I3ff06d72705ae3852dae3e67d3e589d364a90624
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 21:31:30 +00:00
Jayant Chowdhary
aaee5102db Merge "camera2: update original ByteBuffer using bulk get on 'viewed' ByteBuffer for correct position" into tm-d1-dev am: 138fc75ad4 am: 8023620746
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19354614

Change-Id: I89cabe4d6c8c7afe2695d46f7f8dafc800497dc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 21:13:50 +00:00
Jayant Chowdhary
ffa107144c Merge "camera2: update original ByteBuffer using bulk get on 'viewed' ByteBuffer for correct position" into tm-d1-dev am: 138fc75ad4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19354614

Change-Id: Id23aedd82c4e04300d79eec2c1a790cde30b417d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 21:06:36 +00:00
Jayant Chowdhary
8023620746 Merge "camera2: update original ByteBuffer using bulk get on 'viewed' ByteBuffer for correct position" into tm-d1-dev am: 138fc75ad4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19354614

Change-Id: Iaf4d48ea9d31b053f78f788e0f651b7ba1c5c8bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 21:06:35 +00:00
Rucha Katakwar
851d5cf44b Update torch brightness max level description.
Bug: 239492786
Change-Id: I9514a3d137a64f99e3c5c03d1843b53ace0cbf3a
2022-07-21 14:03:50 -07:00
Jayant Chowdhary
138fc75ad4 Merge "camera2: update original ByteBuffer using bulk get on 'viewed' ByteBuffer for correct position" into tm-d1-dev 2022-07-21 20:41:45 +00:00
Rucha Katakwar
0a3aded9d5 Merge "Update torch brightness max level description." into tm-d1-dev am: 88949ab1fc am: 7095b9c34d am: e4d719e90f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19340523

Change-Id: Ic031be67b28cb97c5ea0a414fe8a9fd8ed81aa3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 02:36:29 +00:00
Rucha Katakwar
e4d719e90f Merge "Update torch brightness max level description." into tm-d1-dev am: 88949ab1fc am: 7095b9c34d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19340523

Change-Id: Id0e9868bfd839ed5ee5768556c659f1c287b3067
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 00:03:58 +00:00
Rucha Katakwar
7095b9c34d Merge "Update torch brightness max level description." into tm-d1-dev am: 88949ab1fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19340523

Change-Id: I6c31a737c549916c5f81f45191f9949367f60eef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 23:47:48 +00:00
Rucha Katakwar
727b4386db Merge "Update torch brightness max level description." into tm-d1-dev am: 88949ab1fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19340523

Change-Id: Id2ddfe491e9f75e9f2e1818bf48f26e369234e63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 23:47:39 +00:00
Jayant Chowdhary
cff610bf0e camera2: update original ByteBuffer using bulk get on 'viewed' ByteBuffer for correct position
When we use any of the viewed methods from ByteBuffer such as
asFloatBuffer, the returned buffer's position and the original
ByteBuffer's positions are independent. So update the original
ByteBuffer's position as well, for correct accounting.

Bug: 239639757

Test: Camera CTS; GCA
Test: MarshalQueryableArray error logs don't appear in logcat while using GCA

Change-Id: I488a23c278ee5d044c2423a616e598a93cbbad0b
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2022-07-20 18:33:45 +00:00
Joshua McCloskey
2987c8b264 SideFPS UX updates
1. Added side fps auth delay on device entry/biometric
prompt to wait for power press.
2. Added tap to dismiss dialog for side fps enrollment.

Test: atest SideFpsEventHandlerTest
Bug: 233953696
Change-Id: I1b8a63cc76cdb5d8e46206ba1bee8fc3246a8cdc
Merged-In: I1b8a63cc76cdb5d8e46206ba1bee8fc3246a8cdc
2022-07-20 17:02:29 +00:00
Joshua Mccloskey
00c545be97 Merge "SideFPS UX updates" 2022-07-20 17:01:57 +00:00
Rucha Katakwar
a5bd39561a Update torch brightness max level description.
Bug: 239492786
Change-Id: I01720f2d25b932d58fa8b7816f8504101d70f3a3
2022-07-19 16:50:25 -07:00