Commit Graph

4671 Commits

Author SHA1 Message Date
Jayant Chowdhary
e6f851c263 Merge "camera2: Add system api to specify oom score offset while opening a camera." into sc-dev am: 441d5e9e11 am: e822c3521e am: 936c58f4b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14625167

Change-Id: I0930721a3fdfd03eb3685e828eff8e11c50903a8
2021-05-20 14:23:51 +00:00
Jayant Chowdhary
e69876bbc1 camera2: Add system api to specify oom score offset while opening a camera.
Bug: 187429135

Test: atest CameraEvictionTest.java

Change-Id: Ib29053ed94822fa0e73b075387fb84463e0e057d
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2021-05-19 19:24:09 -07:00
Ady Abraham
fd490502aa Merge changes from topic "preferredDisplayModeId60120" into sc-dev am: c49b886d73
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14185079

Change-Id: I1b548d9b4666c30750cb13657d783c649ea04c3e
2021-05-13 16:22:00 +00:00
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
0c4eef22d5 Merge "Add lcnathalie to OWNERS" am: d7158e25d6 am: 3c351fd63c am: d52c25c2bd am: 43285b0c22
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705352

Change-Id: I17f910f44685edac3d457a63586da317fa05b787
2021-05-12 15:11:38 +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
3df2bb6d6e Merge changes from topic "user-id-again" into sc-dev am: ab0b82aef5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14472586

Change-Id: Ic6821600e844a071781dd584865fcc606ba9d7ae
2021-05-12 01:30:17 +00: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
ab98e72ad5 Merge "Make UdfpsHbmCallback a dependency of UdfpsController" into sc-dev am: c7bfe7d196
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14492382

Change-Id: Ifef89062814c182a60342f568ac2302deeb31d09
2021-05-11 23:09:54 +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
3b838adc12 Merge "Camera: Support advanced extensions" into sc-dev am: dd3707adc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13766710

Change-Id: Ie581d9b67a121ab9b075ca0de04767cb240f0916
2021-05-11 19:48:37 +00: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
55c0c2d658 Merge "Split onPointerDown to onPointerDown and onUiReady" into sc-dev am: 22f83b56f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14332774

Change-Id: I730556f10b092e114a4f87cd16889e0a2786ea0f
2021-05-10 08:07:16 +00:00
Ilya Matyukhin
22f83b56f7 Merge "Split onPointerDown to onPointerDown and onUiReady" into sc-dev 2021-05-10 07:36:14 +00:00
Evan Rosky
393d5343f8 Merge "Revert "Add reporting to monitor apps incorrectly using getRaw"" into sc-dev am: 0214d012f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14443843

Change-Id: I3d1fe904c92e2f603afb5b2edf95e2c69e4f3b83
2021-05-06 17:19: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
Ivan Gorinov
a7765759c4 Sensors: Set the wakeup LOW_LATENCY_OFFBODY_DETECT as default
This sensor type is included in the wakeup sensor list returned by
the native sensor API, but missing in the list returned by Java API.

Test: Sensor.isWakeUpSensor()
Bug: 187181510
Change-Id: I8de98755af7c85a7a4c907c83d69c254ea8f8d7b
2021-05-04 21:10:52 -07:00
Wale Ogunwale
97010b0f38 Merge "Add helper class FoldStateListener" into sc-dev am: c80b0a8f31
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14411660

Change-Id: I0ddb4d9dd174d2f3dce126afcc6f16c504d9fcdb
2021-05-03 21:36:10 +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
febf260df0 Merge "Add HDR-HBM support into framework." into sc-dev am: 35ab69b632
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14158625

Change-Id: I14722998c53d70f315f5ee26222f5e7cd190b830
2021-04-30 14:57:48 +00: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
3252423970 Merge "Send AIDL face enrollment frame info to clients" into sc-dev am: c05b6dbe20
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14121142

Change-Id: I3d9c86624029714a728bdbd14a98b8df69f3a8c4
2021-04-29 18:03:43 +00: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
7f44ed8f40 Merge "Add test coverage for android.hardware.lights.LightsRequest and hide android.hardware.lights.LightsManager.LightsSession constructor." into sc-dev am: 5dbfd93d4b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14320311

Change-Id: Ic9998eb7604aad02327b69e27087e3290476a83f
2021-04-29 16:32:36 +00:00
TreeHugger Robot
de033bc4f5 Merge "Rename Battery to BatteryState." into sc-dev am: d708154ede
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13993146

Change-Id: Ia49c7feb2fcedde4423c8ead014581128413c39e
2021-04-29 16:32:20 +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
9c6261fbac Merge changes from topic "biometric-unlocked-required" am: c36995ec84 am: cf5f4d6cbf am: 9c975f2335 am: 0809d53d07
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671106

Change-Id: I4796aea117bb2312eab8dd552ae620e938bf9b48
2021-04-28 21:04:39 +00: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
97ddcee65f Merge "Biometrics: Add back import needed by lint." am: 3164fcbb4c am: 18b6ffe526 am: 72e0d41f1c am: e8c9b223f5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689745

Change-Id: Iae76844647bca25895c5e85344588ce4be88f0e2
2021-04-28 10:31:00 +00: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
1ab1fbc464 Merge changes I165d67bd,I4442db15 into sc-dev am: bbddf477af
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14208890

Change-Id: Iba0f79e7fda737c8adbe25d61cd7dfbc9ee0948a
2021-04-27 18:04:03 +00: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