Commit Graph

4441 Commits

Author SHA1 Message Date
TreeHugger Robot
2a95b38c37 Merge "Fix ContextHubManager docs" into sc-dev am: 54580409da
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13921507

Change-Id: Ie0bb66e38c6378c18da9d1233f51cfd440aa5595
2021-03-19 22:10:05 +00:00
TreeHugger Robot
4bcba57a8d Merge "Add nullability annotations and imports" into sc-dev am: 3d345db0a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13931662

Change-Id: I6ed7c3fb64569b5eeba01675160032fd70898ece
2021-03-19 22:09:41 +00:00
TreeHugger Robot
54580409da Merge "Fix ContextHubManager docs" into sc-dev 2021-03-19 22:08:13 +00:00
TreeHugger Robot
3d345db0a4 Merge "Add nullability annotations and imports" into sc-dev 2021-03-19 22:00:53 +00:00
Shuzhen Wang
3e10cef517 Merge "Camera: Fix a removal-while-iterate bug" am: 171249e857 am: f1f504042a am: 7b8379f55d am: 71ca7dff7e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1643703

Change-Id: I8a16120f2592327690e394e453f5e6223b8e7444
2021-03-19 20:36:06 +00:00
Shuzhen Wang
71ca7dff7e Merge "Camera: Fix a removal-while-iterate bug" am: 171249e857 am: f1f504042a am: 7b8379f55d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1643703

Change-Id: I16a4e5430872102f2650845d29f4a7ee7a4c7580
2021-03-19 20:20:07 +00:00
Haining Chen
18e3b6aa9c Add nullability annotations and imports
Bug: 156024031

Test: m -j
Test: atest com.android.server.biometrics
Test: atest com.android.systemui.biometrics
Test: atest CtsBiometricsTestCases
Change-Id: I46a38b6c02452a77c65c3bcb707c5db31c3a4ece
2021-03-19 12:43:57 -07:00
Shuzhen Wang
7b8379f55d Merge "Camera: Fix a removal-while-iterate bug" am: 171249e857 am: f1f504042a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1643703

Change-Id: Ib5a8d564723118065ef7a2b9e971f588f086ea2f
2021-03-19 19:35:38 +00:00
TreeHugger Robot
60034b9dad Merge "Add eventMask to DM.registerDisplayListener" into sc-dev am: c3acebab45
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425145

Change-Id: Iffd3fa18180861c8a55332123ee2e0e60b037604
2021-03-19 17:46:23 +00:00
Kevin Chyn
d09c443146 Merge "Add BiometricPrompt.Builder#setAllowBackgroundAuthentication TestApi" into sc-dev am: 2fc40ea719
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13920971

Change-Id: I638b532b23bed81721b6745ad29a4091e3ecc08c
2021-03-19 17:42:19 +00:00
TreeHugger Robot
c3acebab45 Merge "Add eventMask to DM.registerDisplayListener" into sc-dev 2021-03-19 17:39:54 +00:00
Kevin Chyn
2fc40ea719 Merge "Add BiometricPrompt.Builder#setAllowBackgroundAuthentication TestApi" into sc-dev 2021-03-19 17:26:18 +00:00
Anthony Stange
dc7c374c62 Fix ContextHubManager docs
EXTRA_CLIENT_AUTHORIZATION_STATE currently wouldn't have its docs
generated correctly (if they ever need to be). Modify the doc comment to
properly link to the authorization state constants.

Fixes: 181350428
Test: presubmits
Change-Id: Ieee8ecbc4af153e4f42bb47c734c4f042361b332
2021-03-19 16:53:17 +00:00
Marin Shalamanov
204eba6cdc Add eventMask to DM.registerDisplayListener
Add a new parameter to DisplayManager.registDisplayListener
which clients can use to specify in which events
they are interested.

Test: atest DisplayManagerServiceTest
      atest DisplayManagerGlobalTest

Bug: 171240622
Change-Id: Icc71bdd9ddb390bc5406b298a557c84194a53c00
2021-03-19 16:15:11 +01:00
Haining Chen
687a1bfcba Merge "Add biometric component info and face type into SensorPropertiesInternal" into sc-dev am: 82a38b099e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13793823

Change-Id: I32943a83c6da27d83702cc85b69b00dc48fa44c7
2021-03-19 04:02:57 +00:00
Haining Chen
82a38b099e Merge "Add biometric component info and face type into SensorPropertiesInternal" into sc-dev 2021-03-19 03:49:10 +00:00
Kevin Chyn
8115bfc791 Add BiometricPrompt.Builder#setAllowBackgroundAuthentication TestApi
By default, auth via BiometricPrompt is not allowed unless the
caller is foreground. However, for cases like CTS, which may request
auth from the test itself (and not a test activity, which has no
way of getting access to protected TestApis), auth is requested
from background.

This would also allow us to easily add regression tests for the
security bug b/159249069

Bug: 163058911
Test: atest CtsBiometricsTestCases
Test: atest com.android.server.biometrics
Change-Id: I74bfdcd7989aa9256d1bf10eefae354983b42e6c
2021-03-18 18:52:00 -07:00
Shuzhen Wang
307180a14a Merge "Camera: Fix a doc typo" into sc-dev am: 6001ff0cd1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13921466

Change-Id: I45ca4878d8401fe86a0e4954f6a77bf4dfe760de
2021-03-19 00:09:44 +00:00
Kevin Chyn
9f8ed88855 Merge "Add BiometricPrompt.Builder#setAllowedSensorIds TestApi" into sc-dev am: be59c0b015
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13911582

Change-Id: I8f2ad3f678af159ae2a62259cbf5a2d365efc0c2
2021-03-19 00:08:00 +00:00
Shuzhen Wang
6001ff0cd1 Merge "Camera: Fix a doc typo" into sc-dev 2021-03-18 23:59:21 +00:00
Kevin Chyn
be59c0b015 Merge "Add BiometricPrompt.Builder#setAllowedSensorIds TestApi" into sc-dev 2021-03-18 23:55:00 +00:00
Ilya Matyukhin
4b4189d5d7 Merge changes from topic "implement-lhbm" into sc-dev am: 2ce0a3739d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13887026

Change-Id: I9e9c20bebaa8bdae13f085b523dd36eed7b975c2
2021-03-18 22:21:22 +00:00
Ilya Matyukhin
2ce0a3739d Merge changes from topic "implement-lhbm" into sc-dev
* changes:
  Introduce IUdfpsHbmListener
  Implement LHBM/GHBM switch
2021-03-18 21:27:21 +00:00
Kevin Chyn
f8e775a357 Add BiometricPrompt.Builder#setAllowedSensorIds TestApi
Bug: 163058911
Test: atest CtsBiometricsTestCases
Change-Id: I7007e6f9803051b43d4d4909e210f3b6013b5538
2021-03-18 12:58:10 -07:00
Shuzhen Wang
2146f286b1 Camera: Fix a doc typo
Test: Build
Bug: 183123446
Change-Id: Ie6aebab3164a43df3851a677b43462753f780916
2021-03-18 18:59:05 +00:00
Anthony Stange
5c1a3ee227 Merge "Modify logic handling denied auth state" into sc-dev am: 07033a219d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13840986

Change-Id: Id6ea9a29205d26c2e89e738fd87376dd7f322d5a
2021-03-18 16:33:26 +00:00
Anthony Stange
07033a219d Merge "Modify logic handling denied auth state" into sc-dev 2021-03-18 16:24:01 +00:00
Ilya Matyukhin
0f75ed396f Introduce IUdfpsHbmListener
Bug: 181682258
Test: atest CommandQueueTest
Change-Id: Ia03b845ff036d7267a5dfb5691da33562fda2aab
2021-03-18 12:38:08 +00:00
Kevin Chyn
7a321839c9 Merge "Biometric time-based resetLockout for multi-biometric devices" into sc-dev am: f8ec6f3881
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13891796

Change-Id: I8a1f9289820b7156f46827070ad65577a0eb689e
2021-03-18 07:00:30 +00:00
Kevin Chyn
f8ec6f3881 Merge "Biometric time-based resetLockout for multi-biometric devices" into sc-dev 2021-03-18 06:49:37 +00:00
Kevin Chyn
42968075d6 Biometric time-based resetLockout for multi-biometric devices
On devices with multiple sensors, lockout should be reset whenever
any strong sensor authenticates.

Bug: 163058911
Test: atest CtsBiometricsTestCases

Change-Id: I4bcdc0279cdaa444e59cf0fac6645d9a67e7d11d
2021-03-17 21:45:42 -07:00
TreeHugger Robot
393b76cb25 Merge "Camera: Address some API review comments for MultiResolutionImageReader" into sc-dev am: 010c5bab26
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13907091

Change-Id: I6f1493351bf220a17235085355e329d03483cc47
2021-03-18 03:43:12 +00:00
Shuzhen Wang
3759c1623d Camera: Fix a removal-while-iterate bug
The onStatusChangedLocked removes entries from the ArrayMap. Needs to
iterate in the reverse order.

Test: Vendor testing
Bug: 182876702
Change-Id: I5891f24a25c83f096d23ca5675126889a7d2a61c
2021-03-17 16:56:43 -07:00
Haining Chen
d04a1619c0 Add biometric component info and face type into SensorPropertiesInternal
Bug: 156024031

Test: m -j test-api-stubs-docs-non-updatable-update-current-api
Test: m -j
Test: atest com.android.server.biometrics
Test: atest com.android.systemui.biometrics
Change-Id: I527713b6c87a3d49e28aed09ed6c74df4b5db175
2021-03-17 16:10:18 -07:00
Shuzhen Wang
4683b6b8e8 Camera: Address some API review comments for MultiResolutionImageReader
- Remove MultiResolutioImageReader.newInstance. Use constructor instead.
- Add IntRange annotation in MultiResolutionStreamInfo class.

Test: Build
Bug: 182370111
Bug: 182914897
Change-Id: Ic711750fbaa433f3392b4eafa91e240518b19586
2021-03-17 23:01:06 +00:00
Anthony Stange
ef7bb78612 Modify logic handling denied auth state
To mesh with how other parts of the framework handle apps using APIs
when they are denied, ContextHubClientBroker should throw a security
exception when clients are in the denied authorization state rather than
returning a new error code. This is only enabled for clients targeting
S+. All other clients will receive an error code present before S
denoting an unknown error occurs so that they don't have to handle a new
exception.

Fixes: 181350407
Test: Run PTS
Change-Id: Icf828bb1c34797cf2c65a8adeb92eb83db3aaea6
2021-03-17 13:43:16 +00:00
Fiona Campbell
b644c820a5 Merge "Add DisplayId to BrightnessTracker" into sc-dev am: 47f60213ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13772826

Change-Id: I520864b17dafe32458ee3de29c04a5ae0615000c
2021-03-16 09:05:34 +00:00
Fiona Campbell
47f60213ec Merge "Add DisplayId to BrightnessTracker" into sc-dev 2021-03-16 08:29:12 +00:00
Kevin Chyn
f7957561dc Merge changes from topic "s-resetlockout-update" into sc-dev am: d4481aeca1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13882028

Change-Id: Ia030aa971e4d03cdb5960c273834f4439348b24f
2021-03-16 06:09:53 +00:00
Kevin Chyn
a372cb1c84 Add resetLockoutRequiresChallenge property
IFace and IFingerprint AIDL interfaces do not require challenge
for resetLockout. Rather, they are time-based. See the HAL interface
for more details.

Bug: 182327296
Test: reset lockout on Pixel4
Test: atest com.android.systemui
Test: atest com.android.server.biometrics
Change-Id: Ibf1130d77e714d15fb9eccd3175027a28de08f7b
2021-03-15 19:14:34 -07:00
Kevin Chyn
dd77d27c13 Update lockout-related properties for easier understandability
1) resetLockoutRequiresHardwareAuthToken is moved to the base
   SensorPropertiesinternal class, despite face always requiring
   it. This will be clearer, since we are further splitting
   resetLockout logic into "challenge-required" (IBiometricsFace@1.0)
   and "challenge-less" (IFace@1.0) It would be weird to have
   a "resetLockoutRequiresChallenge" property without a
   "resetLockoutRequiresHardwareAuthToken" property.

2) Will be adding a resetLockoutRequiresChallenge to
   SensorPropertiesInternal in the next CL.

Bug: 182327296
Test: reset lockout on Pixel4
Change-Id: Ifa4b36dc42d91e967506a59d2880f47f61ec6cdf
2021-03-15 16:56:04 -07:00
Fiona Campbell
69a1db09f9 Add DisplayId to BrightnessTracker
BrightnessTracker is now global.
Pass in the physicaldisplayid of the primary display device of the
logical display that the display power controller is associated with.
This is so that we can determine the brightness changes for each
physical screen.

Bug: 181767734
Test: manual
Change-Id: Iaebb12ec5fe7785545374cc639d7a345ca469db8
2021-03-15 10:55:36 +00:00
Anh Pham
b40b75a5b0 Merge "Fix a typo in the word "permission"." into sc-dev am: f66ec9e50d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13827976

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id616c0e4c4ed277e1d7c5f88a5d99dc98b826809
2021-03-12 08:43:30 +00:00
Anh Pham
f66ec9e50d Merge "Fix a typo in the word "permission"." into sc-dev 2021-03-12 08:34:38 +00:00
TreeHugger Robot
5d83b6a445 Merge "Add SensorPrivacyManagerInternal api for system server usage" into sc-dev am: 706c23e63f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13546387

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2d96cc58b7530242ef86301b1c4171d0e2427d87
2021-03-12 04:26:56 +00:00
Anthony Stange
2980ee7de3 Merge "Clear up authorization state docs" into sc-dev am: 8a9a69da98
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13840985

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If3789680bd64784392af3583bc357cd7210e4036
2021-03-12 04:16:49 +00:00
TreeHugger Robot
706c23e63f Merge "Add SensorPrivacyManagerInternal api for system server usage" into sc-dev 2021-03-12 01:38:39 +00:00
Evan Severson
57edea38ad Add SensorPrivacyManagerInternal api for system server usage
This adds calls that are easier to use for services and providers which
may multiuser aware.

Bug: 162549680
Test: Added callback to another service

Change-Id: Ie8c5c046cd31ae82b89206849a8983d60f0d66c5
2021-03-11 13:49:59 -08:00
Anthony Stange
8dd9281195 Clear up authorization state docs
- Indicates which int values can be sent via the
EXTRA_CLIENT_AUTHORIZATION_STATE extra

- Explicitly mentions how much time clients have to clean up their state
with a nanoapp so there's no ambiguity.

Fixes: 181350428
Test: presubmits
Change-Id: Id39c233b8678450e3c7687ed2bcb1c1f4516f8d7
2021-03-11 17:39:05 +00:00
Michal Olech
bafe0c9c2a Merge "[CEC Configuration] Add @SystemApi for all remaining settings" into sc-dev am: 9a49890e69
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13815985

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifc6c42648e6e42a021d77295536ef05748665698
2021-03-11 15:56:03 +00:00