Commit Graph

5066 Commits

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

Change-Id: Ie52f5b5595007e4d5a22424a269db215e98838ea
2021-11-16 23:15:05 +00:00
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
TreeHugger Robot
f86b4b4974 Merge "Go to sleep on fold for foldable devices." 2021-11-16 04:09:38 +00:00
Joshua Mccloskey
79cb218693 Merge "Add ignoreEnrollmentState to prompt info" into sc-v2-dev am: c9786ca681 am: 0e1abac54b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16185143

Change-Id: I4b7f60ad6770808907d1a99a2c6b903800ba1e79
2021-11-10 18:47:24 +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
Santos Cordon
4f7ca41f6f Go to sleep on fold for foldable devices.
Allow configuration of foldable states to indicate the device
should sleep when entering certain states.

Test: Check that device still wakes up on unfold, and sleeps on fold.
Bug: 180154690
Change-Id: I179d93ec506deee7e9da7d9190934c52a0bc188f
2021-11-10 14:26:16 +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
TreeHugger Robot
4fb8c2db76 Merge "Use permission MODIFY_USER_PREFERRED_DISPLAY_MODE to set user preferred mode" 2021-11-09 12:20:08 +00:00
Joe Bolinger
f3faeb3976 Merge "Do not show side fingerprint sensor overlay when used from settings." into sc-v2-dev am: ddbd84f4d0 am: 865968ceee
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16168831

Change-Id: I76ad3d5f09a8048a32bdc91617554d201c6d6b91
2021-11-08 18:55:48 +00: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
Jayant Chowdhary
bc58869990 Merge "Add CONTROL_VIDEO_STABILIZATION_MODE_PREVIEW_STABILIZATION to allow for better preview stabilization." 2021-11-05 17:01:26 +00:00
Jayant Chowdhary
7f789bc503 Add CONTROL_VIDEO_STABILIZATION_MODE_PREVIEW_STABILIZATION to allow for better preview stabilization.
Add CONTROL_VIDEO_STABILIZATION_MODE_PREVIEW_STABILIZATION. This CaptureRequest key may be
advertised by devices which can support applying the same quality of
stabilization to preview and all non RAW streams. This helps clients
achieve a what you see is what you get effect.

Bug: 170230992

Test: builds

Change-Id: Ida56d335716a10861d2b9e60e7c4b237965dec9c
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2021-11-03 17:11:27 +00:00
Rucha Katakwar
3e6f11d667 Merge "Camera: Update torch strength control keys details." 2021-11-02 18:49:03 +00:00
Rucha Katakwar
3a01f25f01 Camera: Update torch strength control keys details.
1. Add a note that default level should be > 0.
2. Update value of the key for devices with no flash unit.

bug: 203629711
Change-Id: Ib154470a0e1a94685078bd0bcb342adde1d38192
2021-11-02 18:48:30 +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
Avichal Rakesh
e5f19d123c Camera2: Deprecate EXTENSION_BEAUTY and add EXTENSION_FACE_RETOUCH
This CL deprecates EXTENSION_BEAUTY and replaces all usages in docs with
EXTENSION_FACE_RETOUCH to better reflect what is done by the extension.

Bug: 198797265
Test: Existing tests pass
Change-Id: I6ac9018d6956ba303361411ee508d61704d99111
2021-10-28 11:41:19 -07: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
Karthik Bharadwaj
abdcd1c095 Merge "Remove incorrect flag attribute from SensorDirectChannel Ratelevel." 2021-10-25 19:40:22 +00:00
karthik bharadwaj
e9cb29ccb4 Remove incorrect flag attribute from SensorDirectChannel Ratelevel.
Bug: 174239114
Test: Presubmits.
Change-Id: I7868d7f84b18a566b08a2da2d9d0d4782224d609
2021-10-21 13:40:54 -07:00
Nathalie Le Clair
ba03936518 Add executor null check
Bug: 196043550
Test: presubmit

Change-Id: I9b109094b042dba74c39c16b672abf85e938f73a
2021-10-20 07:34:17 +00:00
Rucha Katakwar
4169b20dd6 Merge "Camera: Add torch brightness control keys." 2021-10-20 04:16:39 +00:00
Nathalie Le Clair
21223c9bb8 Merge "Make list of SADs to query configurable" 2021-10-19 15:15:46 +00:00
Kriti Dang
87eba5bd4c Use permission MODIFY_USER_PREFERRED_DISPLAY_MODE to set user preferred
mode

Bug: 198452789
Test: atest DefaultDisplayModeTest
Change-Id: Ib362dfa3174f42d20da7a249d560cae4e93318c2
2021-10-19 15:02:11 +02:00
Rucha Katakwar
85e89f2eaa Camera: Add torch brightness control keys.
1.FLASH_INFO_STRENGTH_MAXIMUM_LEVEL : Number of brightness levels.
2.FLASH_INFO_STRENGTH_DEFAULT_LEVEL : Default brightness level for device in
TORCH mode.

The API to actually control the torch strength level and tests will be
added in the next series of changes.

bug: 200174275
Change-Id: I674885a237d734a2a45f40fa0e336b07fa649859
2021-10-18 20:57:01 -07:00
TreeHugger Robot
df13ce9cea Merge "Update DozeSensors and DozeBrightnessSensor on posture changes" into sc-v2-dev am: 22314d89a3 am: ac0da15643
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15983468

Change-Id: I9b628070658eb70c6a805c3982ba675fd471b5c2
2021-10-18 20:35:38 +00: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
Ytai Ben-Tsvi
78bb22a1c7 Support back-to-back soundtrigger recognitions
This change allows the HAL driver, at its discretion, indicate that
recognition is still active after a success event.
This is achieved by an additional flag added to the event.
The behavior to support this case has already been in place, for the
sake of supporting a FORCED event. This change just generalizes this
behavior to be able to cover SUCCESS as well.
For b/w compat, when the status is FORCED, we override the new flag
with 'true', indicating that recognition is still active.
We do not allow the flag to be set for status codes other than FORCED
or SUCCESS.

Test: atest FrameworksServicesTests:{SoundTriggerMiddlewareImplTest,SoundHw2CompatTest}
Test: Manual verification of sound trigger operation by invoking the
      assistant and now playing multiple times.
Bug: 186031938
Change-Id: Ie4edf82607c72ccb0b8d90a828b04c93153ec8f3
2021-10-18 16:37:03 +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
Nathalie Le Clair
839b9094ea Make list of SADs to query configurable
Additionally,
- refactor RC_PROFILE_SOURCE_ setting to use same convention
for allowed values.
- add @see links to all CEC configuration constants and APIs.
- remove @hide @SystemApi annotations on individual fields, since that
is the annotation of the class and therefore the default annotation for
all of its fields.

Bug: 196044080
Test: atest
Change-Id: I87bc80f82fa78ab8df994768189c61e4892db1a0
2021-10-18 13:41:55 +00:00
Michal Olech
f483aae674 Merge changes Ifb05b969,I74808d8e
* changes:
  [CEC Configuration] Switch HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED to Shared Preferences
  [CEC Configuration] Switch HDMI_CEC_ENABLED to Shared Preferences
2021-10-18 10:38:44 +00:00
Emilian Peev
1a8d5596eb Merge "Camera: Handle ISE when device state manager is absent" into sc-v2-dev am: a8a33c88f2 am: 24a011273a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16034842

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

Change-Id: I61ddc76a783a7e72e7012989a4dd54b8d081af16
2021-10-13 23:09:27 +00: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
Michal Olech
bae425efff [CEC Configuration] Switch HDMI_CEC_ENABLED to Shared Preferences
Bug: 181203672
Test: manual test
Change-Id: I74808d8e9e1034d4fe5eadccc15ccbc353e09975
2021-10-13 13:36:45 +02: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
677373ee30 Merge "Camera: Fix wrong wasImageCaptured flag" into sc-qpr1-dev am: 0f6c1c9d24 am: 19e0a03336 am: 7e42bd2aa6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16009383

Change-Id: I3c380e3ff551f1ebfd74146c6b8ad3906140626e
2021-10-08 20:53:22 +00: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
TreeHugger Robot
57eaeb18f8 Merge "Camera: Avoid possible deadlock when closing advanced extension session" into sc-qpr1-dev am: 00c890cda7 am: 2d7bc584fc am: be9e53d16d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15976219

Change-Id: Ib540c41a136966eac8cb9dd597e4d85896f19187
2021-10-08 20:30:50 +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