Commit Graph

4558 Commits

Author SHA1 Message Date
Ady Abraham
c49b886d73 Merge changes from topic "preferredDisplayModeId60120" into sc-dev
* changes:
  Enable preferredDisplayModeId for frame rate override
  Add preferredMaxDisplayRefreshRate
2021-05-13 15:59:00 +00:00
Treehugger Robot
43285b0c22 Merge "Add lcnathalie to OWNERS" am: d7158e25d6 am: 3c351fd63c am: d52c25c2bd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705352

Change-Id: I1d26ce678eb542dbc0d93812f969625879134e52
2021-05-12 14:44:10 +00:00
Treehugger Robot
d52c25c2bd Merge "Add lcnathalie to OWNERS" am: d7158e25d6 am: 3c351fd63c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705352

Change-Id: Iff6217a949282bd89a006d7a8970ab2638cdb538
2021-05-12 14:33:04 +00:00
Nathalie Le Clair
1d5d3ca3cf Add lcnathalie to OWNERS
Bug: N/A
Test: N/A
Change-Id: I369963eb006affb24cba0ab9ef97ec797396fc53
2021-05-12 13:47:10 +02:00
Joe Bolinger
ab0b82aef5 Merge changes from topic "user-id-again" into sc-dev
* changes:
  Add userId parameter to all uses of challenge client.
  Cache challenge response in Face10 implementation.
2021-05-12 01:25:39 +00:00
Ilya Matyukhin
351107ec74 Make UdfpsHbmCallback a dependency of UdfpsController
Bug: 187732246
Test: atest UdfpsControllerGoogle
Change-Id: I1aead35213de9491538b6eaf5d4a45be569ecab8
2021-05-11 12:56:58 -07:00
TreeHugger Robot
dd3707adc0 Merge "Camera: Support advanced extensions" into sc-dev 2021-05-11 19:42:46 +00:00
Joe Bolinger
72c3446049 Add userId parameter to all uses of challenge client.
Bug: 171335732
Bug: 186310980
Fix: 184915229

Test: atest com.android.server.biometrics
Test: manually on device (as normal, extra user, & work profile)
Change-Id: Iccb65657736a73c591a3bb5b69fb432d3f0cb676
2021-05-11 19:33:01 +00:00
Joe Bolinger
1652749e61 Cache challenge response in Face10 implementation.
Prevents operations that happen in rapid succession from failing.

Fix: 185969412
Test: atest com.android.server.biometrics
Test: manual enroll/delete multiple times on device
Change-Id: I20f19c13ec545884c3ed0c91e103f27927413737
2021-05-11 12:17:34 -07:00
Ady Abraham
26c834522b Add preferredMaxDisplayRefreshRate
Add a new private window attribute for allowing apps to specify the max
display refresh rate. This is useful for use cases such as keyguard
where the refresh rate should be limited to preserve power.

In the next CLs the preferredDiplayModeId would be enabled for
frame rate override (60-on-120) and the preferredMaxDisplayRefreshRate
would be the alternative to control the display refresh rate (as opposed
to the frame rate experienced by the app).

Test: atest RefreshRatePolicyTest
Test: atest DisplayModeDirectorTest
Test: Launch camera app and observe refresh rate
Bug: 183226498
Change-Id: I1c5e9f6047cbea4bfb581251b8dd2b9058b3e378
2021-05-10 16:37:33 -07:00
Ilya Matyukhin
22f83b56f7 Merge "Split onPointerDown to onPointerDown and onUiReady" into sc-dev 2021-05-10 07:36:14 +00:00
Evan Rosky
abc24090f0 Revert "Add reporting to monitor apps incorrectly using getRaw"
This reverts commit 8b82086722.

Reason for revert: Metrics no-longer needed, we are adding compat for this.

Bug: 187153492
Test: N/A
Change-Id: I31bbe36378a2da969a094405b0e0a7b7b9cde3a0
2021-05-06 01:44:51 +00:00
Wale Ogunwale
28ebbbf0ab Add helper class FoldStateListener
Reduces the need for each code that needs to know about fold/unfold from
duplicating the exact same code.

Bug: 184795211
Test: They pass!
Change-Id: Ic05a2067c2ec64db7dab0227a7204283c1144a5f
2021-05-03 09:07:07 -07:00
Santos Cordon
35ab69b632 Merge "Add HDR-HBM support into framework." into sc-dev 2021-04-30 14:40:35 +00:00
Santos Cordon
ede3ded5e4 Add HDR-HBM support into framework.
Add a listener to know when HDR layers are present on displays
which support HBM.

Pass both HDR and SDR brightness requests from DPC to
SurfaceFlinger. Lots and lots of scaffolding for this.

Bug: 175321409
Bug: 175821789
Test: atest com.android.server.display
Test: Manually verify that brightness levels are correct when in high
      lux and HDR, low lux and HDR, and various luxes without HDR.
Change-Id: I530299455a7745fd57d44b1e8b20477674894e21
2021-04-30 13:05:29 +01:00
Curtis Belmonte
c05b6dbe20 Merge "Send AIDL face enrollment frame info to clients" into sc-dev 2021-04-29 17:58:28 +00:00
TreeHugger Robot
5dbfd93d4b Merge "Add test coverage for android.hardware.lights.LightsRequest and hide android.hardware.lights.LightsManager.LightsSession constructor." into sc-dev 2021-04-29 16:31:10 +00:00
TreeHugger Robot
d708154ede Merge "Rename Battery to BatteryState." into sc-dev 2021-04-29 16:30:16 +00:00
Chris Ye
3a4edc745d Add test coverage for android.hardware.lights.LightsRequest and hide android.hardware.lights.LightsManager.LightsSession constructor.
Add core CTS test coverage for android.hardware.lights.LightsRequest
API getLights() and getLightStates().
Hide android.hardware.lights.LightsManager.LightsSession constructor.

Bug: 183239763
Bug: 183239666
Test: atest FrameworksCoreTests:InputDeviceLightsManagerTest

Change-Id: I41e0272e64a55b631eda387af0645af077d025be
2021-04-28 22:01:32 -07:00
Chris Ye
c9b9464ad8 Rename Battery to BatteryState.
Rename Battery to BatteryState, and rename the method hasBattery to
isPresent.
Return NaN in getCapacity() if capacity can not be read.

Bug: 180733860
Test: atest android.hardware.input.cts.tests

Change-Id: I8e855be0b263479c2744b817df5f591c9d1e4a64
2021-04-28 16:08:39 -07:00
Ilya Matyukhin
7f31764574 Split onPointerDown to onPointerDown and onUiReady
Previous behavior:
1. Detect a valid touch.
2. Enable HBM.
3. Notify the HAL about onPointerDown when HBM is enabled.

New behavior:
1. Detect a valid touch and report onPointerDown right away.
2. Enable HBM.
3. Notify the HAL about onUiReady when HBM is enabled.

Bug: 184361899
Test: atest UdfpsControllerTest
Test: on device
Change-Id: I48aa3945902a8ca151aabe61a5e71e910773bd88
2021-04-28 14:25:03 -07:00
Paul Crowley
0809d53d07 Merge changes from topic "biometric-unlocked-required" am: c36995ec84 am: cf5f4d6cbf am: 9c975f2335
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671106

Change-Id: I2c7e8050ca82f81ca865a76bd11a39d82eb09dcc
2021-04-28 20:26:08 +00:00
Paul Crowley
9c975f2335 Merge changes from topic "biometric-unlocked-required" am: c36995ec84 am: cf5f4d6cbf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671106

Change-Id: I47281e410de8edf621836a501596419ea0cc1d7c
2021-04-28 19:51:56 +00:00
Paul Crowley
c36995ec84 Merge changes from topic "biometric-unlocked-required"
* changes:
  Tell keystore which SIDs can unlock this user
  Use UserHandle.myUserId() to look up user
2021-04-28 18:29:31 +00:00
Curtis Belmonte
e39cc9a1db Send AIDL face enrollment frame info to clients
Test: Manually tested grid and traffic light face enrollment

Bug: 181374571
Change-Id: If742c6c32547d56be417d4eb0cbb729ed90552a5
2021-04-28 10:41:52 -07:00
Vladimir Marko
e8c9b223f5 Merge "Biometrics: Add back import needed by lint." am: 3164fcbb4c am: 18b6ffe526 am: 72e0d41f1c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689745

Change-Id: I6bd52ea4ff8f0dbbf0bc6db294a275397e5705c7
2021-04-28 10:25:31 +00:00
Vladimir Marko
72e0d41f1c Merge "Biometrics: Add back import needed by lint." am: 3164fcbb4c am: 18b6ffe526
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689745

Change-Id: Idababfc46994097ad725698c259696add686efe6
2021-04-28 09:59:44 +00:00
Vladimir Marko
b909b68c3d Biometrics: Add back import needed by lint.
Test: m out/soong/.intermediates/frameworks/base/doc-comment-check-docs/android_common/doc-comment-check-docs-docs.zip
Bug: 163866361
Bug: 186586694
Change-Id: I1e105ef8bae55c6ad01952739c5b092797217766
2021-04-28 09:57:28 +01:00
Treehugger Robot
0506e4eb20 Merge "Specify UID in getAuthenticatorIds" am: 47f27e64c0 am: f6bbf126d3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687049

Change-Id: I1946e8847ac8a72a69664a8b8f1ffebc7ce0c0b4
2021-04-28 00:55:11 +00:00
Emilian Peev
21b1302c51 Camera: Support advanced extensions
Bug: 179819443
Test: Camera CTS
Change-Id: Ia14f7b4ad40e354b1a433000b1731e648f6398bd
2021-04-27 11:23:33 -07:00
Ilya Matyukhin
bbddf477af Merge changes I165d67bd,I4442db15 into sc-dev
* changes:
  Notify AuthController when fingerprint providers are ready
  Consolidate registration of HIDL and AIDL HALs
2021-04-27 17:50:35 +00:00
Paul Crowley
4459123d49 Use UserHandle.myUserId() to look up user
BiometricManager runs in the app, not in system server, so use
the appropriate call to look up the current user.

Test: aosp/1686345
Bug: 163866361
Change-Id: I10c1ddacf14bd6b77ecfc1cb8235c42b8a7fbcfe
2021-04-27 10:34:33 -07:00
[6;7~
6e14fdc46b Specify UID in getAuthenticatorIds
Allow the caller to get authenticator IDs for a specific UID. If
that UID is not the caller UID the USE_BIOMETRIC_INTERNAL permission
is required; this is enforced by AuthService.

Test: aosp/1686345
Bug: 163866361
Merged-In: I0eef28ecefb85f1c10a73a354d08c38087d59814
Change-Id: I0eef28ecefb85f1c10a73a354d08c38087d59814
2021-04-27 10:34:32 -07:00
Chris Ye
167b01edf8 Merge "Add Builder to LightState." into sc-dev 2021-04-27 16:06:12 +00:00
Chris Ye
d398fb78a9 Add Builder to LightState.
Add Builder to LightState to replace the static constructors. Add
documents for Player ID lights. Changed input device lights types
definition to avoid future collsion with HAL light types.

Bug: 181743615
Test: atest InputDeviceLightsManagerTest
Change-Id: Ie47ef901006220d622677117c7ecd6ee41cf10f6
2021-04-27 00:54:36 -07:00
Cliff Wu
84d364df81 DynamicCamera: Add new hidden APIs in CameraManager and new permission for injection camera
- Add new hidden APIs: injectCamera() and stopInjection() in
CameraManager.
- Add a new permission: android.permission.CAMERA_INJECT_EXTERNAL_CAMERA
to allow injecting the external camera to switch the internal camera.
- Add a new CameraInjectionSession class with stopInjection function,
which is called back by CameraInjectionCallback.onInjectionSucceeded(),
then the lifetime of CameraInjectionSession is what determines when
injection is active.

Bug: 181395010
Test: Verified camera manager use cases function as expected; no denials
Change-Id: I0b218dc6a55c7827e2446502b7a22382c6fe9f3e
2021-04-27 00:47:41 +00:00
TreeHugger Robot
ccfc84f489 Merge "Specify UID in getAuthenticatorIds" into sc-dev 2021-04-27 00:00:14 +00:00
Ilya Matyukhin
06f04c041c Notify AuthController when fingerprint providers are ready
This change introduces a callback that AuthController can provide to
FingerprintService to get notified when all of the fingerprint providers
are available.

This fixes the bug where UDFPS overlay is not available if SystemUI
starts before the fingerprint HAL, because SystemUI would query the
fingerprint providers on startup.

Bug: 184677066
Test: atest AuthControllerTest
Test: on device

Change-Id: I165d67bdda09ea10dd5aac539c4155e6b158227d
2021-04-26 16:40:39 -07:00
Ilya Matyukhin
e1b53af498 Consolidate registration of HIDL and AIDL HALs
This CL establishes a single flow of registration for both HIDL and
AIDL HALs. The registration of both is done on a separate thread to
avoid blocking system server. Previously, only AIDL registration was
done on a separate thread.

Bug: 184677066
Test: atest CtsBiometricsTestCases
Test: atest AuthServiceTest
Test: atest Fingerprint21Test
Test: atest Face10Test

Change-Id: I4442db15a7b690bb34c6eb7e8793ab4411cbd6d2
2021-04-26 16:40:36 -07:00
[6;7~
91bb4412f7 Specify UID in getAuthenticatorIds
Allow the caller to get authenticator IDs for a specific UID. If
that UID is not the caller UID the USE_BIOMETRIC_INTERNAL permission
is required; this is enforced by AuthService.

Test: aosp/1686345
Bug: 163866361
Change-Id: I0eef28ecefb85f1c10a73a354d08c38087d59814
2021-04-26 14:22:25 -07:00
Kevin Chyn
1707d1267b Merge "Update biometric OWNERs to single source of truth" am: 8d75fd0d02 am: d72f38390a am: 9cbf1ef9ef
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1685327

Change-Id: I7ce1bd2978d306ca2fbb58d61ea31d9c9de7887c
2021-04-26 19:52:31 +00:00
Kevin Chyn
9cbf1ef9ef Merge "Update biometric OWNERs to single source of truth" am: 8d75fd0d02 am: d72f38390a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1685327

Change-Id: Iceff96b2c4d993e1287528de9b122c4b9361904f
2021-04-26 19:23:18 +00:00
Joshua Mccloskey
1203a1c628 Merge "Add get/set feature implementation" into sc-dev 2021-04-25 23:20:35 +00:00
Santos Cordon
33946ea33f Merge "Add listener for brightness-specific changes." into sc-dev 2021-04-24 15:38:20 +00:00
Santos Cordon
e5dae0ddc5 Add listener for brightness-specific changes.
Add FLAG to registerDisplayListener method to receive
brightness-specific changes.

getBrightnessInfo() method added to
android.view.Display to get brightness value, min, max
and highBrightnessMode status.

Bug: 168210311
Bug: 171023136
Test: atest com.android.server.display
Change-Id: I581e86e039cc7cf1bbca4cf7af03daa41dbddfe0
2021-04-23 22:18:55 +01:00
Emilian Peev
fdd8754d88 Camera: Rename the extension latency query
Include the latency time unit as part of the method
name.

Bug: 186240766
Test: Successful build
Change-Id: I4e728623c46429c03d7fd1d2720b6d2e171b02cb
2021-04-23 13:48:43 -07:00
Joshua Mccloskey
44593da20d Add get/set feature implementation
Fixes: 184657294
Test: Verified e2e feature get/set work via settings.
Change-Id: I6e3f598ae35c599df15ea6f69a161758caa53c36
2021-04-23 11:17:02 -07:00
Grace Cheng
42edcfbdb6 Merge "Configures FingerprintService to use FingerprintStateCallback to notify clients of fingerprint sensor state changes" into sc-dev 2021-04-23 17:50:17 +00:00
TreeHugger Robot
74c93b7ba8 Merge "Camera: Update streamConfigurationMap doc for 1080p min JPEG size" into sc-dev 2021-04-23 06:09:14 +00:00
Christine Franks
8327ce6b24 Merge "Check virtual displays for ime dispatch" into sc-dev 2021-04-23 04:29:02 +00:00