Commit Graph

3796 Commits

Author SHA1 Message Date
TreeHugger Robot
c345c910a7 Merge "Camera: Fix race for onCaptureBufferLost callback" into rvc-dev am: 918942f462 am: 2d350e2983 am: 4623558ea7 am: fbfc38605d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11510012

Change-Id: I745098decd6d3d98d02f3ff635ab757adec7f81d
2020-06-08 20:11:48 +00:00
Kevin Chyn
517c2f5386 Merge "Clean up ServiceListener / ClientMonitor" 2020-06-08 20:08:57 +00:00
Kevin Chyn
84f162aff1 Clean up ServiceListener / ClientMonitor
1) ClientMonitors should be less "abstract", and should be instantiated
   with knowledge of "sensorId" and "strength"
2) ClientMonitors should not care about who their client is (e.g.
   FingerprintManager, FaceManager, BiometricService). As such,
   added a new shim (ClientMonitorCallbackConverter) that receives
   callbacks from ClientMonitor and forwards it to the client it was
   instantiated with.

Fixes: 157077040
Bug: 157184083

Test: atest com.android.server.biometrics
Test: 1) Enroll, auth on keyguard, auth in BiometricPromptDemo,
         remove via settings
      2) Enumerate/cleanup - modify FingerprintUtils/FaceUtils to either
         store an extra template, or no template in the framework cache
         upon enroll completion. reboot device, notice either "framework
         template" being removed, or "HAL template" being removed

Note: We should move InternalEnumerateClient / InternalRemovalClient
      into their own monitor subclass to remove global state tracking
      in BiometricServiceBase
Note: We can consider breaking down ClientMonitorCallbackConverter into
      an interface or abstract class, to be implemented by receiver
      specific implementations, but it might be a premature optimization
      for now

Change-Id: I4716fdfc3f8156ce0b7d2e8ab1af344200b417d1
2020-06-08 12:54:51 -07:00
TreeHugger Robot
4623558ea7 Merge "Camera: Fix race for onCaptureBufferLost callback" into rvc-dev am: 918942f462 am: 2d350e2983
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11510012

Change-Id: If76faca65a2ad8f75a315f7d97734e1763734ab6
2020-06-08 19:52:08 +00:00
TreeHugger Robot
918942f462 Merge "Camera: Fix race for onCaptureBufferLost callback" into rvc-dev 2020-06-08 19:28:31 +00:00
Amy Zhang
c814174383 Merge "Expose necessary SystemApi as test API for CEC CTS" into rvc-dev am: a7dc4defd3 am: 96b40c3613 am: a3521674ff am: 808115f7e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11625493

Change-Id: I9324a1eb2cbc0b07bb36f16aaf5fb67a468d6b7c
2020-06-05 03:42:43 +00:00
Amy Zhang
808115f7e8 Merge "Expose necessary SystemApi as test API for CEC CTS" into rvc-dev am: a7dc4defd3 am: 96b40c3613 am: a3521674ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11625493

Change-Id: I1f24a0a353b3c2459b5e89b5dd934ca85b748d0f
2020-06-05 03:28:02 +00:00
Amy Zhang
c7e54b5d44 Merge "Expose necessary SystemApi as test API for CEC CTS" into rvc-dev am: a7dc4defd3 am: 96b40c3613
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11625493

Change-Id: Icd3cf32f8d0460c960d54ab261e483d9c3e22064
2020-06-05 03:16:38 +00:00
Shuzhen Wang
db97350aa1 Camera: Fix race for onCaptureBufferLost callback
The callback holder was removed when the capture sequence is
completed, which is too soon because the buffer loss callback could
potentially arrives later than the capture sequence completion.

Defer the deletion of the callback holder to when the native inflight
request is removed, which takes into consideration of error
notifications.

Test: Camera CTS
Bug: 155353799
Change-Id: I12b716acc9fbaa9791f0498ac77d4470a7448d5a
2020-06-04 18:28:44 -07:00
Amy Zhang
e151e60843 Expose necessary SystemApi as test API for CEC CTS
This CL annotates multiple APIs in the HdmiControlManager as Test APIs.
Also creates a Test api wrapper for aidl interface IHdmiControlService.
HdmiPortInfo is the param under test that is also annotated as Test API.

Test: atest android.hardware.hdmi.cts
Bug: 155113872
Change-Id: I58b483eaaa5fe08f90415a7e044c30a28dc7d7c2
2020-06-04 13:47:37 -07:00
Nick Chalko
f5fee3be21 Merge "CEC: Add listener for HDMI CEC volume control feature" into rvc-dev am: 75ef06daa5 am: 1ce1702e90 am: df05db45c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11246196

Change-Id: I6f435a7ca1bc098d69cab6694f4a9d43626a9506
2020-06-04 19:41:48 +00:00
Nick Chalko
ba4ace3d63 Merge "CEC: Add listener for HDMI CEC volume control feature" into rvc-dev am: 75ef06daa5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11246196

Change-Id: I3b1ed61eba2a0bb46c5d1ac187ab0d1a42e35e73
2020-06-04 19:11:16 +00:00
Nick Chalko
75ef06daa5 Merge "CEC: Add listener for HDMI CEC volume control feature" into rvc-dev 2020-06-04 19:03:05 +00:00
TreeHugger Robot
334e2cc7bb Merge "Update tier names in biometric constants documentation" into rvc-dev am: a3aac62786 am: c3f941ef9c am: a1c38178aa am: 59f223fe42
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11711578

Change-Id: I175dd48b910b9228b9ea609c0c752338d3600eba
2020-06-03 02:19:03 +00:00
TreeHugger Robot
a1c38178aa Merge "Update tier names in biometric constants documentation" into rvc-dev am: a3aac62786 am: c3f941ef9c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11711578

Change-Id: I388f2d0dafb059e0ed430b86fbb9484620c090a1
2020-06-03 01:51:15 +00:00
TreeHugger Robot
80cafc7cb5 Merge "Update tier names in biometric constants documentation" into rvc-dev am: a3aac62786
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11711578

Change-Id: I014e4447bbdaa3b1764bcf22fe9a48234c1ae8d9
2020-06-03 01:38:11 +00:00
TreeHugger Robot
a3aac62786 Merge "Update tier names in biometric constants documentation" into rvc-dev 2020-06-03 01:25:11 +00:00
Curtis Belmonte
43825ac301 Update tier names in biometric constants documentation
Adds references to the new security tier names (Tier 1/2/3) in the
documentation for the corresponding biometric authenticator constants:
- Strong -> Tier 3
- Weak -> Tier 2
- Convenience -> Tier 1

Test: Builds
Fixes: 157266312
Change-Id: I80965e8e5c53f049d91f18f0e114d89f18593400
2020-06-02 16:58:08 -07:00
Marvin Ramin
7ddbb62ccd 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
Merged-In: I342d748114bae99b3c3f236502d73bfeac9e9ac5
2020-06-01 20:13:54 +00:00
Kevin Chyn
3609dfb444 Merge "Send callingUserId from AuthService -> BiometricServiceBase" into rvc-dev am: 20534dcc8d am: e4057a4997
Change-Id: Ib534ac9724329cbc896616a8e11577ff66265934
2020-06-01 16:16:01 +00:00
Kevin Chyn
9710f8eaab Merge "Send callingUserId from AuthService -> BiometricServiceBase" into rvc-dev am: 20534dcc8d
Change-Id: Ib44ff58a107d0e1e4c58b98f0d15234f1b2ea01c
2020-06-01 16:04:30 +00:00
Kevin Chyn
20534dcc8d Merge "Send callingUserId from AuthService -> BiometricServiceBase" into rvc-dev 2020-06-01 15:57:00 +00:00
Kevin Chyn
1a1eea681a Merge "Send callingUserId from AuthService -> BiometricServiceBase" 2020-06-01 06:07:22 +00:00
Kevin Chyn
5433cd4070 Send callingUserId from AuthService -> BiometricServiceBase
Since authenticatorIds are collected from AuthService, which is
system_server, we need to get the callingUserId before the code
enters system_server, which clears calling identity.

Test: 1) Set up work profile, install BiometricPromptDemo
      2) Enroll work profile fingerprint
      3) Open work profile version of BiometricPromptDemo
      4) Create biometric-bound keys and authenticate with fingerprint
      Before this change, key was unusable. After this change,
      the key can be used

Fixes: 157486161
Change-Id: I4ec89b9cb13caff397b1a1acd844962736290040
Merged-In: I4ec89b9cb13caff397b1a1acd844962736290040
2020-05-29 23:21:57 +00:00
Kevin Chyn
5b5662d706 Send callingUserId from AuthService -> BiometricServiceBase
Since authenticatorIds are collected from AuthService, which is
system_server, we need to get the callingUserId before the code
enters system_server, which clears calling identity.

Test: 1) Set up work profile, install BiometricPromptDemo
      2) Enroll work profile fingerprint
      3) Open work profile version of BiometricPromptDemo
      4) Create biometric-bound keys and authenticate with fingerprint
      Before this change, key was unusable. After this change,
      the key can be used

Fixes: 157486161
Change-Id: I4ec89b9cb13caff397b1a1acd844962736290040
2020-05-29 16:19:47 -07:00
Automerger Merge Worker
6ce0f51c2c Merge "Merge "add SoundTrigger TestApis" into rvc-dev am: 779a8966f5 am: 4a3d876730 am: 22064c93c0" into rvc-qpr-dev-plus-aosp am: 96bd7eaf86
Change-Id: I1de6c67456a96b86e2784e1080ebe6c5e336df7b
2020-05-29 04:02:33 +00:00
Nicholas Ambur
affe5232e7 Merge "add SoundTrigger TestApis" into rvc-dev am: 779a8966f5 am: 4a3d876730 am: 22064c93c0
Change-Id: I546a8849eedab63b712e5e39764bd1f93e40b078
2020-05-29 03:49:55 +00:00
Nicholas Ambur
94d7147f5c Merge "add SoundTrigger TestApis" into rvc-dev am: 779a8966f5 am: 4a3d876730
Change-Id: I85e7d234ed86b0da1defead4eab972c4a2bb2677
2020-05-29 03:29:46 +00:00
Nicholas Ambur
fcb6232fea Merge "add SoundTrigger TestApis" into rvc-dev am: 779a8966f5
Change-Id: I1d829629577e0516cf01fae69876a62070129cec
2020-05-29 03:19:17 +00:00
Nicholas Ambur
779a8966f5 Merge "add SoundTrigger TestApis" into rvc-dev 2020-05-29 03:17:09 +00:00
TreeHugger Robot
dd3baf3304 Merge "Generate ACTION_CANCEL event when screen turned off by proximity sensor." into rvc-dev am: aaec0d4ac3
Change-Id: Ib88a57ea042b5dd229bac8bf4f5212d8040b03fb
2020-05-28 18:40:02 +00:00
TreeHugger Robot
aaec0d4ac3 Merge "Generate ACTION_CANCEL event when screen turned off by proximity sensor." into rvc-dev 2020-05-28 18:35:08 +00:00
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
026d4bc290 Merge "Ensure Java code verifies hinge angle sensor is wakeup" into rvc-dev am: 5bc3e56a51
Change-Id: I6226b3f884e7b993a5e52515882645ddaed01c45
2020-05-28 01:04:58 +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
cde6e23dc0 Merge "Camera: Query default display size from display manager" into rvc-dev am: 4586885a63
Change-Id: Ib9b33363c36b45bbb820484a57f60c32af89b749
2020-05-21 16:21:19 +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
TreeHugger Robot
50a9cdf24f Merge "camera2: Add some more docs to getConcurrentCameraIds" into rvc-dev am: d220792d6b
Change-Id: Ife764adbf1e66057480b183d13294d6bfcb037ef
2020-05-21 00:18:40 +00: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