Commit Graph

5480 Commits

Author SHA1 Message Date
Automerger Merge Worker
c7c7287a35 Merge "Merge "Camera: Add support for readout timestamp" into tm-d1-dev am: daf69b3d66 am: 13908d1a41" into tm-qpr-dev-plus-aosp am: 1722d42d69
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125757

Change-Id: I5d43b9d034501f79a964077451d635fc3eeb03a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 05:11:59 +00:00
TreeHugger Robot
daf69b3d66 Merge "Camera: Add support for readout timestamp" into tm-d1-dev 2022-05-07 04:09:50 +00:00
Ravneet Dhanjal
5956174bf2 Merge "Revert "CameraManager: Add path to update vendorTag info upon HA..."" 2022-05-06 21:23:01 +00:00
Ravneet Dhanjal
716687046f Revert "CameraManager: Add path to update vendorTag info upon HA..."
Revert submission 18129735-b181579423

Reason for revert: Causing HWAddressSanitizer bug
Reverted Changes:
I8d8c00159:CameraManager: Add path to update vendorTag info u...
I01212f4c6:CameraService: Add path to update vendorTag info u...
Bug: 231526212
Change-Id: I0d2da06c531081ba7243b565d8318a6afff45a2b
2022-05-06 19:13:21 +00:00
TreeHugger Robot
0f4d83b98e Merge "Camera: Propagate extension results in case of dropped frames" into tm-dev am: 4d2ae2655e am: cd3fd2c559
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18104867

Change-Id: Ib42a05a854ad52b60ef4bb89a48be4a698b5b2ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 14:08:27 +00:00
Evan Severson
3d43c46747 Merge "Make the authentication requirement configurable for toggles" into tm-dev am: 7935bf8b27 am: 15c41ca1b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17769812

Change-Id: I9feda9f889efc368811254eaafed561e05475020
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 13:48:39 +00:00
TreeHugger Robot
284657d0ae Merge "Camera: Propagate extension results in case of dropped frames" into tm-dev am: 4d2ae2655e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18104867

Change-Id: I148bcfb5a0811ce42b76065a8a19802a2ceff43c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 23:34:01 +00:00
TreeHugger Robot
4d2ae2655e Merge "Camera: Propagate extension results in case of dropped frames" into tm-dev 2022-05-05 23:11:58 +00:00
Prabir Pradhan
4601c17fe1 Merge changes from topics "presubmit-am-e1ccffb4201944be9e638acb9f6f4dfc", "presubmit-am-e6236e948fb14688bc4afb3adb9e745b" into tm-dev am: dd2c72a65d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17351976

Change-Id: Iacf94fba3ce56091fd83f274dae1195dedbd726f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 19:38:16 +00:00
Prabir Pradhan
dd2c72a65d Merge changes from topics "presubmit-am-e1ccffb4201944be9e638acb9f6f4dfc", "presubmit-am-e6236e948fb14688bc4afb3adb9e745b" into tm-dev
* changes:
  Synchronize pointer display change requests
  Make virtual input device creation synchronous
2022-05-05 19:21:40 +00:00
Evan Severson
2f067d2f62 Merge "Make the authentication requirement configurable for toggles" into tm-dev am: 7935bf8b27
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17769812

Change-Id: Ia3ef87c3182de5f7ddc0db9fa1c2ae6022cbbd5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 16:57:33 +00:00
Evan Severson
7935bf8b27 Merge "Make the authentication requirement configurable for toggles" into tm-dev 2022-05-05 16:28:13 +00:00
Prabir Pradhan
d4fd3a112b Synchronize pointer display change requests
Previously, when InputManagerService requests for PointerController to
change the pointer display, there was no way to know when the request
was completed or whether it succeeded. This could lead to a few issues:

- WM's MousePositionTracker's coordinates would not be updated until the
  next mouse event was generated, meaning the position would be out of
  sync.
- The creation of a virtual mouse device moves the pointer to a specific
  displayId. In order to test this behavior, we would need to sleep in
  the test code to wait for the system to update the pointer display and
  position, resulting in generally flaky tests.

Here, we add a way to synchonize changes to the pointer display so that
InputMangerService can know the current pointer display with certainty.
PointerController, which is updated in the InputReader thread, is the
source of truth of the pointer display. We add a policy call to notify
IMS when the pointer display changes.

When the pointer display is changed, the cursor position on the updated
display is also updated so that the VirtualMouse#getCursorPosition() API
is synchronized to the pointer display change.

Bug: 216792538
Test: atest FrameworksServicesTests:InputManagerServiceTests
Test: atest PointerIconTest
Change-Id: I578fd1aba9335e2e078d749321e55a6d05299f3b
Merged-In: I578fd1aba9335e2e078d749321e55a6d05299f3b
2022-05-05 14:20:45 +00:00
Prabir Pradhan
02a18edc53 Merge "Reland: Change input injection security model" 2022-05-05 10:34:54 +00:00
Shuzhen Wang
91e7522cb2 Camera: Add support for readout timestamp
- Add new CameraCharacteristics key to indicate readout timestamp
  support.
- Add onReadoutStarted() in CaptureCallback
- Add READOUT_SENSOR time base for OutputConfiguration.

Test: atest Experimental2022SystemTest
Bug: 229773853
Bug: 229097448
Change-Id: Icf831367d3ac92dfd0ae439724d1433968b36dd6
2022-05-05 02:03:00 +00:00
Shuzhen Wang
49aec118b6 Merge "Camera: Fix typos and bad format in docs" into tm-dev am: b1d13ce6bd am: f662a50fb4 am: 5b87cbc640 am: fc534a77f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18146996

Change-Id: Ifbbb360ef0cbd6dc3778e4789be529178f23aea0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 01:48:50 +00:00
Shuzhen Wang
f662a50fb4 Merge "Camera: Fix typos and bad format in docs" into tm-dev am: b1d13ce6bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18146996

Change-Id: If4eff04016836c2071bb34951ab9edf3fb496541
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 00:20:22 +00:00
Ilya Matyukhin
de84e3f019 Merge "Respect halControlsIllumination provided by the HAL" into tm-dev 2022-05-05 00:09:00 +00:00
Shuzhen Wang
b1d13ce6bd Merge "Camera: Fix typos and bad format in docs" into tm-dev 2022-05-05 00:01:18 +00:00
Ilya Matyukhin
59d49a4238 Respect halControlsIllumination provided by the HAL
Bug: 224573604
Test: atest SystemUITests:com.android.systemui.biometrics
Change-Id: I665b8c6a131ff3fd66701fea7ca6368e33b39c13
Merged-In: I665b8c6a131ff3fd66701fea7ca6368e33b39c13
2022-05-04 21:35:42 +00:00
Ilya Matyukhin
4417c142d2 Merge "Respect halControlsIllumination provided by the HAL" into tm-d1-dev am: ee6461b6bf am: 1e63fae279 am: 0316224ca2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18152966

Change-Id: I573411bead5cda52003708004e963b012c989ff5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 21:01:14 +00:00
Ravneet Dhanjal
2e85d4a051 Merge "CameraManager: Add path to update vendorTag info upon HAL update" 2022-05-04 19:28:56 +00:00
Shuzhen Wang
2e3e00ee63 Camera: Fix typos and bad format in docs
Test: Build
Bug: 231252657
Change-Id: I3006f124baab76aa011c5b91d346b871ed6eea22
2022-05-04 12:07:47 -07:00
Ilya Matyukhin
faae345362 Respect halControlsIllumination provided by the HAL
Bug: 224573604
Test: atest SystemUITests:com.android.systemui.biometrics
Change-Id: I665b8c6a131ff3fd66701fea7ca6368e33b39c13
2022-05-04 17:33:20 +00:00
Prabir Pradhan
98a74051df Reland: Change input injection security model
This reverts commit 6b3c6cae3f.

Changes from revert:
- Explicitly maintain the same behavior as previous versions of Android,
  where injection is allowed into all window if the caller has the
  INJECT_EVENTS permission, even if it is targeting a certain uid. This
  fallback will be removed separately in b/228161340.
- Clear the calling identity before checking if the injection source has
  a permisssion to avoid hitting blanket-checks in PackageManager that
  denys permissions in some cases, such as if the permission check call
  is coming from an instant app (b/228319794).
- Leave the existing IInputManager#injectInputEvent method signature
  unchanged, and add a new input method injectInputEventToTarget to
  perform targeted injection. This makes it so that tools or apps
  relying on the @UnsupportedAppUsage injection method will not be
  broken by a change in the method's signature (b/228583652).

Bug: 207667844
Bug: 194952792
Test: Run tests affected by b/228319794 and its duplicates using
cts-tradefed, so that they are also run as instant apps.
Test: Test scrcpy tool works locally

Change-Id: I503e4f087501e3aecf2c18b4b1d27e51ecda59ac
2022-05-04 14:53:14 +00:00
Felipe Leme
ac37a2a1ff Merge "Revert "Temporary NPE mitigation."" 2022-05-04 04:33:51 +00:00
Evan Severson
75821bfd72 Make the authentication requirement configurable for toggles
Test: Manual && CtsSensorPrivacyTestCases
Fixes: 227517111
Change-Id: Id7ee5d8ca9ee264c18d2f7e1975e0d4fcb6210ab
2022-05-03 21:04:35 +00:00
Emilian Peev
ceb6591e53 Camera: Propagate extension results in case of dropped frames
Capture results can be present and can be safely passed back to
client in case of frame drops within the source image reader.
Detect cases where results will get discarded, filter the tags
and notify clients accordingly.

Bug: 230790669
Test: Camera CTS
Change-Id: Ia3f77d9398165663073c01bdf8d3421fd86a67c4
2022-05-03 13:16:14 -07:00
TreeHugger Robot
0b2526c846 Merge "Remove the usage of device_config flag: DisplayManagerService.KEY_ALLOW_ALWAYS_UNLOCKED_VIRTUAL_DISPLAYS." into tm-dev am: 0927574f3f am: f98c4708b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17943723

Change-Id: I54d5d3f5b7891ce98257f3bc6c9de9b7601ef439
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 20:08:51 +00:00
TreeHugger Robot
e02e8396f6 Merge "Remove the usage of device_config flag: DisplayManagerService.KEY_ALLOW_ALWAYS_UNLOCKED_VIRTUAL_DISPLAYS." into tm-dev am: 0927574f3f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17943723

Change-Id: I45b476a8ea70d4cb5103d45c7e1f0b9cd1fd89b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 19:36:26 +00:00
TreeHugger Robot
0927574f3f Merge "Remove the usage of device_config flag: DisplayManagerService.KEY_ALLOW_ALWAYS_UNLOCKED_VIRTUAL_DISPLAYS." into tm-dev 2022-05-03 19:29:34 +00:00
Felipe Leme
9520c4642d Revert "Temporary NPE mitigation."
This reverts commit b1b99c28cf.

Test: atest com.android.server.pm.CrossProfileAppsServiceImplTest#startActivityAsUser_profile_notExported
Fixes: 223905476
Change-Id: Ic97b81257bdada9f42f0a9f209fb3d14190f61fb
2022-05-03 19:22:24 +00:00
Ravneet
ffaa2a236b CameraManager: Add path to update vendorTag info upon HAL update
- Add setupVendorTag to onStatusChanged callback to update
vendor tag information upon status changes in case HAL does
not load the vendorTag information during connect

Bug: 181579423
Test: Manual; GCA Validity check; Removed setUpVendorTag in enumerateProviders to force initial vendorTag info update using
onStatusChanged

Change-Id: I8d8c00159d49a13a7b5bbc9b26a2b474fc99aee4
2022-05-03 17:27:31 +00:00
Prabir Pradhan
1b41b330dd Merge changes I578fd1ab,I3b893d23
* changes:
  Synchronize pointer display change requests
  Make virtual input device creation synchronous
2022-05-03 14:24:17 +00:00
Shuzhen Wang
12d44e14c5 Merge "Camera: Update timestamp base doc for SurfaceTexture" into tm-dev am: c1a0dc2c61 am: b7aa5d065a am: 05ebc0b331 am: 7a430d6c0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17824805

Change-Id: I17cc87e5dc87eb821a8d74ed030e74f39f0df68a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 10:55:03 +00:00
Shuzhen Wang
b7aa5d065a Merge "Camera: Update timestamp base doc for SurfaceTexture" into tm-dev am: c1a0dc2c61
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17824805

Change-Id: I4e27b2b6c15dc236b28facfbfb816f1c21a987c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:05:38 +00:00
Shuzhen Wang
c1a0dc2c61 Merge "Camera: Update timestamp base doc for SurfaceTexture" into tm-dev 2022-04-29 17:27:23 +00:00
Hani Kazmi
42e5b7014b Cleanup: Block untrusted touches in InputDispatcher
This change removes the BlockUntrustedTouchesMode enum, and related
code, as block_untrusted_touches is now always enforced. Removed code and policy to display a toast when an untrusted touch occurs, as it's no longer used.

Fix: 169067926
Test: atest WindowUntrustedTouchTest
Change-Id: I1f8407f523eb845a7c50a2788553bdb2616a394b
2022-04-29 11:32:32 +00:00
TreeHugger Robot
259aad666f Merge "Add Face acquire strings." into tm-d1-dev am: cbc9a7105c am: d015de73c8 am: 53edd6192e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17878565

Change-Id: Iae40c436a4b1fa24f9d3d390f4316f890e96cf31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 23:39:25 +00:00
Zixuan Qu
0fce6f2150 Remove the usage of device_config flag: DisplayManagerService.KEY_ALLOW_ALWAYS_UNLOCKED_VIRTUAL_DISPLAYS.
Test:  atest  DisplayManagerServiceTest
Bug: 227384335
Change-Id: I125761acfd6f91a362484abacd6bc92cdfbd9a52
2022-04-27 11:36:55 +00:00
TreeHugger Robot
cbc9a7105c Merge "Add Face acquire strings." into tm-d1-dev 2022-04-26 19:40:44 +00:00
Joe Bolinger
50941f8b9c Merge "Do not clear calling identify when using BiometricPrompt from FingerprintService." into tm-dev 2022-04-22 19:16:48 +00:00
Ilya Matyukhin
6c7cd10ce3 Merge "Enable RRS (FHD<->QHD) support for UDFPS" into tm-dev am: 559244bd5e am: 0ea20eac6f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17844871

Change-Id: I21fcfbd34acf15528d5c0fc855b64923aba99da1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 06:25:23 +00:00
Ilya Matyukhin
559244bd5e Merge "Enable RRS (FHD<->QHD) support for UDFPS" into tm-dev 2022-04-21 05:55:03 +00:00
Joshua McCloskey
f50c184528 Add Face acquire strings.
Test: Verified the correct acquire messages show during face auth.
Fixes: 229582991
Change-Id: I392cef27886e7d423507a194a0638e5d933c7e09
2022-04-21 03:54:53 +00:00
Emilian Peev
24d33b6b9a Merge "Camera: Add support for client requests&results for advanced extensions" into tm-dev am: 50a87aa8b1 am: d47227ef10
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17113806

Change-Id: Ib0df7a588e769a99689cb6e5494e4aec0e2a1a20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 23:01:34 +00:00
Emilian Peev
50a87aa8b1 Merge "Camera: Add support for client requests&results for advanced extensions" into tm-dev 2022-04-20 22:36:16 +00:00
Ilya Matyukhin
84438ca22b Enable RRS (FHD<->QHD) support for UDFPS
UDFPS position and assets are configured in pixels in native
resolution. This CL adds a mechanism to detect a runtime resolution
change and scale the UDFPS coordinates accordingly.

Bug: 223342274
Test: atest SystemUITests:com.android.systemui.biometrics
Change-Id: Iaa1f3d633b50019d06bdecb5063490ad6eb11272
2022-04-20 21:15:14 +00:00
Philip Junker
0bc83104be Merge "Add more debug logs for input devices." 2022-04-20 10:44:33 +00:00
Joe Bolinger
f7c1e00df6 Merge "Do not clear calling identify when using BiometricPrompt from FingerprintService." 2022-04-20 01:30:44 +00:00