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
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
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
[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
1c98705868
Merge "Add Builder to LightState." into sc-dev am: 167b01edf8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14091027
Change-Id: I88c3dd0cd529e96b058a10376089bbb717c36214
2021-04-27 16:13:54 +00: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
63f6ea7493
DynamicCamera: Add new hidden APIs in CameraManager and new permission for injection camera am: 84d364df81
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13824720
Change-Id: I8d0c20f8399108298b42f83d88762a0e2bcbd62b
2021-04-27 01:01:55 +00: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
29997bad9d
Merge "Specify UID in getAuthenticatorIds" into sc-dev am: ccfc84f489
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14312915
Change-Id: I392abea6861333728ba156ed517a858140bd4a5e
2021-04-27 00:14:19 +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
0628540b91
Merge "Update biometric OWNERs to single source of truth" am: 8d75fd0d02 am: d72f38390a am: 9cbf1ef9ef am: 1707d1267b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1685327
Change-Id: Ifbf2a5008d00202770dd41ea5c77af594595e102
2021-04-26 20:02:33 +00: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
d43af4a4ca
Merge "Add get/set feature implementation" into sc-dev am: 1203a1c628
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14202160
Change-Id: Ib0b894cacb0779d56ebf501f8e79fe94d11f9d1e
2021-04-25 23:29:19 +00:00
Joshua Mccloskey
1203a1c628
Merge "Add get/set feature implementation" into sc-dev
2021-04-25 23:20:35 +00:00
Santos Cordon
c772dc3b8f
Merge "Add listener for brightness-specific changes." into sc-dev am: 33946ea33f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14018899
Change-Id: I60a7bebd1e92f0edb2f1ef1d6dfeff6eda09dc00
2021-04-24 15:59:26 +00:00
Santos Cordon
33946ea33f
Merge "Add listener for brightness-specific changes." into sc-dev
2021-04-24 15:38:20 +00:00
TreeHugger Robot
1de1f342f7
Merge "Camera: Rename the extension latency query" into sc-dev am: e723159e6b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14298065
Change-Id: Ibffa11b3d3915c302df00bcd04a7f552fc550efa
2021-04-24 00:13:43 +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
80b1c60ffd
Merge "Configures FingerprintService to use FingerprintStateCallback to notify clients of fingerprint sensor state changes" into sc-dev am: 42edcfbdb6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14260002
Change-Id: I49684dcb53d68017d2998ffcb8730d0326f931a6
2021-04-23 18:05:25 +00: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
6a8d8e590d
Merge "Camera: Update streamConfigurationMap doc for 1080p min JPEG size" into sc-dev am: 74c93b7ba8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14140638
Change-Id: Ia1121c42408285e8256cd28a5f219ce6f5f176b5
2021-04-23 06:36:08 +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