Commit Graph

4269 Commits

Author SHA1 Message Date
Fiona Campbell
50997aeb8c Merge "Enable per display brightness setting" into sc-dev 2021-02-09 07:24:17 +00:00
TreeHugger Robot
2fa12f8ec3 Merge "Add vibrator state listener support for input device vibrator" into sc-dev 2021-02-08 19:05:34 +00:00
Kevin Chyn
aae04715d1 Add fingerprint enroll reason
1) Existing metrics logging-ness can be derived from it
2) EnrollReason is clearer and can be used by other parts of the
   system, such as SysUI
3) Do not show progressbar in SysUI if it's "find sensor"

Bug: 179447737
Test: Builds
Change-Id: I84f82b5c81a668e11c1a380e6fa4e3080db53dc9
2021-02-06 15:51:43 -08:00
Kevin Chyn
b92e7e8af6 Merge "Make FingerprintManager show BiometricPrompt for UDFPS" into sc-dev 2021-02-06 23:39:55 +00:00
Ilya Matyukhin
26e3ecaaed Merge changes from topic "fix-isUdfps" into sc-dev
* changes:
  Provide default UDFPS location for fake UDFPS
  Remove retry in Fingerprint21 getService
2021-02-06 22:20:04 +00:00
Curtis Belmonte
45807b0b4a Make FingerprintManager show BiometricPrompt for UDFPS
For apps that are still using FingerprintManager, have the system show
BiometricPrompt when authenticating with a UDFPS sensor. This will
ensure that the user is directed to authenticate on the correct part of
the screen, rather than requiring the app to draw an authentication UI.

Test: FingerprintManager test app, Keyguard, and Settings.

Bug: 174490952
Change-Id: I60ba2dce983812996f6baa44557533575051e476
Merged-In: I60ba2dce983812996f6baa44557533575051e476
2021-02-06 20:16:15 +00:00
TreeHugger Robot
ef8d3b00e0 Merge "Add device state request APIs to DeviceStateManager." into sc-dev 2021-02-06 04:37:38 +00:00
Ilya Matyukhin
ace2ea13a1 Provide default UDFPS location for fake UDFPS
Bug: 179465449
Test: works on devices without UDFPS with fake UDFPS
Change-Id: I6d0ea3d2e9f89aad83c981c2f84fd970a0329273
2021-02-05 15:03:39 -08:00
Curtis Belmonte
0920fbb40f Merge "Add onFrame methods to face auth/enroll client monitors" into sc-dev 2021-02-05 19:09:33 +00:00
Chris Ye
f3a1533aa7 Add vibrator state listener support for input device vibrator
Extend Vibrator state and listener support to InputDevice vibrator.
InputDevice users can use the Vibrator listener API to register listener
to vibrator for state change.

Bug: 161634264
Test: atest InputDeviceVibratorTest
Change-Id: I991d3e79ad1734b5c6c99b802aab030bd1597daf
2021-02-05 09:38:18 -08:00
Darryl L Johnson
c26defea8f Add device state request APIs to DeviceStateManager.
This change promotes DeviceStateManager to a TestApi and exposes three
additional methods:
- getSupportedStates: returns a list of state ids that can be used with
requestState().
- submitRequest: requests that the device enter the supplied state.
- cancelRequest: clears the current requested device state.
to be used initially in CTS tests.

Bug: 177235528
Bug: 177236115
Test: atest DeviceStateManagerServiceTest
Test: atest DeviceStateManagerGlobalTest

Change-Id: Ieae9208420ddecea641a5c44f1610d3cb7071b07
2021-02-04 17:47:14 -08:00
Curtis Belmonte
9df80202b1 Add onFrame methods to face auth/enroll client monitors
Updates the AIDL face sensor implementation to forward the
onAuthenticationFrame and onEnrollmentFrame events to appropriate
methods in the FaceAuthenticationClient and FaceEnrollClient monitors.

This implementation also converts the hardware AIDL models
AuthenticationFrame and EnrollmentFrame to equivalent framework classes
FaceAuthenticationFrame and FaceEnrollFrame, respectively. This will
allow the framework to define AIDL interface methods with these models.

Test: atest CtsBiometricsTestCases

Bug: 178414967

Change-Id: I093c4396dddab9cb9fb8fd8ec3426b4f3a81abeb
2021-02-04 10:48:35 -08:00
Christine Franks
6ed22e53ea Merge "Add reduce bright colors to brightness tracker" into sc-dev 2021-02-04 17:12:59 +00:00
Christine Franks
057955ebbd Add reduce bright colors to brightness tracker
Bug: 168065315
Test: atest FrameworksServicesTests:ColorDisplayServiceTest and
atest FrameworksServicesTests:ReduceBrightColorsTintControllerTest and
atest FrameworksServicesTests:BrightnessMappingStrategyTest

Change-Id: I1913d45dfda8ee6ba80346541d04371a9fa90826
2021-02-03 00:56:23 -08:00
Ilya Matyukhin
03603f3bdc Allow UDFPS props to be overlayed
Bug: 179175099
Test: on device
Change-Id: Ib4bc3c89fcacf4bd0a972f7111aa41ed217332e6
2021-02-02 21:51:40 -08:00
Sean Stout
16a89ea815 Merge "Send events when DisplayGroups are added/modified/removed" into sc-dev 2021-02-03 00:05:55 +00:00
Sean Stout
ee31f85781 Send events when DisplayGroups are added/modified/removed
DisplayGroupListeners can now be added and will be informed of addition,
removal, and modification of DisplayGroups.

Bug: 138328918
Test: make
Change-Id: I1dcb52931a798288a0255acd2862f9188f5d83ff
2021-02-02 17:06:42 +00:00
Kim Low
922ed181fe New API methods to access external battery info
Created new API methods that allow apps to access external battery info
of devices such as bluetooth connected gamepads.

Bug: 161633432
Test: atest android.hardware.input.cts.tests.SonyDualshock4BluetoothTest
      atest android.hardware.input.cts.tests.SonyDualshock3UsbTest

Change-Id: Iba59fc9a259818b03c24ee8c2c49601952ed65a3
Merged-In: Iba59fc9a259818b03c24ee8c2c49601952ed65a3
2021-02-01 22:16:44 +00:00
Anthony Stange
d87dacf865 Merge changes I7b0ba9a9,I37e475a1 into sc-dev
* changes:
  Add attribution tag parameter to createClient
  Add new callback / intent type to ContextHub APIs
2021-02-01 21:14:36 +00:00
Fiona Campbell
cc1882f7b4 Enable per display brightness setting
Pass displayId through from brightnesscontroller to
settemporarybrightness on the correct displaypowercontroller.

Bug: 175286226
Test: atest frameworks/base/services/tests/servicestests/src/com/android/server/display
Test: atest ColorModeControls
Change-Id: Ibb65b8c5a70445702b711739551ffb9f727ef450
2021-02-01 18:04:48 +00:00
Bernardo Rufino
bf1903d277 Merge "Open IM.getMaximumObscuringOpacityForTouch() and update docs." into sc-dev 2021-02-01 09:55:38 +00:00
Lorenzo Colitti
dcd9397730 Merge "Allow RNDIS and NCM to be enabled at the same time." am: 2836d8b703 am: 9db81cadec am: 677fbbbedc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559090

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia613275665e90be3e8fa00c0baa3d25823b61bd5
2021-02-01 09:18:59 +00:00
Lorenzo Colitti
677fbbbedc Merge "Allow RNDIS and NCM to be enabled at the same time." am: 2836d8b703 am: 9db81cadec
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559090

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia7e6e4698f80bc70112e9338c5c5ff27cbd248ce
2021-02-01 08:40:49 +00:00
Anthony Stange
b6b7b42358 Add attribution tag parameter to createClient
Attribution tags allow clients to denote if they are providers of
specific data in the system which can be useful when noting permissions
operations later.

Bug: 166846988
Test: compile
Change-Id: I7b0ba9a9ffc6a49f79f80e8078f50625404ddafe
2021-01-29 18:18:05 +00:00
Joshua Mccloskey
c8f8ad2f54 Merge "Added debug parameter to FaceService" into sc-dev 2021-01-29 06:24:34 +00:00
Anthony Stange
818d2dac54 Add new callback / intent type to ContextHub APIs
Updates the ContextHub APIs to support notifying clients (either through
traditional callbacks or via PendingIntent) that their ability to
communicate with nanoapps has changed.

Also, adds the ability for clients to discover the permissions required
to communicate with nanoapps so they know whether their initial or
subsequent nanoapp messages will successfully be delivered.

Bug: 166846988
Test: compile
Change-Id: I37e475a1457a031890693d2858b5d5f7de34de26
2021-01-28 18:57:08 +00:00
Bernardo Rufino
03ec50d528 Open IM.getMaximumObscuringOpacityForTouch() and update docs.
Bug: 158002302
Test: atest WindowUntrustedTouchTest
Change-Id: I735169e0508678e07431704f184a938ffada53cc
Exempt-From-Owner-Approval: Approved on main branch
2021-01-28 15:30:54 +00:00
Sean Stout
35ca6c8129 Add DisplayGroupListener interface
This interface can be used to listen for addition, removal, or
modification of DisplayGroups.

Bug: 138328918
Test: make
Change-Id: I3a2f39838ab00808816366d2484190b401aabed0
2021-01-27 20:42:42 +00:00
Joshua Mccloskey
db778a5e9c Added debug parameter to FaceService
Bug: 177244088
Test: Verified debug parameter is correctly sent to the hal.
Change-Id: If71d86528f1bd9c6d0b75cdff36ec9fdbee47fa6
2021-01-27 12:36:41 -08:00
Michal Olech
dc2e424cdd [CEC Configuration] Add 'tv_send_standby_on_sleep' option
This ports Settings.Global.HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED to
HdmiCecConfig.

Bug: 166433775
Test: atest HdmiCecLocalDevicePlaybackTest HdmiCecLocalDeviceTvTest
Change-Id: I27fe562d7d15f7a049e41a060179bf0d2fafdf9c
2021-01-27 13:24:08 +00:00
Kevin Chyn
7f668ac2c5 Send enrollment signals to SystemUI
Fixes: 178147339
Test: UdfpsAnimationEnroll logs are seen
Change-Id: Ifdaa58ab75662606fd0e46683448750843795249
2021-01-26 22:21:54 -08:00
Christine Franks
e8f6e92fe0 Merge "Add configurable mapping between color modes" 2021-01-26 23:16:12 +00:00
Christine Franks
b776313816 Add configurable mapping between color modes
There are two categories of color modes: the standard color modes, which
are defined and implemented in AOSP, and a reserved range of vendor color
modes, which are defined and implemented by the vendor. Currently, there
is no way to distinguish between two vendor's color modes that use the
same value within the reserved range. This will allow OEMs to specify a
hint as to which vendor's color mode definitions were used on the
original device. If the hint from the restored device matches the hint
on the new device, the color mode from the restored device can still be
considered valid for the new device if it is within the vendor reserved
range. If it does not match, the restored device's color mode value is
invalid on the new device, and must be replaced by the default on the
new device.

Bug: 167449433
Test: builds
Change-Id: Ie5ac0a2d783e1ea703e0342f5cdb41dca07d04d4
2021-01-26 12:12:32 -08:00
Nathalie Le Clair
e1675c3ac3 Add setting for main RC profile
For TV panel and source devices.

Bug: 169121289
Test: atest HdmiCecLocalDevicePlaybackTest and HdmiCecLocalDeviceTvTest

Change-Id: I6e870a35bcaf55153eaa2274c9f2d8b8f7bf1dda
2021-01-26 13:02:08 +01:00
Michal Olech
8d5fa098aa Merge changes I5ac00d59,I41a59081,I63c7cf35
* changes:
  [CEC Configuration] Fix race condition with listeners
  [2.0] Disable sending <User Control Pressed> in attempts to change the active source to a 2.0 device
  [CEC Configuration] Add 'tv_wake_on_one_touch_play' option
2021-01-26 10:51:23 +00:00
TreeHugger Robot
af68bebbaa Merge "Camera: Initial support for Camera2 extension" 2021-01-25 23:16:30 +00:00
Kevin Chyn
4c3c2792fe Merge "Pass detailed reason to UdfpsView, split animation logic" 2021-01-25 18:31:52 +00:00
Emilian Peev
9c778e19e1 Camera: Initial support for Camera2 extension
Add the necessary APIs that will allow Camera2 clients to access
and work with existing CameraX extensions.

Bug: 170481080
Test: Camera CTS

Change-Id: Iaa22fea69ebe01599b3f2e66c1b46ca92015cdc5
2021-01-25 09:59:26 -08:00
Michal Olech
e656e5cbe1 [CEC Configuration] Add 'tv_wake_on_one_touch_play' option
This ports the Settings.Global.HDMI_CONTROL_AUTO_WAKEUP_ENABLED to
HdmiCecConfig.

Bug: 166433775
Test: atest HdmiCecLocalDeviceTvTest
Change-Id: I63c7cf35b9769da193e950f362f51a0f79898a5f
2021-01-25 13:36:20 +01:00
Lorenzo Colitti
79c9c9e365 Allow RNDIS and NCM to be enabled at the same time.
Currently, UsbManager#setCurrentFunctions takes a bitmask of
functions to enable, but will only allow callers to enable one
function at a time.

Allow it to enable both RNDIS and NCM together as well. This is
because from the user's point of view the two functions are the
same (i.e., USB tethering).

Android has historically used RNDIS for tethering. NCM performs
better, but it doesn't work on older OSes like Windows 8.1.

Also change the import order to keep the linter happy.

Bug: 172793258
Test: added unit test for UsbManager.areSettableFunctions
Change-Id: I51b6752781528b09f8929e1fb3b1fa7e4ac36aae
2021-01-23 11:30:29 +00:00
Kevin Chyn
a65ce74e53 Pass detailed reason to UdfpsView, split animation logic
Bug: 177931181

Test: AOD anti-burn-in offsets still applied
Test: Auth on keyguard
Test: Enroll
Test: Auth in settings
Test: atest com.android.server.biometrics
Test: atest com.android.systemui.biometrics

Change-Id: I3638fe02d72caf1911f6b4919b62ca5b25e4b0ea
2021-01-22 18:23:08 -08:00
Kelvin Zhang
b074f7a0a3 Merge "Revert "PM#goToSleep and PM#wakeUp only affects default display group"" 2021-01-22 23:20:53 +00:00
Kelvin Zhang
1431b8c32e Revert "PM#goToSleep and PM#wakeUp only affects default display group"
This reverts commit e2f209d260.

Reason for revert: b/178215050

Change-Id: Ie2de678eda2cc633a5f18cc14b155c56b8c633ca
2021-01-22 20:05:01 +00:00
Kevin Chyn
7a707810e7 9/n: Add BiometricScheduler proto dump
1) Adds biometrics.proto definition for BaseClientMonitor subtypes
2) Adds BiometricScheduler proto dump

When dumping the scheduler, the caller may request for the recent
operation queue to be cleared after dumping or not.

Note that we don't need BiometricScheduler.Operation#STATE_*
in the dump, since (for now) we just want to know what operations
have been run.

We can always add additional state, success/failure, etc in the
future if needed.

Bug: 159667191
Test: atest com.android.server.biometrics
Test: atest CtsBiometricsTestCases
Change-Id: I7d2350f00aaeef03ab7d74013b476af053240320
2021-01-21 16:59:59 -08:00
Sean Stout
99170bffd3 Merge "PM#goToSleep and PM#wakeUp only affects default display group" 2021-01-21 21:04:58 +00:00
Sean Stout
e2f209d260 PM#goToSleep and PM#wakeUp only affects default display group
This CL changes the behavior of PM#goToSleep to instead turn off the
power for the default display group. PM#wakeUp turns on the default
display group.

If all display groups are turned off, the device will go to sleep. If
any display group is on, the device will remain interactive.

This results in no behavior change if there is a single display group.
However if there are multiple display groups then it will be possible to
interact with ones that are on while others are off.

Bug: 138328918
Bug: 170935083
Bug: 175919649
Test: atest PowerManagerServiceTest
Change-Id: I8b475c38886eda3e43d6e8da7e68102a25da1584
2021-01-21 10:17:02 -08:00
Philip P. Moltmann
85712bdfeb Merge "Fine tune what sensor use UI to show" 2021-01-21 00:26:50 +00:00
Kevin Chyn
c3a35738c1 Merge "Add onUdfpsPointer* callbacks to FingerprintManager" 2021-01-21 00:01:57 +00:00
Philip P. Moltmann
6cc4906547 Fine tune what sensor use UI to show
Sometimes we want to show a dialog, sometimes a notification, sometimes
nothing.

- Also some minor UI tuning to match mocks.
- Also suppress dialog while dialog is visible and shortly after. This
  avoids a dialog directly after closing previous dialog.

Test: Triggered dialog. Needs exhaustive test of all
      cases though.
Bug: 162549680
Change-Id: I52ccd22858969823d8670a9e345d3da994ec1c19
2021-01-20 10:20:42 -08:00
Marvin Ramin
e672a8809f Migrate CEC enabled value to CEC configuration
Read value whether HDMI CEC is enabled from HdmiCecConfig and cache it
in HdmiControlService. This changes the type from boolean to int.

Adapt the @hide listener for a change of this value to return integers
instead of booleans as well.

Bug: 171870477
Test: atest com.android.server.hdmi

Change-Id: I6275fe1b3e1ca62c210019e1df216f8731a0b5ab
2021-01-20 09:24:58 +01:00