Commit Graph

3759 Commits

Author SHA1 Message Date
TreeHugger Robot
cf10b975b8 Merge "Ensure Java code verifies hinge angle sensor is wakeup" into rvc-dev am: 5bc3e56a51 am: a9fe26965b am: b3b2446ea4 am: d4a2126ea0
Change-Id: I47ad11856b7b35241d4c30308ec9afd5c94c3c8b
2020-05-28 01:28:51 +00:00
TreeHugger Robot
d4a2126ea0 Merge "Ensure Java code verifies hinge angle sensor is wakeup" into rvc-dev am: 5bc3e56a51 am: a9fe26965b am: b3b2446ea4
Change-Id: Ice8b6f457a93fc6194a6d5b5d5bb2a0f20596f55
2020-05-28 01:09:47 +00:00
TreeHugger Robot
5bc3e56a51 Merge "Ensure Java code verifies hinge angle sensor is wakeup" into rvc-dev 2020-05-27 23:54:07 +00:00
Anthony Stange
373eca4301 Ensure Java code verifies hinge angle sensor is wakeup
Previously, only the NDK enforced the default sensor type was wakeup and
if an app called the Java APIs it'd get a null value if there was only a
wakeup version of the hinge sensor.

Bug: 157581504
Test: Run on emulator and verify that getDefaultSensor returns the
sensor instance

Change-Id: Ica13c70a456780891f366394848e4c649f6ea70b
2020-05-27 16:02:16 -04:00
TreeHugger Robot
1022ad4274 Merge "CEC: Add listener for HDMI CEC volume control feature" 2020-05-27 12:46:25 +00:00
Marvin Ramin
0e1334acf2 CEC: Add listener for HDMI CEC volume control feature
Adds a listener to receive updates to the state of the HDMI CEC volume
control features.

Interested parties can register and unregister to get notified about
state updates which are sent on every change to the value.

Test: atest HdmiControlServiceTest
Bug: 152018314
Change-Id: I342d748114bae99b3c3f236502d73bfeac9e9ac5
2020-05-26 13:23:38 +02:00
Kevin Chyn
e3e8ae90f8 Merge "Remove unused interfaces from Face/Fingerprint aidl" 2020-05-21 20:57:14 +00:00
TreeHugger Robot
91b5793b07 Merge "Camera: Query default display size from display manager" into rvc-dev am: 4586885a63 am: 78f08110bc am: 98750e577e am: 31b149965e
Change-Id: I2d4d786457c00b0d6f324752ca03332de6c74534
2020-05-21 16:56:55 +00:00
TreeHugger Robot
31b149965e Merge "Camera: Query default display size from display manager" into rvc-dev am: 4586885a63 am: 78f08110bc am: 98750e577e
Change-Id: I358a9130e39b7c28d8044ef84c9ba05c926a8830
2020-05-21 16:41:24 +00:00
TreeHugger Robot
4586885a63 Merge "Camera: Query default display size from display manager" into rvc-dev 2020-05-21 16:12:40 +00:00
Automerger Merge Worker
471393127a Merge "Merge "camera2: Add some more docs to getConcurrentCameraIds" into rvc-dev am: d220792d6b am: da7bf78b7f am: 4503914602" into rvc-qpr-dev-plus-aosp am: 01f848bf59
Change-Id: I531c09c98632172946850d19a57d978de50ef681
2020-05-21 00:48:30 +00:00
TreeHugger Robot
d165bbcb9f Merge "camera2: Add some more docs to getConcurrentCameraIds" into rvc-dev am: d220792d6b am: da7bf78b7f am: 4503914602
Change-Id: I4cbb199cf407fe591624df9e8a3b80ba72222ac3
2020-05-21 00:36:22 +00:00
Kevin Chyn
8e0360f8a4 Remove unused interfaces from Face/Fingerprint aidl
These add to confusion and are never used.

Bug: 157077040

Test: Builds
Change-Id: If9dfcda8b929cbfbfc3cfa60117686b87156b06d
2020-05-20 17:33:34 -07:00
Emilian Peev
46e7450670 Camera: Query default display size from display manager
The current Android API will trigger strict mode
violations in case a context not bound to any
particular display tries to connect to the window
manager service.
To avoid such violations query the default display size
directly from the display manager.

Bug: 157167435
Test: Camera CTS
Change-Id: Icad19ec0227b4945da9e6fcacaec916c5799877f
2020-05-20 17:18:02 -07:00
TreeHugger Robot
d220792d6b Merge "camera2: Add some more docs to getConcurrentCameraIds" into rvc-dev 2020-05-21 00:15:00 +00:00
Jayant Chowdhary
9c8fe18534 camera2: Add some more docs to getConcurrentCameraIds
- specifying the order of camera open and session configuration.
- explaining the use of CONTROL_ZOOM_RATIO with concurrent operation of cameras.

Bug: 151891611

Test: make doc-comment-check-docs

Change-Id: I3ee3f114f7295570aa6af5dbe35bb32db555811b
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2020-05-20 15:43:47 -07:00
Nicholas Ambur
3eb7184dcc Merge "fix SoundTrigger.ModuleProperties equals" into rvc-dev am: f39409edaf am: b59e0b05da am: f18844e54c am: fc76c65e1a
Change-Id: Ib505408a81018430fa6c19f7e795f030b440e8fe
2020-05-18 18:54:39 +00:00
Nicholas Ambur
b59e0b05da Merge "fix SoundTrigger.ModuleProperties equals" into rvc-dev am: f39409edaf
Change-Id: If737938d03649116462f71790a8fc5eefbf3d0a4
2020-05-18 17:27:25 +00:00
Nicholas Ambur
f39409edaf Merge "fix SoundTrigger.ModuleProperties equals" into rvc-dev 2020-05-18 17:12:46 +00:00
Nicholas Ambur
ba749f87d4 fix SoundTrigger.ModuleProperties equals
Bug: 152354427
Test: atest SoundTriggerTest
Change-Id: I715ecb51e78bcb45f4b3384c0551297289fe30f9
2020-05-18 10:11:02 -07:00
Kevin Chyn
8f1768320e Merge "Clean up BiometricPrompt bundle" 2020-05-16 02:46:59 +00:00
Kevin Chyn
6b0c536b93 Clean up BiometricPrompt bundle
We should stop using a bundle between BiometricPrompt (API),
AuthService/BiometricService, and AuthController (SystemUI)
For the below reasons

1) Bundles are too generic, and also less readable
2) Avoid needing to define default values everywhere
3) Cleaner interface
4) Convenience functions can be added within PromptInfo

We can consider having separate parcelables for
- BiometricPrompt->BiometricService
- BiometricService->AuthController
But that seems a bit overkill at the moment

Test: atest com.android.systemui.biometrics
Test: atest com.android.server.biometrics
Test: BiometricPromptDemo

Change-Id: I2911a876bf00197a13f6a406ab735a8bad5b960f
2020-05-15 15:47:43 -07:00
Automerger Merge Worker
9d81ad5574 Merge "Merge "Camera: Docs: Improve info on key removal in CameraCharacteristics" into rvc-dev am: 48105b5c6e am: 54b4c3dd7a am: 287941339b" into rvc-qpr-dev-plus-aosp am: 7ffecad956
Change-Id: Id41aa99ade534080435238912b018651083740f6
2020-05-15 20:55:47 +00:00
TreeHugger Robot
0122936698 Merge "Camera: Docs: Improve info on key removal in CameraCharacteristics" into rvc-dev am: 48105b5c6e am: 54b4c3dd7a am: 287941339b
Change-Id: Ib64f91e3d20811530ab74279685790711800c908
2020-05-15 19:02:57 +00:00
TreeHugger Robot
bfa417e7dd Merge "Camera: Docs: Improve info on key removal in CameraCharacteristics" into rvc-dev am: 48105b5c6e
Change-Id: Ieeb849337217098578a15df3cc4e91c62c27d320
2020-05-15 18:17:35 +00:00
TreeHugger Robot
48105b5c6e Merge "Camera: Docs: Improve info on key removal in CameraCharacteristics" into rvc-dev 2020-05-15 18:17:04 +00:00
Eino-Ville Talvala
503bd6843d Merge "Camera: Update documentation for rolling shutter skew" into rvc-dev am: 1a66adcc56 am: f20c895c02 am: 69a49bf208 am: ff22a14f80
Change-Id: I19db9f8f68cce89d3971ea92f0c1e2c4f2acb362
2020-05-15 16:08:38 +00:00
Eino-Ville Talvala
29cb5ecd71 Merge "Camera: Update documentation for rolling shutter skew" into rvc-dev am: 1a66adcc56
Change-Id: I3adc7d4d2c74db00311b86fb99b179a191ddfcd4
2020-05-15 15:53:59 +00:00
Eino-Ville Talvala
ff22a14f80 Merge "Camera: Update documentation for rolling shutter skew" into rvc-dev am: 1a66adcc56 am: f20c895c02 am: 69a49bf208
Change-Id: Ic2a33e5eee71373ab6a61997d0c172e4021ac0c6
2020-05-15 15:49:57 +00:00
Eino-Ville Talvala
1a66adcc56 Merge "Camera: Update documentation for rolling shutter skew" into rvc-dev 2020-05-14 16:49:42 +00:00
Chris Ye
dfc4030909 Merge "Generate ACTION_CANCEL event when screen turned off by proximity sensor." 2020-05-13 17:11:33 +00:00
TreeHugger Robot
51822d01df Merge "Add OWNERS for display, haptics, input and power" into rvc-dev am: f30c225fcb am: 1e3fe956cf am: 689486059f am: 4623e80530
Change-Id: I80f338fc23ef80f544bc33d169f262346ab17786
2020-05-12 22:31:13 +00:00
TreeHugger Robot
689486059f Merge "Add OWNERS for display, haptics, input and power" into rvc-dev am: f30c225fcb am: 1e3fe956cf
Change-Id: I36ce5198582b6aa3fe6fc1c89e9438454df09f3f
2020-05-12 20:44:35 +00:00
TreeHugger Robot
4dca85b87f Merge "Add OWNERS for display, haptics, input and power" into rvc-dev am: f30c225fcb
Change-Id: Id6ab3fe424d9914f1ec54c0f9a4684578ed89c0b
2020-05-12 20:28:17 +00:00
TreeHugger Robot
f30c225fcb Merge "Add OWNERS for display, haptics, input and power" into rvc-dev 2020-05-12 20:17:39 +00:00
Eino-Ville Talvala
4f3e1f1f4f Merge "Camera: Fix minor doc formatting error" into rvc-dev am: ab3438ec1f am: 8b6cc42047 am: 0d0ae101e6 am: ad4ec50789
Change-Id: Icc8c37233fb687d0c5265505cda5281caf008345
2020-05-12 18:48:26 +00:00
Michael Wright
2e7e81c950 Add OWNERS for display, haptics, input and power
Bug: 156349083
Test: N/A
Change-Id: Ia8afccfc2e470095ae3d52c827c0ac78b7c120ae
2020-05-12 19:11:13 +01:00
Eino-Ville Talvala
8b6cc42047 Merge "Camera: Fix minor doc formatting error" into rvc-dev am: ab3438ec1f
Change-Id: Idf62e055ae86bb9b46334afb8815fd596e3bdf0e
2020-05-12 17:27:47 +00:00
Eino-Ville Talvala
ab3438ec1f Merge "Camera: Fix minor doc formatting error" into rvc-dev 2020-05-12 17:25:11 +00:00
Chris Ye
b985677a9e Generate ACTION_CANCEL event when screen turned off by proximity sensor.
When using PROXIMITY_SCREEN_OFF_WAKE_LOCK and screen was turned off by proximity sensor,
input service should generate ACTION_CANCEL, same as display turned off by pressing power button.
Add power state in display view port and notify input service for
display power state change.

Bug: 154074380
Test: atest libgui_test
Change-Id: Icb65aead4b5544182c46101f4ba535f5955ebd6c
2020-05-12 09:54:30 -07:00
Kevin Chyn
6f843d4249 Merge changes from topic "biometric-id"
* changes:
  Update IBiometricSensorReceiver with sensorId
  Stop using halDeviceId
2020-05-12 05:35:46 +00:00
Kevin Chyn
95d3024127 Update IBiometricSensorReceiver with sensorId
We should first remove halDeviceId since it's not used and adds
confusion.

Bug: 149067920
Test: atest com.android.server.biometrics
Test: enroll, auth (lockscreen), remove on fingerprint/face devices
Test: BiometricPromptDemo on fingerprint/face devices

Change-Id: Ic57ed3307225ae2653f8f83308a4119346428c26
2020-05-11 17:33:33 -07:00
Eino-Ville Talvala
b79cde632a Camera: Docs: Improve info on key removal in CameraCharacteristics
Test: m offline-sdk-docs
Bug: 143565873
Change-Id: I559cf028ec3540df7a851ab344072b7637913550
2020-05-11 14:29:41 -07:00
Eino-Ville Talvala
3a639682b7 Camera: Update documentation for rolling shutter skew
Existing definition was inconsistent, so update it to be consistent
and match what implementations have actually done.

Test: Builds
Bug: 150331548
Change-Id: Ied8e78a36685f3f6416e431307970db3b6191497
2020-05-11 10:24:54 -07:00
Eino-Ville Talvala
403ea08d18 Camera: Fix minor doc formatting error
Test: Builds
Bug: 150331548
Change-Id: Id7b2306486d1a57e0226f641602609debabf7ff9
2020-05-11 10:18:10 -07:00
Alec Mouri
6a5be8eaca Merge "Dispatch refresh rate callbacks from DMS" into rvc-dev am: 00f681a582 am: 151365a461 am: c94de5c5ce am: f7f8d57074
Change-Id: I912b29d038f9938b963818577b2c9644d7d5e023
2020-05-10 06:05:37 +00:00
Alec Mouri
151365a461 Merge "Dispatch refresh rate callbacks from DMS" into rvc-dev am: 00f681a582
Change-Id: I193dfe7532893c3675d074aa00078ab0885095c3
2020-05-10 05:17:32 +00:00
Alec Mouri
00f681a582 Merge "Dispatch refresh rate callbacks from DMS" into rvc-dev 2020-05-08 23:54:17 +00:00
Kevin Chyn
e6bdee20a0 Stop using halDeviceId
The deviceId currently returned by the HAL is only used to determine
if the callback has successfully been set. Any state that it's being
used to track is currently redundant with the pointer to the actual
HAL (e.g. determing if the HAL is found, if it has crashed, etc).

Remove this information to reduce confusion.

Also removed enumerate callback, since only system server handles
enumeration results (upper layers never touch this)

Bug: 149067920
Test: Enroll, auth on fingerprint and face devices
Test: atest com.android.server.biometrics

Change-Id: I1275a91da6f773934be663731ddf1802e0161090
2020-05-08 13:46:41 -07:00
Alec Mouri
cf3ad873dd Dispatch refresh rate callbacks from DMS
AChoreographer will consume these callbacks in lieu of going through SF
for the callbacks. This is so that DMS can update its view of display
configs before apps receive the refresh rate callback so that apps can
get consistent information.

Bug: 154874011
Test: ChoreographerNativeTest
Test: Manually verify that HWUI is receiving callbacks
Change-Id: I992c247fd16ef414f94a259bbd300bea3e4c9467
2020-05-07 19:19:23 -07:00