Commit Graph

4829 Commits

Author SHA1 Message Date
Treehugger Robot
efcdf5b5a4 Merge "Fix deadlock issue." am: 6619bac824 am: cadcd9c225 am: acc96efcfa
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1918077

Change-Id: Icb20857776295337f74496b85fa1dc9a36f8e537
2022-01-04 18:12:45 +00:00
Treehugger Robot
acc96efcfa Merge "Fix deadlock issue." am: 6619bac824 am: cadcd9c225
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1918077

Change-Id: I1a1c9b2d437ea87c4eeecbd9ac5f2c1357cfcd17
2022-01-04 17:49:56 +00:00
Treehugger Robot
6619bac824 Merge "Fix deadlock issue." 2022-01-04 17:08:52 +00:00
jiayongqiang
d2280b8107 Fix deadlock issue.
It might cause deadlock sometimes:

The locking order of setEventsMask is:
    registerDisplayListener -> <DMG.mLock> -> setEventsMask -> <class lock>;

The Locking order of handleMessage is:
    Looper.loop -> Looper.loopOnce -> Handler.dispatchMessage -> handleMessage -> <class lock>;

Therefore, when the registerDisplayListener is called by client,
the DisplayListenerDelegate.handleMessage also called by DMS's callback,
at this time, if the method with DMG.mLock is called in handleMessage(),
it will lead to deadlock.

Test: (For example)
Thread A:
DisplayListenerDelegate.handleMessage() -> <class lock>
DisplayListener.onDisplayChanged() -> DMG.getCompatibleDisplay() ->
DMG.getDisplayInfo() -> <DMS.mLock>

Thead B:
DMG.registerDisplayListener() -> <DMS.mLock> -> DisplayListenerDelegate.setEventsMask() -> <class lock>

Signed-off-by: jiayongqiang <jiayongqiang@xiaomi.com>
Change-Id: Ie1a8728339c16fa8f4c4f5c758821c836fa1c96b
2022-01-04 18:29:45 +08:00
TreeHugger Robot
db5e01949e Merge "Camera: Update JPEG size override condition for MPC13" into sc-v2-dev am: 1efdec0980
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16409018

Change-Id: I7e55ac5aa88aee72792fdb91cc78a90e49687c49
2021-12-10 21:15:22 +00:00
TreeHugger Robot
1efdec0980 Merge "Camera: Update JPEG size override condition for MPC13" into sc-v2-dev 2021-12-10 21:08:00 +00:00
Joshua Mccloskey
fa02344fe0 Merge changes from topic "faceCameraSensorPrivacy" into sc-v2-dev am: 698f40caf7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16285463

Change-Id: I9982667e2035ad3d88a614b4ed5e8d5747c42ed4
2021-12-08 07:26:21 +00:00
Joshua Mccloskey
698f40caf7 Merge changes from topic "faceCameraSensorPrivacy" into sc-v2-dev
* changes:
  Added sensor privacy message to biometric prompt
  Add SensorPrivacy error message to FaceService.
2021-12-08 07:01:56 +00:00
Joshua Mccloskey
27db3c0af9 Added sensor privacy message to biometric prompt
Bug: 201045056
Test: Verified that BiometricPrompt shows an error message if the user
is using face authentication and camera privacy is enabled.

Change-Id: Idc2140062c4aa87e0bcffb14e07336dc6cd7d955
2021-12-07 13:57:23 -08:00
Shuzhen Wang
5c67b950b2 Camera: Update JPEG size override condition for MPC13
The JPEG size override is done only when the
android.os.Build.VERSION_CDOES.MEDIA_PERFORMANCE_CLASS is set to
31 or larger, and not necessarily for every MPC13 devices.

Bug: 209622756
Test: Build
Change-Id: I4d76db1780e0d777e8da68a06829ce0e424905d5
2021-12-07 17:40:02 +00:00
Joshua Mccloskey
9d3f1be63c Add SensorPrivacy error message to FaceService.
If the camera privacy sensor is enabled, show an error message
on Keyguard.

Test: Verified that the sensor privacy error is shown when privacy sensor is enabled.
Bug: 201045056
Change-Id: Ib7709596d378caa690a782294197a5b26e55857f
2021-12-06 16:03:28 -08:00
John Reck
7be726800b Merge "Add owners for HardwareBuffer & friends" am: e8c5cf956f am: 200d79d156 am: 8ca80dbdee
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1906882

Change-Id: I45e75266784750ccde6323320b53a4d03027fb11
2021-12-01 02:54:15 +00:00
John Reck
8ca80dbdee Merge "Add owners for HardwareBuffer & friends" am: e8c5cf956f am: 200d79d156
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1906882

Change-Id: I3a8f958ee96426071190d4b81be7fd44178b18c4
2021-12-01 02:35:45 +00:00
John Reck
200d79d156 Merge "Add owners for HardwareBuffer & friends" am: e8c5cf956f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1906882

Change-Id: I98c2f9f753b1434ab899dfaf5ab8772a3573bb02
2021-12-01 02:13:15 +00:00
John Reck
b7b469bb28 Add owners for HardwareBuffer & friends
Test: this
Change-Id: I36531490b7736bc4ac9d8693fc3feffb4058ad6e
2021-11-30 18:42:52 -05:00
Naomi Musgrave
98f8b55975 [DO NOT MERGE] Revert "[2/n] Display stack provides DisplayInfos" am: 4dfa01a86e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16273545

Change-Id: Ide06de4f8466790e47fd7e99b29cb55ce70b2add
2021-11-30 16:54:01 +00:00
Naomi Musgrave
4dfa01a86e [DO NOT MERGE] Revert "[2/n] Display stack provides DisplayInfos"
This reverts commit aca03a172c.

Reason for revert: remove from sc-v2
Test: manual
Bug: 206649452

Change-Id: I1ce3c567eb1203edc7f22c568eeb15e85c643134
2021-11-30 13:32:08 +00:00
Louis Chang
2aa469fe54 Merge "Checking Settings config for quick pick-up gesture" into sc-v2-dev am: fcfd7e1a79
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16324227

Change-Id: Ie09ce22aa73f89d1580542dfa4335be29de14b47
2021-11-24 01:36:48 +00:00
Louis Chang
fcfd7e1a79 Merge "Checking Settings config for quick pick-up gesture" into sc-v2-dev 2021-11-24 01:31:47 +00:00
TreeHugger Robot
e428a71723 Merge "Camera: Try to recover from failing stopRepeating requests" into sc-v2-dev am: d0d3b02874
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16244846

Change-Id: I7d5078d67e684f33cc0b100c36e6d1aac1493ed8
2021-11-24 00:55:57 +00:00
TreeHugger Robot
d0d3b02874 Merge "Camera: Try to recover from failing stopRepeating requests" into sc-v2-dev 2021-11-24 00:40:57 +00:00
Louis Chang
4267ff2f20 Checking Settings config for quick pick-up gesture
...in order to turn it off while running tests

Bug: 204145453
Test: atest ActivityVisibilityTests
Change-Id: I8dcba88f6d0dc3370cb189034ca4bc2935103233
2021-11-23 14:43:40 +08:00
TreeHugger Robot
808e2e2979 Merge "Make quickPickup gesture depend on liftToWake" into sc-v2-dev am: b17c10f621
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16242790

Change-Id: Iea643f7fa9f9fff4d9a73fe40b56dc5d6f180ee4
2021-11-18 19:51:39 +00:00
Xin Li
10d9972786 Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918
Bug: 205056467
Merged-In: I13199bc39e9445929195f3d15579cbffe94e92b0
Change-Id: I35fa3c6c2abf679c51033f1395a08d511ed8739f
2021-11-18 17:00:37 +00:00
TreeHugger Robot
b17c10f621 Merge "Make quickPickup gesture depend on liftToWake" into sc-v2-dev 2021-11-18 15:33:18 +00:00
Kenneth Ford
bbf1f135eb Merge "Notifies correct device state callback on cancellation" into sc-v2-dev am: 34873949e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16232865

Change-Id: I7f5cdb7f63f68456ed9c05d239ac06a2a6bc6171
2021-11-16 22:57:14 +00:00
Kenneth Ford
3ad9ba7351 Notifies correct device state callback on cancellation
Previously was calling onRequestSuspended for cancellation notifications

Bug: 205886628
Test: DeviceStateManagerGlobalTest
Change-Id: I63e44f5c9a7a333ce9ba5bffe8e103834d9f468d
2021-11-16 20:40:14 +00:00
Emilian Peev
caa1a65588 Camera: Try to recover from failing stopRepeating requests
In case the camera client disconnects from an output surface referenced
by an active repeating request, a race could occur between the client
and camera service. Camera service will notify the client about the
failed repeating request and will reset the request id internally.
During this time period the client can also try to call "stopRepeating"
which will trigger an IAE, reset the client repeating request id value
and return immediately. Once the "onRepeatingRequestError" gets
scheduled or unblocked, the framework will just ignore it since it
doesn't have any information about an active repeating request.
The framework will be unable to track the last frame id in the repeating
sequence. The sequence will never complete and the 'onClosed' callback
will not get triggered as well.
To mitigate this, cache the request id in case of IAE during
"stopRepeating" and try to resume the last frame id sequence tracking
once "onRepeatingRequestError" arrives.

Bug: 205895636
Test: Camera CTS
Change-Id: I5da4a82d156227568aaebe74a5e0b2400de1d01e
2021-11-11 17:40:16 -08:00
Beverly
5deab1f755 Make quickPickup gesture depend on liftToWake
If lift to wake is disabled, also disable quickPickup.

Test: manual
Fixes: 204676931
Change-Id: I2c918fb706b24c77f1e74160052e5caae51144cd
2021-11-11 16:28:30 -05:00
Joshua Mccloskey
0e1abac54b Merge "Add ignoreEnrollmentState to prompt info" into sc-v2-dev am: c9786ca681
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16185143

Change-Id: I137effa0f4029d227be5503725d68e0b99940a53
2021-11-10 18:23:02 +00:00
Joshua Mccloskey
c9786ca681 Merge "Add ignoreEnrollmentState to prompt info" into sc-v2-dev 2021-11-10 18:09:27 +00:00
Joshua Mccloskey
288f4b5784 Add ignoreEnrollmentState to prompt info
Test: Verified with a seperate APK that the API works as expected.
Bug: 201205443
Change-Id: Ic933b850a4230caf8811fd1029b52bd9a161d615
2021-11-09 11:04:07 -08:00
Joe Bolinger
865968ceee Merge "Do not show side fingerprint sensor overlay when used from settings." into sc-v2-dev am: ddbd84f4d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16168831

Change-Id: I7961208c28032ed5fd4bd34b4045e4a4a9c9bc62
2021-11-08 18:31:43 +00:00
Joe Bolinger
7f6ff9092f Do not show side fingerprint sensor overlay when used from settings.
This is an alternative to ag/16124814 with the additional fix for udfps.

Fix: 203789357
Test: atest SidefpsControllerTest
Test: manual (open settings and verify no overlay shown with list of fingerprint)
Test: manual (open settings and verify overlay shown during enrollment)

Change-Id: Iee33cbb66d86d4f033d6acc9cf2284a3845f22de
2021-11-06 00:14:00 +00:00
Lucas Dupin
790a3cfd86 Merge "Revert "Do not show side fingerprint sensor overlay when used from settings."" into sc-v2-dev am: 7f1538b282
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16147469

Change-Id: Iefd5b3ac9e50a3e60ae173163db1841743a1d06c
2021-10-29 22:36:20 +00:00
Lucas Dupin
51e71dc946 Revert "Do not show side fingerprint sensor overlay when used from settings."
This reverts commit 42004250c2.

Reason for revert: b/204524711 

Change-Id: I57ff00e30e72852a4eb894d3302730616a22ae8e
2021-10-29 18:00:28 +00:00
Joe Bolinger
06844dd241 Merge "Do not show side fingerprint sensor overlay when used from settings." into sc-v2-dev am: b9c6536a63
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16124814

Change-Id: Ib495d79272cb375478a6cce1c5182289c440a9a1
2021-10-26 23:47:20 +00:00
Joe Bolinger
42004250c2 Do not show side fingerprint sensor overlay when used from settings.
Fix: 203789357
Test: atest SidefpsControllerTest
Change-Id: I2b0bb3b38edeeec08e93706784b0a53bd77d32a3
2021-10-26 13:10:36 -07:00
TreeHugger Robot
ac0da15643 Merge "Update DozeSensors and DozeBrightnessSensor on posture changes" into sc-v2-dev am: 22314d89a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15983468

Change-Id: I2513907077181517855ec80de4dad9e53ade562a
2021-10-18 20:18:02 +00:00
Beverly
1905cf9110 Update DozeSensors and DozeBrightnessSensor on posture changes
If the posture changes while AOD is running, make sure
sensors are unregistered + registered properly.

Test: manual, enable AOD and then close/open and check that
correct sensors are registered (dumpsys sensorservice)
Test: atest DozeScreenBrightnessTest DozeSensorsTest
Fixes: 192805135
Fixes: 199344667

Change-Id: I5093dc43e062144adca757c94fa708f51be57a44
2021-10-18 11:19:55 -04:00
Emilian Peev
24a011273a Merge "Camera: Handle ISE when device state manager is absent" into sc-v2-dev am: a8a33c88f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16034842

Change-Id: Id89389ee1e346c6ea994331f233f73de17ae968c
2021-10-13 22:56:43 +00:00
Emilian Peev
bd25a442f1 Merge "Camera: Rename DeviceStateOrientationMap" into sc-v2-dev am: cd056ddbb8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16042088

Change-Id: I8269adbd3cc7542199ad27718bc46a311d57709e
2021-10-13 22:55:55 +00:00
Emilian Peev
a8a33c88f2 Merge "Camera: Handle ISE when device state manager is absent" into sc-v2-dev 2021-10-13 22:42:18 +00:00
Emilian Peev
47cae0f093 Camera: Handle ISE when device state manager is absent
The device state manager doesn't seem to be present on all
devices.
Catch any ISEs and handle this corner case appropriately.

Bug: 202597641
Test: atest
CtsGraphicsTestCases:android.graphics.cts.CameraVulkanGpuTest#testCameraImportAndRendering
-- --module-parameter instant_app

Change-Id: I6e6c7266b268835f3138cbb22a6f2df606742300
2021-10-12 22:25:19 +00:00
Emilian Peev
1a1461e5ae Camera: Rename DeviceStateOrientationMap
Use "DeviceStateSensorOrientationMap" to avoid possible
association with other common orientation states such as
Portrait and Landscape.

Bug: 202832229
Test: atest -c
cts/tests/camera/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java#testDeviceStateSensorOrientationMapCharacteristics
Change-Id: I6fc9d452f0bb4099389e30d0404e1c6c20dff8ff

Change-Id: Icde1a8eb25b15b237812f583de8f7a46b6576772
2021-10-12 14:01:30 -07:00
Eino-Ville Talvala
7e42bd2aa6 Merge "Camera: Fix wrong wasImageCaptured flag" into sc-qpr1-dev am: 0f6c1c9d24 am: 19e0a03336
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16009383

Change-Id: I99e37cce37f48e1538f7aed0bb34c7d0e667ae2b
2021-10-08 20:38:23 +00:00
Eino-Ville Talvala
19e0a03336 Merge "Camera: Fix wrong wasImageCaptured flag" into sc-qpr1-dev am: 0f6c1c9d24
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16009383

Change-Id: I63a7faa7932142e8e54b6e8db6d95c121c517866
2021-10-08 20:26:19 +00:00
Eino-Ville Talvala
fed7243e56 Merge "Camera: Fix wrong wasImageCaptured flag" into sc-qpr1-dev am: 0f6c1c9d24
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16009383

Change-Id: I086f7400f1a7faba2eacb6e05c61a927ef768ce9
2021-10-08 20:26:18 +00:00
TreeHugger Robot
be9e53d16d Merge "Camera: Avoid possible deadlock when closing advanced extension session" into sc-qpr1-dev am: 00c890cda7 am: 2d7bc584fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15976219

Change-Id: I7ea248df07a0720cdbce7314a2ae2c841019499a
2021-10-08 20:20:23 +00:00
Eino-Ville Talvala
0f6c1c9d24 Merge "Camera: Fix wrong wasImageCaptured flag" into sc-qpr1-dev 2021-10-08 20:10:28 +00:00