Commit Graph

3815 Commits

Author SHA1 Message Date
Charles Chen
8f6b6dffe7 Merge "Trust System UI owned display to receive keys" into rvc-dev am: 94deecfda2 am: d09b0f10bf am: 8fccd6e144 am: a7050e9667
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11570100

Change-Id: I6fcea62dffe51d3cbc522beb8e63e90ab27fb6d1
2020-06-16 14:56:54 +00:00
Charles Chen
a7050e9667 Merge "Trust System UI owned display to receive keys" into rvc-dev am: 94deecfda2 am: d09b0f10bf am: 8fccd6e144
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11570100

Change-Id: I75db01ccbe3e051b0fe21522efe771387632e31f
2020-06-16 14:37:56 +00:00
Charles Chen
b28fb721f5 Trust System UI owned display to receive keys
A11y service cannot get focus of bubbles because it's not a
System owned display. This patch makes System UI owned display
a trusted display. Moreover, this patch refactors the logic to
identify a trusted display by introducing FLAG_TRUSTED and
removes the trusted display check along with supportsSystemDecorations()
because the check has been included in supportsSystemDecorations().

fixes: 155823002
Bug: 152416787
Test: atest DisplayContentTests
Test: atest WindowFocusTests
Test: atest TaskDisplayAreaTests
Test: atest MultiDisplaySystemDecorationTests
Test: atest DisplayTest
Change-Id: Ie684c6488904e5aa8cae166a455c6d55455e5f55
2020-06-16 02:10:21 +08:00
Ytai Ben-tsvi
037429a71a Merge changes Ibf4ecdb4,I1e4adf9f into rvc-dev am: 3917b729a6 am: 0cc8dbca10 am: e637e1212b am: ed1835f3b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11815381

Change-Id: I6827e6a7aa16ea1a21d79a2cf9c0a45f9fe85173
2020-06-10 20:03:59 +00:00
Ytai Ben-tsvi
ed1835f3b0 Merge changes Ibf4ecdb4,I1e4adf9f into rvc-dev am: 3917b729a6 am: 0cc8dbca10 am: e637e1212b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11815381

Change-Id: I46357e2d4872ef2346177be8df155fd91d22f26b
2020-06-10 19:48:05 +00:00
Ytai Ben-tsvi
3917b729a6 Merge changes Ibf4ecdb4,I1e4adf9f into rvc-dev
* changes:
  Correctly propagate service state change
  Support null audio format in recognition event
2020-06-10 19:31:42 +00:00
TreeHugger Robot
e0e12b18e2 Merge "Camera: clarify eviction behavior within the same application" into rvc-dev am: 8aa60f69e9 am: aa254d926e am: 422cf7af19 am: 733003e74a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11798679

Change-Id: I37e9d67601b2b4fbeef2434f226a5a61db44424e
2020-06-10 18:52:33 +00:00
TreeHugger Robot
aa254d926e Merge "Camera: clarify eviction behavior within the same application" into rvc-dev am: 8aa60f69e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11798679

Change-Id: I02b9837b7d6ecbcd86c102e83eba1c790918e3d8
2020-06-10 18:25:49 +00:00
TreeHugger Robot
8aa60f69e9 Merge "Camera: clarify eviction behavior within the same application" into rvc-dev 2020-06-10 18:17:42 +00:00
TreeHugger Robot
01f6702064 Merge "Revert "Camera: Fix race for onCaptureBufferLost callback"" into rvc-dev am: a27465258a am: 7fbce095b3 am: 929d7d9b2e am: b2b6bd3154
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818440

Change-Id: I681b4aba2a250d585805532546f6cacb284727ee
2020-06-10 17:39:24 +00:00
TreeHugger Robot
b2b6bd3154 Merge "Revert "Camera: Fix race for onCaptureBufferLost callback"" into rvc-dev am: a27465258a am: 7fbce095b3 am: 929d7d9b2e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818440

Change-Id: I1a8db46ab0c7cd48d0d764fa36f04fcec7dd3f79
2020-06-10 17:21:07 +00:00
TreeHugger Robot
f7f596f902 Merge "Revert "Camera: Fix race for onCaptureBufferLost callback"" into rvc-dev am: a27465258a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818440

Change-Id: Ia5c7fc3891176b2c0a0de7576ec58ff57f5f0bed
2020-06-10 16:49:04 +00:00
TreeHugger Robot
a27465258a Merge "Revert "Camera: Fix race for onCaptureBufferLost callback"" into rvc-dev 2020-06-10 16:33:37 +00:00
Greg Kaiser
22abb8d0c1 Revert "Camera: Fix race for onCaptureBufferLost callback"
Revert submission 11415576-bufferErrorLossFix

Reason for revert: Breaks Camera on at least the wembley device
Reverted Changes:
I12b716acc:Camera: Fix race for onCaptureBufferLost callback
I43f0f5ea1:Camera: Add lastCompletedFrameNumber in CaptureRes...

Bug: 158622719
Change-Id: Id95d0f157c0f940cc80d0fb3c8f95d62968a4745
Test: Locally tried this revert on rvc-dev on a wembley, and now the Camera works
2020-06-10 05:41:44 +00:00
Ytai Ben-Tsvi
46d87b7927 Correctly propagate service state change
Due to a surprising behavior of Handler.obtainMessage(), the argument
that indicated whether the service is available was always read as 0
(enabled), and we never correctly handled the service being
unavailable (due to concurrent capture).

Bug: 157496890
Test: Enabled debug logging and verified that the message is now
      passed correctly and that indeed that models get inactivated
      when capture starts and reactivated when it stops.
Change-Id: Ibf4ecdb4e4dd0f5a02d5a388afddb205c29eb2ea
2020-06-09 16:05:25 -07:00
Ytai Ben-Tsvi
7caef40ad0 Support null audio format in recognition event
The audio format doesn't always make sense in recognition events, for
example in a failure or abort event, so we allow it to be null.
However since the SoundTrigger.java API doesn't allow that, we inject
a default if it is not available.

Bug: 157496890
Test: Simulated a device that doesn't support concurrent capture,
      reproduced the bug, applied the fix, verified.
Change-Id: I1e4adf9f3ccdc0f62cb9ca5e8c07df3c40a9d2cd
2020-06-09 16:05:19 -07:00
Yin-Chia Yeh
92256e773a Camera: clarify eviction behavior within the same application
Test: build (doc only change)
Bug: 153699385
Change-Id: Ic2d9a72e9aad71f4b47583900f1093a1c7a0f4f8
2020-06-09 14:31:46 -07:00
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
6732f25854 Merge "Camera: Fix race for onCaptureBufferLost callback" into rvc-dev am: 918942f462
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11510012

Change-Id: Idb2078674c06125f282668c7862fdb5d1b791467
2020-06-08 19:41:23 +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
Amy Zhang
023916bd8a Merge "Expose necessary SystemApi as test API for CEC CTS" into rvc-dev am: a7dc4defd3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11625493

Change-Id: If1355f8fceabcccabaf0dc9abe299112123a40b1
2020-06-05 02:56:27 +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