Commit Graph

4741 Commits

Author SHA1 Message Date
TreeHugger Robot
753551584c Merge "Camera: Pass an executor during the extension characteristics service bind call" into sc-dev am: 4ed9ab51ff am: e3cc783db2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14986715

Change-Id: I28b9a861a7754ea8934fba0f9e660eda1eb4bf83
2021-06-18 00:23:03 +00:00
Santos Cordon
db64f5a835 Merge "Specify refresh rate limits for sensors in config." into sc-dev am: fa51515513 am: 396f8e782b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14690890

Change-Id: Iea74b7724eed6a3e1225c47ddd026fa05ee27a44
2021-06-18 00:22:52 +00:00
TreeHugger Robot
4ed9ab51ff Merge "Camera: Pass an executor during the extension characteristics service bind call" into sc-dev 2021-06-18 00:15:36 +00:00
Santos Cordon
fa51515513 Merge "Specify refresh rate limits for sensors in config." into sc-dev 2021-06-18 00:05:09 +00:00
Diego Wilson
1174850c9e Merge "Add an option for vendors to provide a camera extensions proxy" into sc-dev am: b4d7c251cd am: 478ccaa781
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15001230

Change-Id: Iec7c56412d3f5c5fabe3482eaae3a80da0dfa0f1
2021-06-17 23:43:16 +00:00
TreeHugger Robot
785f8a95db Merge "Camera: Pass targetSdkVersion to camera service APIs" into sc-dev am: 59239bf794 am: 7a5a5a9336
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14801971

Change-Id: I820cfee4ee45a92941e8c9138efeff4ec42784e2
2021-06-17 23:27:10 +00:00
Diego Wilson
b4d7c251cd Merge "Add an option for vendors to provide a camera extensions proxy" into sc-dev 2021-06-17 23:16:34 +00:00
TreeHugger Robot
59239bf794 Merge "Camera: Pass targetSdkVersion to camera service APIs" into sc-dev 2021-06-17 22:51:39 +00:00
Karthik Bharadwaj
691d97ef27 Merge "Update code comments to mention sensor name uniqueness." into sc-dev am: 5f9e20b375 am: 072f70d5ad am: 390299060e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14987633

Change-Id: I88aa3aa2053e211ff387652a8ebc542d28fbb2c7
2021-06-17 22:01:35 +00:00
Karthik Bharadwaj
5f9e20b375 Merge "Update code comments to mention sensor name uniqueness." into sc-dev 2021-06-17 21:41:18 +00:00
Santos Cordon
8a3115ba6e Specify refresh rate limits for sensors in config.
Some sensors can limit the range of supported refresh rate when
enabled. This change adds a way to specify that limit withing the
display device config file.

Bug: 175793106
Test: Verify that when sensor is enabled, there is an additional
      refresh rate vote for the rate specified in config file.
Test: atest DisplayModeDirectorTest, LocalDisplayAdapterTest
Change-Id: Id210c25fe56cd5353a2436b9b97f2ad01980e465
2021-06-17 21:34:05 +01:00
Diego Wilson
f10bf6d66e Add an option for vendors to provide a camera extensions proxy
Test: build and run Camera2ExtensionsBasic
Bug: 183533362
Change-Id: I250db33288f62808a9a8d883c0a5f27e9c425f6e
2021-06-17 19:55:02 +00:00
karthik bharadwaj
8f886322ae Update code comments to mention sensor name uniqueness.
Bug: 179076515
Test: N/A
Change-Id: I906000864a14acd1dcd364ad71c4dde5233dd700
2021-06-17 12:18:48 -07:00
Kevin Chyn
8a4df4ade3 Merge "Add BiometricActionDisabledByAdminController" into sc-dev am: c3e64b14c5 am: 2fe7d4ebed
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14972616

Change-Id: I4c6c7b65a994b9e2be0e46b39b9d899dc7aed28a
2021-06-17 02:13:43 +00:00
Kevin Chyn
c3e64b14c5 Merge "Add BiometricActionDisabledByAdminController" into sc-dev 2021-06-17 01:27:03 +00:00
Kevin Chyn
4e84b8849a Add BiometricActionDisabledByAdminController
1) Adds UserManager#DISALLOW_BIOMETRIC. We actually need to
   pass a restriction from settings to ActionDisabledByAdmin area,
   otherwise the biometric-specific dialog would be shown outside of
   biometric flows.
2) Adds an interface to ActionDisabledByAdminController to return a
   optional OnClickListener for the positive dialog button
3) Returns an instance of the biometric controller when conditions
   are met
4) Adds string interfaces to DeviceAdminStringProvider to retrieve
   biometric-specific strings

Bug: 188847063
Bug: 191306258
Test: manual

Change-Id: Iaeffdeb1336d5db56d464104cdc7677b9021f609
2021-06-16 16:41:14 -07:00
Kevin Chyn
e9a4e63f1b Merge "Refactor/Move isTestModeEnabled to frameworks/base" into sc-dev am: 5c7cdbb8f5 am: 0fbe35e895
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14984518

Change-Id: I08e95bddab4d70fe163f092a972f66add9952c85
2021-06-16 08:10:25 +00:00
Kevin Chyn
5c7cdbb8f5 Merge "Refactor/Move isTestModeEnabled to frameworks/base" into sc-dev 2021-06-16 07:55:01 +00:00
Kevin Chyn
c595da470a Merge "Move non-settings-specific logic to frameworks/base" into sc-dev am: ffc5989fd3 am: acf7ff5b9b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14972615

Change-Id: Ic026341c33aca987cf97b5f1cc3f0b9f6bb55ea7
2021-06-16 06:47:10 +00:00
Kevin Chyn
ffc5989fd3 Merge "Move non-settings-specific logic to frameworks/base" into sc-dev 2021-06-16 06:13:17 +00:00
Kevin Chyn
c0c3e583c1 Refactor/Move isTestModeEnabled to frameworks/base
ActionDisabledByAdminControllerFactory is also in frameworks/base,
and should take test mode into consideration.

Bug: 188847063
Test: atest ParentalControlsUtilsTest
Change-Id: I0195478606361aa8b6406376d96b2fc219d9cc4d
2021-06-15 17:14:49 -07:00
Emilian Peev
0b0c9dc844 Camera: Pass an executor during the extension characteristics service bind call
Camera extensions characteristics will bind to the camera extensions
proxy service without passing a dedicated executor for the connection
callbacks. In this case, the callbacks will be called in the main thread
which can be problematic for clients using the same thread.

Bug: 191192317
Test: Camera CTS
Change-Id: Ic952edd766d26016b6203c84d067a6b1061ed090
2021-06-15 16:14:46 -07:00
Kevin Chyn
e35911fad6 Move non-settings-specific logic to frameworks/base
The dialog that's shown when admin disables functionality lives in
frameworks/base. This change extracts common logic required there
into frameworks/base.

Bug: 188847063
Test: atest ParentalControlsUtilsTest
Change-Id: I9aa9f5664e04a226d2c30a72585bebeb8645494b
2021-06-15 12:02:31 -07:00
TreeHugger Robot
6898d236cd Merge "Disable screenOffUdfps by default" into sc-dev am: 39e1e04a04 am: 83fe2b3337
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14922213

Change-Id: I8d88f6f8ed6a1cc72590f154234c3e081697f4e4
2021-06-15 18:02:50 +00:00
TreeHugger Robot
b8266fd891 Merge "Camera: Add black test pattern mode for privacy" into sc-dev am: 280db03351 am: ee9ce5d3c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14752379

Change-Id: If835d09ddbf4664b867b181c84fd3a6922bd65ab
2021-06-15 18:01:56 +00:00
TreeHugger Robot
39e1e04a04 Merge "Disable screenOffUdfps by default" into sc-dev 2021-06-15 17:42:50 +00:00
TreeHugger Robot
280db03351 Merge "Camera: Add black test pattern mode for privacy" into sc-dev 2021-06-15 17:29:19 +00:00
Jayant Chowdhary
312f0700e8 Merge changes from topic "OutputConfigurationParcel" into sc-dev am: a0c39535ac am: f346681d78
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14925783

Change-Id: Ibbbed2de54f38d3f285042f1b791fffc26324f84
2021-06-15 00:59:19 +00:00
Jayant Chowdhary
a0c39535ac Merge changes from topic "OutputConfigurationParcel" into sc-dev
* changes:
  OutputConfiguration: fix CREATOR readList for sensor pixel modes.
  camera2: Fix exception swallowing in params classes createFromParcel
2021-06-15 00:49:30 +00:00
TreeHugger Robot
156ae76d66 Merge "Camera: Various Camera2 extension updates" into sc-dev am: 88be1435e1 am: 25bdff4280
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14630851

Change-Id: Iad99022e397b8520f51099a77638a18e4e1293fb
2021-06-14 18:50:31 +00:00
TreeHugger Robot
88be1435e1 Merge "Camera: Various Camera2 extension updates" into sc-dev 2021-06-14 18:29:34 +00:00
Anh Pham
e72e532ce7 Merge "Throw Exception only if sensors are in capped set." into sc-dev am: e55a9d9036 am: 110823e72b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14934050

Change-Id: I7f00cb1f52823976ec4509da0cf877a5963ea0a0
2021-06-14 08:32:26 +00:00
Anh Pham
e55a9d9036 Merge "Throw Exception only if sensors are in capped set." into sc-dev 2021-06-14 08:04:42 +00:00
Ady Abraham
85931c9286 Merge changes I77ca4305,Ia0278e98 into sc-dev am: 1a49d4f799 am: 539d2a22f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14891094

Change-Id: Ib358d56402f4520122c75c30a132260d5db43591
2021-06-11 20:45:46 +00:00
Shuzhen Wang
0317ae8469 Camera: Pass targetSdkVersion to camera service APIs
This is needed to filter out small JPEG sizes based on targetSdkVersion
to maintain backward compatibility.

Test: Camera CTS
Bug: 187913092
Change-Id: I75bbb4d6130df62c32b01de862ad1b79fcdb7b63
2021-06-11 12:14:05 -07:00
Ady Abraham
00eb127ef0 Don't call setFrameRate if refresh rate switching is disabled
When refresh rate switching is set to SWITCHING_TYPE_NONE, DisplayManager
limits the refresh rate to a single value. Calling setFrameRate to SF
is redundant and causes unnecessary duplicate events.

Bug: 189174620
Bug: 189191861
Test: atest SetFrameRateTest
Test: atest FrameRateOverrideHostTest
Test: atest ChoreographerNativeTest
Test: atest FrameRateSelectionPriorityTests
Change-Id: I77ca430555c57c13a6e36707b344537deee5c2d7
2021-06-11 15:30:20 +00:00
Ady Abraham
71b6267599 DisplayManagerGlobal: suppress redundant AChoreographer_refreshRateCallback calls
With Frame Rate Override enabled, an app could get an
AChoreographer_refreshRateCallback callbacks which seem redundant.
An example would be:
1. Display changed refresh rate to 60Hz - callback
2. App's frame rate override changed to 60Hz - callback

To avoid sending these redundant callbacks, DisplayManagerGlobal caches
the last DisplayInfo that was reported to the app and based on it, it
decides whether to send the event or not.

Bug: 184588343
Bug: 189174620
Test: atest SetFrameRateTest
Test: atest FrameRateOverrideHostTest
Test: atest ChoreographerNativeTest
Change-Id: Ia0278e98d06bc790810c31dcda8244181e8e1d5d
2021-06-11 15:30:13 +00:00
Anh Pham
e8d18853de Throw Exception only if sensors are in capped set.
Test: atest CtsSensorTestCases CtsSensorRatePermissionTestCases
Bug: 190567703
Change-Id: Ic35228c1d2e244c2dcaf252ae106f5d4f693b35b
2021-06-11 16:17:18 +02:00
Jayant Chowdhary
ebbb0ce800 OutputConfiguration: fix CREATOR readList for sensor pixel modes.
OutputConfiguration uses writeIntArray in writeToParcel. It must use
readIntArray in createFromParcel instead of readList.

Bug: 188675581

Test: Sample app which tries to write invalid data into an
      OutputConfiguration parcel. When read again, the exception is
      thrown and not swallowed.

Test: create OutputConfiguration; add certain sensorPixelModes;
      writeToParcel; set parcel's data position to 0; create
      OutputConfiguration from same parcel and read sensor pixel modes.
      They match.

Change-Id: Id50396d328ba6fc830012a1c359934cf82249764
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2021-06-10 23:52:37 -07:00
Jayant Chowdhary
6b0bcd60c8 camera2: Fix exception swallowing in params classes createFromParcel
Do not catch exceptions when we attempt to create the following classes
from a parcel
- OutputConfiguration
- VendorTagDescriptor
- VendorTagDescriptorCache
- SessionConfiguration
This could cause subsequent parcel information to be read incorrectly.

Bug: 188675581

Test: Sample app which tries to write invalid data into an
      OutputConfiguration parcel to send in an intent via Broadcast. When read by the receiving app,
      gets an exception (not swallowed).

Change-Id: I745ca49daa6ca36b1020d518e9f346b52684f2b1
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2021-06-10 11:44:27 -07:00
Emilian Peev
715da5dd93 Camera: Various Camera2 extension updates
Update Camera2 extensions to:
 - Query advanced API support
 - Be able to query latency ranges when using
   legacy extensions
 - Trigger the camera extension initializer
   for both the legacy and advanced cases

Bug: 188579227
Test: Camera CTS

Change-Id: I8db505d0c649f6c664f60c1c1e3cd17de54abe3a
2021-06-09 16:11:03 -07:00
Beverly
70b67c0390 Disable screenOffUdfps by default
- By default, udfps cannot be triggered from screen off (aod disabled)
- To enable udfps to be triggered from screen off, use the following adb
command: `adb shell settings put secure screen_off_udfps_enabled 1` and
re-enter doze

- On AOD: on udfps failure, stay in AOD 2 (do not go to the lock
screen). This reverts ag/14021076. The cancelAodInterrupts were
redundant, since these are taken care of by
FingerprintAuthenticationClient.

Fixes: 190526395
Fixes: 189956809
Test: manual
Change-Id: Ife8aa2ce5f509b6923b8e8dbe229653cd285b852
2021-06-09 18:23:09 +00:00
Michal Olech
8c36342587 Merge "[CEC Configuration] Add 'routing_control' setting" 2021-06-06 20:10:07 +00:00
Joe Bolinger
d361a6bbd2 Merge "Fix feedback and animations for face to fingerprint fallback authentication." into sc-dev am: 896ac3e18f am: 9c613a484d am: 28b70ca276
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14823790

Change-Id: Ib224bbcf91f451e5d8c69dd65d627e3c991b08d4
2021-06-04 11:14:17 +00:00
Joe Bolinger
9f685a9fa7 Fix feedback and animations for face to fingerprint fallback authentication.
Bug: 189164072
Test: atest com.android.systemui.biometrics com.android.server.biometrics
Change-Id: I7fe8085dc4a4994c591bb4be20309ffb46bb06e9
2021-06-03 14:41:29 -07:00
Thiébaud Weksteen
6e75745a91 Fix typo in documentation
Test: n/a
Change-Id: Icf02b33fd548db263d998d206266d4755312ade7
2021-06-03 19:45:31 +02:00
Kevin Chyn
7f0f8978ab Merge changes I2eebe329,I81f1dfc1 into sc-dev am: bc77821e7d am: 36992991bd am: 13a0087ef2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14791442

Change-Id: Iee7493b41e654ab62aa908773e2157f348c16ce7
2021-06-02 20:27:03 +00:00
Kevin Chyn
bc77821e7d Merge changes I2eebe329,I81f1dfc1 into sc-dev
* changes:
  Turn off HBM when AcquiredInfo#GOOD
  Do not handle requests on system_server thread
2021-06-02 20:06:11 +00:00
TreeHugger Robot
67ffe38320 Merge "camera2: Fix parcelling of sensor pixel modes." into sc-dev am: 1cdc8379a8 am: d767220f54 am: 1808497ce3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14745457

Change-Id: I28b88b2357b7e7fdead03b87399bca061555508c
2021-06-02 19:48:45 +00:00
TreeHugger Robot
1cdc8379a8 Merge "camera2: Fix parcelling of sensor pixel modes." into sc-dev 2021-06-02 19:10:53 +00:00