Commit Graph

4797 Commits

Author SHA1 Message Date
Kenneth Ford
bbf1f135eb Merge "Notifies correct device state callback on cancellation" into sc-v2-dev am: 34873949e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16232865

Change-Id: I7f5cdb7f63f68456ed9c05d239ac06a2a6bc6171
2021-11-16 22:57:14 +00:00
Kenneth Ford
3ad9ba7351 Notifies correct device state callback on cancellation
Previously was calling onRequestSuspended for cancellation notifications

Bug: 205886628
Test: DeviceStateManagerGlobalTest
Change-Id: I63e44f5c9a7a333ce9ba5bffe8e103834d9f468d
2021-11-16 20:40:14 +00:00
Joshua Mccloskey
0e1abac54b Merge "Add ignoreEnrollmentState to prompt info" into sc-v2-dev am: c9786ca681
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16185143

Change-Id: I137effa0f4029d227be5503725d68e0b99940a53
2021-11-10 18:23:02 +00:00
Joshua Mccloskey
c9786ca681 Merge "Add ignoreEnrollmentState to prompt info" into sc-v2-dev 2021-11-10 18:09:27 +00:00
Joshua Mccloskey
288f4b5784 Add ignoreEnrollmentState to prompt info
Test: Verified with a seperate APK that the API works as expected.
Bug: 201205443
Change-Id: Ic933b850a4230caf8811fd1029b52bd9a161d615
2021-11-09 11:04:07 -08:00
Joe Bolinger
865968ceee Merge "Do not show side fingerprint sensor overlay when used from settings." into sc-v2-dev am: ddbd84f4d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16168831

Change-Id: I7961208c28032ed5fd4bd34b4045e4a4a9c9bc62
2021-11-08 18:31:43 +00:00
Joe Bolinger
7f6ff9092f Do not show side fingerprint sensor overlay when used from settings.
This is an alternative to ag/16124814 with the additional fix for udfps.

Fix: 203789357
Test: atest SidefpsControllerTest
Test: manual (open settings and verify no overlay shown with list of fingerprint)
Test: manual (open settings and verify overlay shown during enrollment)

Change-Id: Iee33cbb66d86d4f033d6acc9cf2284a3845f22de
2021-11-06 00:14:00 +00:00
Lucas Dupin
790a3cfd86 Merge "Revert "Do not show side fingerprint sensor overlay when used from settings."" into sc-v2-dev am: 7f1538b282
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16147469

Change-Id: Iefd5b3ac9e50a3e60ae173163db1841743a1d06c
2021-10-29 22:36:20 +00:00
Lucas Dupin
51e71dc946 Revert "Do not show side fingerprint sensor overlay when used from settings."
This reverts commit 42004250c2.

Reason for revert: b/204524711 

Change-Id: I57ff00e30e72852a4eb894d3302730616a22ae8e
2021-10-29 18:00:28 +00:00
Joe Bolinger
06844dd241 Merge "Do not show side fingerprint sensor overlay when used from settings." into sc-v2-dev am: b9c6536a63
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16124814

Change-Id: Ib495d79272cb375478a6cce1c5182289c440a9a1
2021-10-26 23:47:20 +00:00
Joe Bolinger
42004250c2 Do not show side fingerprint sensor overlay when used from settings.
Fix: 203789357
Test: atest SidefpsControllerTest
Change-Id: I2b0bb3b38edeeec08e93706784b0a53bd77d32a3
2021-10-26 13:10:36 -07:00
TreeHugger Robot
ac0da15643 Merge "Update DozeSensors and DozeBrightnessSensor on posture changes" into sc-v2-dev am: 22314d89a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15983468

Change-Id: I2513907077181517855ec80de4dad9e53ade562a
2021-10-18 20:18:02 +00:00
Beverly
1905cf9110 Update DozeSensors and DozeBrightnessSensor on posture changes
If the posture changes while AOD is running, make sure
sensors are unregistered + registered properly.

Test: manual, enable AOD and then close/open and check that
correct sensors are registered (dumpsys sensorservice)
Test: atest DozeScreenBrightnessTest DozeSensorsTest
Fixes: 192805135
Fixes: 199344667

Change-Id: I5093dc43e062144adca757c94fa708f51be57a44
2021-10-18 11:19:55 -04:00
Emilian Peev
24a011273a Merge "Camera: Handle ISE when device state manager is absent" into sc-v2-dev am: a8a33c88f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16034842

Change-Id: Id89389ee1e346c6ea994331f233f73de17ae968c
2021-10-13 22:56:43 +00:00
Emilian Peev
bd25a442f1 Merge "Camera: Rename DeviceStateOrientationMap" into sc-v2-dev am: cd056ddbb8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16042088

Change-Id: I8269adbd3cc7542199ad27718bc46a311d57709e
2021-10-13 22:55:55 +00:00
Emilian Peev
a8a33c88f2 Merge "Camera: Handle ISE when device state manager is absent" into sc-v2-dev 2021-10-13 22:42:18 +00:00
Emilian Peev
47cae0f093 Camera: Handle ISE when device state manager is absent
The device state manager doesn't seem to be present on all
devices.
Catch any ISEs and handle this corner case appropriately.

Bug: 202597641
Test: atest
CtsGraphicsTestCases:android.graphics.cts.CameraVulkanGpuTest#testCameraImportAndRendering
-- --module-parameter instant_app

Change-Id: I6e6c7266b268835f3138cbb22a6f2df606742300
2021-10-12 22:25:19 +00:00
Emilian Peev
1a1461e5ae Camera: Rename DeviceStateOrientationMap
Use "DeviceStateSensorOrientationMap" to avoid possible
association with other common orientation states such as
Portrait and Landscape.

Bug: 202832229
Test: atest -c
cts/tests/camera/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java#testDeviceStateSensorOrientationMapCharacteristics
Change-Id: I6fc9d452f0bb4099389e30d0404e1c6c20dff8ff

Change-Id: Icde1a8eb25b15b237812f583de8f7a46b6576772
2021-10-12 14:01:30 -07:00
Eino-Ville Talvala
7e42bd2aa6 Merge "Camera: Fix wrong wasImageCaptured flag" into sc-qpr1-dev am: 0f6c1c9d24 am: 19e0a03336
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16009383

Change-Id: I99e37cce37f48e1538f7aed0bb34c7d0e667ae2b
2021-10-08 20:38:23 +00:00
Eino-Ville Talvala
19e0a03336 Merge "Camera: Fix wrong wasImageCaptured flag" into sc-qpr1-dev am: 0f6c1c9d24
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16009383

Change-Id: I63a7faa7932142e8e54b6e8db6d95c121c517866
2021-10-08 20:26:19 +00:00
Eino-Ville Talvala
fed7243e56 Merge "Camera: Fix wrong wasImageCaptured flag" into sc-qpr1-dev am: 0f6c1c9d24
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16009383

Change-Id: I086f7400f1a7faba2eacb6e05c61a927ef768ce9
2021-10-08 20:26:18 +00:00
TreeHugger Robot
be9e53d16d Merge "Camera: Avoid possible deadlock when closing advanced extension session" into sc-qpr1-dev am: 00c890cda7 am: 2d7bc584fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15976219

Change-Id: I7ea248df07a0720cdbce7314a2ae2c841019499a
2021-10-08 20:20:23 +00:00
Eino-Ville Talvala
0f6c1c9d24 Merge "Camera: Fix wrong wasImageCaptured flag" into sc-qpr1-dev 2021-10-08 20:10:28 +00:00
TreeHugger Robot
86d2205d1d Merge "Camera: Avoid possible deadlock when closing advanced extension session" into sc-qpr1-dev am: 00c890cda7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15976219

Change-Id: I7ed63423fb9d1c6a58d52bb6a62d6716c6f5db84
2021-10-08 20:05:08 +00:00
TreeHugger Robot
2d7bc584fc Merge "Camera: Avoid possible deadlock when closing advanced extension session" into sc-qpr1-dev am: 00c890cda7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15976219

Change-Id: Ie77645540b5cd01e6fa44316111bc364078baaad
2021-10-08 20:05:06 +00:00
TreeHugger Robot
00c890cda7 Merge "Camera: Avoid possible deadlock when closing advanced extension session" into sc-qpr1-dev 2021-10-08 19:49:12 +00:00
Emilian Peev
dd55b3dee5 Camera: Avoid possible deadlock when closing advanced extension session
The advanced extension session request processor must not hold the
'mInterfaceLock' when calling the camera device implementation as it
could result in a deadlock with the camera device close that can
run at the same time and try to acquire the same locks in reverse order.
The request processor will only read from 'mCameraConfigMap' which is
initialized only once during session setup and will not change during
the session lifetime.
A sample stack trace will look like this:
Service thread:
1) android.hardware.camera2.impl.CameraCaptureSessionImpl.stopRepeating
2) android.hardware.camera2.impl.CameraAdvancedExtensionSessionImpl$RequestProcessor.stopRepeating

Client thread:
1) android.hardware.camera2.impl.CameraAdvancedExtensionSessionImpl.release
2) android.hardware.camera2.impl.CameraDeviceImpl.close


Bug: 202074988
Test: Manual using application,
Camera CTS

Change-Id: If992667a7d7e54be5bea1fcc4b1d71ec1b895ca0
2021-10-08 19:48:12 +00:00
Shuzhen Wang
8af9bbaeed Camera: Fix wrong wasImageCaptured flag
CaptureFailure is created with a "dropped" parameter. But what's passed
in is mayHaveBuffers, which is opposite of "dropped".

Test: Camera CTS, GoogleCamera
Bug: 201967385
Change-Id: I42eb2daa78f116502cb1c5943015ea3f4af3f1e3
2021-10-08 16:26:14 +00:00
Emilian Peev
0dcd217eaa Merge "Camera: Keep sensor orientation consistent with device fold state" into sc-v2-dev am: 01d8df412d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15908724

Change-Id: Ied80bf349069fb87229a1d36b59efd0afff95661
2021-10-07 23:00:01 +00:00
Emilian Peev
01d8df412d Merge "Camera: Keep sensor orientation consistent with device fold state" into sc-v2-dev 2021-10-07 22:53:24 +00:00
Emilian Peev
2bf82bbfef Camera: Keep sensor orientation consistent with device fold state
Allow foldable devices to advertise the mapping between device fold
state and sensor orientation.
Additionally return the current  sensor orientation
based on the specific device fold state.

Bug: 201005727
Test: Manual using AOSP Camera2 application,
Camera CTS

Change-Id: Idc76903da22567d29cc55d991b41df7e19490aa3
2021-10-07 11:29:21 -07:00
Daniel Solomon
c3735de7c9 Merge changes from topic "b200851199" into sc-qpr1-dev am: 250448c0bc am: 7cd1097495
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15909960

Change-Id: Ie5393d91eff5e54551dbcacb7293e4f05f3da8e6
2021-10-05 23:14:00 +00:00
Daniel Solomon
4ec2eb536b Merge changes from topic "b200851199" into sc-qpr1-dev am: 250448c0bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15909960

Change-Id: Icaa01be38637089e703e322e083a52a97dddd771
2021-10-05 23:01:16 +00:00
Daniel Solomon
7cd1097495 Merge changes from topic "b200851199" into sc-qpr1-dev am: 250448c0bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15909960

Change-Id: Ifd26b07f419a1a810415373348728b570bd32737
2021-10-05 23:00:43 +00:00
Beverly Tai
e699184157 Merge "Add posture support for prox sensor" into sc-v2-dev am: 37001f99b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934626

Change-Id: Ia33e7d89ef1ecacfe80b1db05296a2720e09c68f
2021-10-05 18:49:10 +00:00
Beverly
e4a1d0e422 Add posture support for prox sensor
Some postures don't need to register for a prox sensor

Test: manual, atest PostureDependentProximitySensorTest
Bug: 192805135
Change-Id: I5c5fbed6d3faff6ba690f67f592bb0b8082062d5
2021-10-05 15:57:16 +00:00
Daniel Solomon
13d3dffa66 Make DisplayModeDirector aware of whether HBM is active
Currently DisplayModeDirector casts Vote.PRIORITY_HIGH_BRIGHTNESS_MODE
based on whether High Brightness Mode (HBM) is allowed, rather than
based on whether HBM is actually active. This can lead to cases where
the HBM refresh rate vote is cast when HBM is allowed but not actually
used.

This change corrects this behavior, and makes DisplayModeDirector check
that HBM is both allowed (enabled) and actually in use (active).

Bug: 200851199
Test: atest DisplayModeDirectorTest
    BrightnessLevelPreferenceControllerTest
    HighBrightnessModeControllerTest
Change-Id: I8cb8f023a6bca11de976866259032143f43d9a4f
2021-10-03 16:59:21 -07:00
TreeHugger Robot
fa69d14957 Merge changes from topic "dozeTapGesture_dualDisplaySupport" into sc-v2-dev am: a2fb749631
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15933708

Change-Id: I04fe2f8e46237e9b66b52960a271e9df027a80e6
2021-10-01 17:12:29 +00:00
Daniel Solomon
a49b90befe Change DisplayModeDirector's brightness source to DisplayListener
Currently, DisplayModeDirector listens to brightness changes from Settings.
However, brightness value in Settings is overridden for various reasons
inside DisplayPowerController before being propagated to HALs. As a
result, the brightness value that DisplayModeDirector is acting on isn't
always the brightness value that gets applied to the display.

This change,
- Changes DisplayPowerController so that the final brightness value (after all
modifications) is saved.
- Changes DisplayModeDirector to use DisplayManager.DisplayListener to
observe brightness changes and then retrieve and act on the final
brightness value saved in DisplayPowerController.

Bug: 199955532
Test: atest DisplayModeDirectorTest
Change-Id: Ia6dd7d194b6913d2942bea9c29a2011b8058beef
2021-09-30 17:18:03 -07:00
Beverly
541b6f8ea4 Add dual-display support for aod brightness sensor
Depending on the posture, SystemUI can register for
different brightness sensors on AOD.

Test: manual, atest DozeSensorsTest
Bug: 192805135
Change-Id: I85e458623ae9cf868af80e0c02154fb0be11c615
2021-09-30 21:01:13 +00:00
Beverly
c8d3d1adf7 Add support dual display support doze tap gesture
Test: manual, atest DozeSensorsTest
Bug: 192805135
Change-Id: I08a98bf16753631afd31cb750c541c7443df1b9e
2021-09-30 10:21:06 -04:00
TreeHugger Robot
7df70492f8 Merge "Separate refresh rate restrictions for different High Brightness Modes" into sc-qpr1-dev am: af5c64f76f am: ac548fb61e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15937366

Change-Id: Idf0e29dc923174798da538de382612255b05c77c
2021-09-29 13:50:05 +00:00
TreeHugger Robot
51b865a0ec Merge "Separate refresh rate restrictions for different High Brightness Modes" into sc-qpr1-dev am: af5c64f76f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15937366

Change-Id: I9dcfe5d51a3c48a39b3e06ce42d2b88368a08b8d
2021-09-29 13:37:41 +00:00
TreeHugger Robot
ac548fb61e Merge "Separate refresh rate restrictions for different High Brightness Modes" into sc-qpr1-dev am: af5c64f76f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15937366

Change-Id: I7dcc13f83b31615c4f6acf88bf9c2c8a4ec9807a
2021-09-29 13:37:38 +00:00
Daniel Solomon
448dd444ad Separate refresh rate restrictions for different High Brightness Modes
Allow setting a different refresh rate for High Brightness Mode for HDR
and for Sunlight.

Bug: 196691596
Test: atest DisplayModeDirectorTest
Test: Manual:
      1. Ensure HBM for HDR takes presedence over HBM for Sunlight
      2. Ensure app refresh rate votes override bothHBM for Sunlight
Change-Id: I4a29c47f218046d0852178ad5dc7484a86ef8607
2021-09-29 03:55:26 +00:00
TreeHugger Robot
d1af9bd2ef Merge "Camera: Switch the jpeg orientation when using the native encoder" into sc-qpr1-dev am: 6e60223a63
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15899922

Change-Id: I84842741ff61e590cdf46ab7c62f234864ab9538
2021-09-27 15:53:14 +00:00
TreeHugger Robot
ff2ce8ac2d Merge "Wait for camera extensions service during initialization" into sc-qpr1-dev am: 2f68a663a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15838336

Change-Id: I6342a11b144b8e55765c5fa900f40a852a7db47c
2021-09-25 02:23:04 +00:00
TreeHugger Robot
82c1b831eb Merge "Camera: Switch the jpeg orientation when using the native encoder" into sc-qpr1-dev am: 6e60223a63 am: 92105a485a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15899922

Change-Id: Iae9359177b79773e67a9b509e751b36b559e61a0
2021-09-23 22:15:10 +00:00
TreeHugger Robot
92105a485a Merge "Camera: Switch the jpeg orientation when using the native encoder" into sc-qpr1-dev am: 6e60223a63
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15899922

Change-Id: I9cca2c93a9e128d065d9d1412df7df04fea1b3c0
2021-09-23 22:04:52 +00:00
Emilian Peev
b233caa56d Camera: Switch the jpeg orientation when using the native encoder
The native Jpeg encoder expects rotation in counter
clockwise direction. However according to the Camera2 specification
clients need to pass the Jpeg rotation in clockwise direction.
Flip the client rotation value before passing to the Jpeg encoder.

Bug: 200890552
Test: Manual using sample application,
atest -c
cts/tests/camera/src/android/hardware/camera2/cts/CameraExtensionSessionTest.java

Change-Id: Ib70a8f5b5165d8319d89c2ed4b7509929c2faa71
2021-09-23 13:22:32 -07:00