Commit Graph

4471 Commits

Author SHA1 Message Date
Kevin Chyn
4391c77e50 Merge changes from topic "removeall-cts" into sc-dev am: 46e3d1a3f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14024833

Change-Id: I130bad9785a02a293fde3327cff58a2e2cc86653
2021-03-30 20:33:56 +00:00
Kevin Chyn
46e3d1a3f1 Merge changes from topic "removeall-cts" into sc-dev
* changes:
  Update removeAll test path
  Make FingerprintService/FaceService less chatty
  Update removeAll path
2021-03-30 20:30:23 +00:00
Abhijoy Saha
1c357bab5c Merge "Add User ID parameter to SensorPrivacyManager API." into sc-dev am: 5c01d600cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14021320

Change-Id: I51a2fd634aad0d475a68bcd39ed7d57236b91010
2021-03-30 17:09:34 +00:00
Abhijoy Saha
5c01d600cd Merge "Add User ID parameter to SensorPrivacyManager API." into sc-dev 2021-03-30 16:48:14 +00:00
Kriti Dang
223acc74e6 Merge "Exposing public API to retrieve current setting of 'Match Content Frame Rate'." into sc-dev am: 2f0f6a3a46
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13828551

Change-Id: If21e4414be1b10a764722b9fcedd8563fffec507
2021-03-30 11:57:37 +00:00
Kevin Chyn
15e1d3f7e7 Update removeAll path
1) Make the resulting face/fingerprint can be @Nullable. Not all
   removal callers care about the template that was removed, just
   that they were all removed.

2) FingerprintService/FaceService should wait for all providers to
   finish removing before notifying the upper layer of completion

Fixes: 183758063
Test: atest CtsBiometricsTestCases, notice
      testLockoutResetRequestedAfterCredentialUnlock finishes
      10 seconds quicker now (latch in LSS doesn't time out anymore)
Change-Id: I87c50ccf5524fd5440c9a6c2c7a0fd4cc61e684d
2021-03-29 23:06:03 -07:00
Abhijoy Saha
95284cccd6 Add User ID parameter to SensorPrivacyManager API.
This will allow Car System UI to enquire about sensor privacy for
multiple users.

Bug: 182826082
Test: Manual
Change-Id: Ibc4271f095597e3cee5e61c7e930a8365b1312c8
2021-03-30 02:07:49 +00:00
Kriti Dang
518898d9e6 Exposing public API to retrieve current setting of 'Match Content Frame Rate'.
Bug: 182148347
Test: atest MatchContentFrameRateTest
Change-Id: Iaa4364fc868a712fd71a48e6efad0df05eb4a6a4
2021-03-29 16:47:24 +02:00
Kriti Dang
7010f95cb2 Hdr format settings [Backend]
Adding new APIs in display manager to get the user disabled formats, to get the formats
supported by device and get formats reported by display.

Bug: 172905874
Test: N/A
Change-Id: I58a7714f03a3e165bbd22f2fa7a021ad90b41b39
Merged-In: I58a7714f03a3e165bbd22f2fa7a021ad90b41b39
(cherry picked from commit 25f1822005)
2021-03-29 13:21:14 +00:00
Kriti Dang
e713ee6c60 Merge changes from topic "cherrypick-Display settings HDR formats-mumvl547ah" into sc-dev
* changes:
  Handling Number Format Exception in DiscreteValueIntegerListValidator
  Hdr format settings [Backend]
2021-03-28 12:25:32 +00:00
Jayant Chowdhary
50ce1a64f3 Merge "camera2: Add isUltraHighResolution() to MandatoryStreamInformation." into sc-dev am: 76f8061d34
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13984592

Change-Id: I2fb54403ece5df9b6fb98671b8615a642fc422ae
2021-03-25 21:15:38 +00:00
Jayant Chowdhary
76f8061d34 Merge "camera2: Add isUltraHighResolution() to MandatoryStreamInformation." into sc-dev 2021-03-25 20:48:51 +00:00
Kriti Dang
b4775b02a7 Hdr format settings [Backend]
Added new APIs to DisplayManager to set the user disabled HDR formats,
and get/set if user disabled formats should be ignored or not.
These new settings are stored in Settings.Global.
Modified the implementation of Display#getHdrCapabilities to not return
the formats disabled by user.

Bug: 172905874
Test: atest CtsDisplayTestCases
Change-Id: I4841af251ee0e4938614b154d0c5239814ea7cd9
Merged-In: I4841af251ee0e4938614b154d0c5239814ea7cd9
2021-03-25 12:41:35 +00:00
Kriti Dang
65bca23379 Merge "Hdr format settings [UX]" 2021-03-25 10:17:16 +00:00
Fiona Campbell
4e09a18070 Merge "Store Brightness Per Display" into sc-dev am: acc5fbcb39
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13562253

Change-Id: I3ad4774db8c45229944aacb982a78c82fea58cee
2021-03-25 09:21:56 +00:00
Fiona Campbell
acc5fbcb39 Merge "Store Brightness Per Display" into sc-dev 2021-03-25 08:40:15 +00:00
Jayant Chowdhary
ceaf98edc1 camera2: Add isUltraHighResolution() to MandatoryStreamInformation.
Bug: 152813564

Test: builds; RobustnessTest.java (basic validity)

Change-Id: I16dbf3054d3c4bc23996f6b91b5f51c29c887026
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2021-03-25 00:40:52 -07:00
TreeHugger Robot
c6f768892a Merge "Add # on comment" 2021-03-25 04:03:56 +00:00
Evan Rosky
d36f739443 Merge "Add reporting to monitor apps incorrectly using getRaw" into sc-dev am: 660eb72df8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13985963

Change-Id: Ie9c3bab2f2dfb530756de47cf8deb7106dd6ccec
2021-03-25 02:17:09 +00:00
Evan Rosky
660eb72df8 Merge "Add reporting to monitor apps incorrectly using getRaw" into sc-dev 2021-03-25 02:10:05 +00:00
Ricky Niu
b5cd69659d Add # on comment
Add # on the comment of EXTRA_ACCESSORY_HANDSHAKE_END

Bug: 181764810
Test: Build pass and Boot to home

Signed-off-by: Ricky Niu <rickyniu@google.com>
Change-Id: I3ee0c067609817f94093cb8a726aba0be0f2dfe0
2021-03-25 01:46:50 +00:00
Jayant Chowdhary
89d04a1aa9 Merge "camera2: Add support for quad bayer sensors." into sc-dev am: fc314c712b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13500401

Change-Id: I7b4c54b320b7f0ea8136f044c46fa46768f656aa
2021-03-24 21:55:20 +00:00
Jayant Chowdhary
fc314c712b Merge "camera2: Add support for quad bayer sensors." into sc-dev 2021-03-24 21:37:01 +00:00
Fiona Campbell
9320191858 Store Brightness Per Display
This changes stores a brightness value per display.

Add brightness value item to persistent data store.
Add BrightnessSettingController to save and retrieve brightnesses.
It is indexed by primary display device of the concerned logical display.
Add method in DisplayManager to expose this.

Bug: 176985835
Bug: 147415200
Bug: 175286226

Test: manual, check "adb shell dumpsys display | grep -A10 Persistent" shows brightness values for each display attached.
Change-Id: Ib8557f8a0f45a5bfb0810967f678015d3f121bb9
2021-03-24 19:34:36 +00:00
Evan Rosky
8b82086722 Add reporting to monitor apps incorrectly using getRaw
getRawX/Y are implementation specific and are always display
relative. If any apps are using this, they should stop unless
the app is specifically trying to handle raw events.

Usage of getRaw will break under: multi-window, size-compat,
letterbox, display-areas, and independent window rotation.

Bug: 179274888
Test: adb shell dumpsys platform_compat
Change-Id: I2d87d0a62d7a28e15811dda7f9d16996e8159f69
2021-03-24 12:17:02 -07:00
Kriti Dang
25f1822005 Hdr format settings [UX]
Adding new APIs in display manager to get the user disabled formats, to get the formats
supported by device and get formats reported by display.

Bug: 172905239
Test: N/A
Change-Id: I58a7714f03a3e165bbd22f2fa7a021ad90b41b39
2021-03-24 17:01:54 +00:00
Kriti Dang
9abafa09f6 Merge "Hdr format settings [Backend]" 2021-03-24 15:54:18 +00:00
Jayant Chowdhary
a69b1bc58b camera2: Add support for quad bayer sensors.
Bug: 152813564

Test: Camera CTS

Change-Id: Ia598aa39768e5f1e7f60705f190be4122fedbe51
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2021-03-24 04:22:54 -07:00
Kriti Dang
4f7df5b8aa Hdr format settings [Backend]
Added new APIs to DisplayManager to set the user disabled HDR formats,
and get/set if user disabled formats should be ignored or not.
These new settings are stored in Settings.Global.
Modified the implementation of Display#getHdrCapabilities to not return
the formats disabled by user.

Bug: 172905874
Test: atest CtsDisplayTestCases
Change-Id: I4841af251ee0e4938614b154d0c5239814ea7cd9
2021-03-23 18:10:34 +01:00
Ricky Niu
5973d3cf85 Modify the EXTRA_ACCESSORY_HANDSHAKE_END description
More description of "EXTRA_ACCESSORY_HANDSHAKE_END" to let
people understand.

Bug: 181764810
Test: Build and Boot to home

Signed-off-by: Ricky Niu <rickyniu@google.com>
Change-Id: Ic4cc2bd53bb3c5613893fdf1a4c4e5ed89365144
2021-03-22 07:55:13 +00:00
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