Commit Graph

4723 Commits

Author SHA1 Message Date
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
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
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
Kevin Chyn
f6ff170d53 Turn off HBM when AcquiredInfo#GOOD
Prevent unnecessary use of HBM. This change decouples illumination
state from touch state. onFingerUp should always be called whenever
the finger leaves the HBM area, and not only when illumination was
requested (isFingerDown was actually isIlluminationRequested()).
Moves the check to onFingerUp to stop illumination only if illumination
was actually happening.

Bug: 187460696
Test: atest UdfpsControllerTest

Change-Id: I2eebe32990761d2fbf86cab228e4a7221a209b42
2021-06-02 09:29:35 -07:00
Michal Olech
bc57a6aaa5 [CEC Configuration] Add 'routing_control' setting
This ports Settings.Global.HDMI_CEC_SWITCH_ENABLED to HdmiCecConfig.

Bug: 187284252
Test: run cts
Change-Id: I7994a1d69ffc0bf68323d4dcc212a89be1926db9
2021-05-31 13:03:47 +02:00
Michal Olech
3d007e9ce4 [CEC Configuration] Add 'system_audio_control' setting
This ports Settings.Global.HDMI_SYSTEM_AUDIO_CONTROL_ENABLED to
HdmiCecConfig.

Bug: 187284252
Test: run cts
Change-Id: Idb0e069f915a9a7c04c4f7fd24d8c200666c47a9
2021-05-31 13:03:46 +02:00
Eino-Ville Talvala
db73d5d6ba Camera: Add black test pattern mode for privacy
Add an enum value for test pattern BLACK, to be used with
camera muting on devices that can't implement the full
SOLID_COLOR test pattern API.

Also include it in test API to ensure correct behavior can
be tested.

Test: Camera CTS continues to pass
Bug: 189507251
Change-Id: Ie9449f722fdc356c690f1513d4cb25a43a14e4c8
2021-05-27 18:11:38 -07:00
Jayant Chowdhary
e1a464e141 camera2: Fix parcelling of sensor pixel modes.
OutputConfiguration.writeToParcel previously used writeList to parcel
the List<Integer> mSensorPixelModesUsed. The Integer list read from a
Parcel into a vector of int32_ts in cameraserver native code, doesn't get read correctly
(values sent are not the ones received).
Therefore, instead we explicitly convert the Integer list into an int[]
before parcelling using writeIntArray. We also explicitly use
readInt32Vector on the native side in readFromParcel now.

Bug: 184396641

Test: atest RobustnessTest.java#testConfigureInvalidSensorPixelModes

Change-Id: Ie0a8d0da2f89c959df6a3529d4836889e235fa93
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2021-05-27 10:56:47 -07:00
Kevin Chyn
b5bbf7d443 Merge "Add AIDL constants to framework constants" into sc-dev am: 90135f22d9 am: 5c8c0e4c8f am: 838a32360b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14719309

Change-Id: I49d92b749d341339b43b4c07af049c5302b00a62
2021-05-26 02:45:40 +00:00
Kevin Chyn
9e1ae2cec0 Add AIDL constants to framework constants
Fixes: 188912467
Test: Modify HAL to send above constants. No longer see
      "Unknown enrollment acquired message" in logcat

Change-Id: I286465dae550fa123fef785879084e86081f2b43
2021-05-25 23:13:24 +00:00
Joe Bolinger
db6a6465fe Merge "Add biometric strength reset and fix CTS tests on multi sensor devices (mostly)" into sc-dev am: c584a39e67 am: f841c1086c am: 65cc066446
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14637111

Change-Id: I48f077138e2261cb0336749a24ffeb6a4178490e
2021-05-25 04:38:04 +00:00
Joe Bolinger
d8ea71fbc4 Add biometric strength reset and fix CTS tests on multi sensor devices (mostly)
Tests can still fail due to flakiness in cleanup (main cause seems to be stale enrollments).

Fix: 187250205
Test: atest CtsBiometricsTestCases

Change-Id: I3e379322277cde984f5a0112d38db60b9c6e360d
2021-05-24 14:09:32 -07:00
Chris Ye
4e64a8cf6f Merge "Add capabilities to android.hardware.lights.Light." into sc-dev am: b3d0a2afe3 am: 8f139eb555 am: fe7df089ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14552279

Change-Id: I762fb119569860061ce2e2e2109e9c1e553d2754
2021-05-24 18:32:41 +00:00
Chris Ye
b3d0a2afe3 Merge "Add capabilities to android.hardware.lights.Light." into sc-dev 2021-05-24 17:34:58 +00:00
Chris Ye
9f98e33d8e Add capabilities to android.hardware.lights.Light.
Add capabilities of MONO, RGB and PLAYER_ID to
android.hardware.lights.Light, and the APIs to query the capabilities.

Bug: 181743615
Test: atest InputDeviceLightsManagerTest, atest LightsManagerTest, atest android.hardware.input.cts.tests
Change-Id: I266c83584d63815e1a71897e5975d6c13e8543bb
2021-05-22 18:28:14 -07:00
TreeHugger Robot
03e973c44f Merge "Update signature on remove sensor privacy listener API" into sc-dev am: 59bdbf467f am: 368439e9f1 am: 293987b7f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14649887

Change-Id: Ic238bbd82ba04b4ad0d3b349a5cdf2e19f8cb975
2021-05-22 02:46:36 +00:00
TreeHugger Robot
59bdbf467f Merge "Update signature on remove sensor privacy listener API" into sc-dev 2021-05-22 02:02:21 +00:00
Joe Bolinger
804fcb2ca6 Merge changes I57f018e4,Ib1e92278 into sc-dev am: 16cd6bb81f am: f9742d8153 am: 479e47ec0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14669695

Change-Id: Ie96c4dca25291de86cdec6fb6e8dad6bcd9cc919
2021-05-21 22:49:13 +00:00
Joe Bolinger
16cd6bb81f Merge changes I57f018e4,Ib1e92278 into sc-dev
* changes:
  Remove confirm button when falling back to fingerprint auth.
  Delay starting fingerprint sensor when using multi-sensor devices.
2021-05-21 21:35:57 +00:00
Evan Severson
6c8326f02a Update signature on remove sensor privacy listener API
If a listener can be registered for multiple sensors they should be able
to be removed individually.

Test: Build
Bug: 181681375
Change-Id: I04b867de8140adc8db0137e7d13c0f8d1a966a5e
2021-05-21 19:54:11 +00:00
Grace Cheng
b03339a582 Merge "Add plumbing to show/hide side-fps UI affordance near power button" into sc-dev am: 961749155a am: fc0c6cd6af am: f7a278df19
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14628982

Change-Id: I6a337cde244fe8d87a3a8e525462d7f3dc3781e3
2021-05-21 17:21:30 +00:00