Commit Graph

4846 Commits

Author SHA1 Message Date
John Reck
5877567a36 Merge "Add some top-level OWNERs" am: 8abc52aad7 am: e3c2aae661 am: d603c2cbf7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1973083

Change-Id: I67d7ac0ad32f826d0513e5ff4cefcc0798accb41
2022-02-07 17:21:24 +00:00
John Reck
d603c2cbf7 Merge "Add some top-level OWNERs" am: 8abc52aad7 am: e3c2aae661
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1973083

Change-Id: Ic74e9bef2ab9e438ff5d8c60451aabeec770c69b
2022-02-07 17:05:26 +00:00
John Reck
5ec2b572eb Add some top-level OWNERs
To keep their respective per-files updated primarily

Test: N/A
Change-Id: Ib5fbeac665fc1cfd01ff62ef61ec910e5c516669
2022-02-04 18:26:08 -05:00
Nathalie Le Clair
70b1d31e62 Merge "CEC: Change vendor command handling" am: 134f59f851 am: e90b5a3efc am: 53ffd7a1f3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1807376

Change-Id: I35c2ec0be80f6d00028f562227e212341f76f7f2
2022-02-01 23:06:40 +00:00
Nathalie Le Clair
53ffd7a1f3 Merge "CEC: Change vendor command handling" am: 134f59f851 am: e90b5a3efc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1807376

Change-Id: Ib9aa66ef9089f5b628745b9e5931ba69c9e15448
2022-02-01 20:20:37 +00:00
Nathalie Le Clair
134f59f851 Merge "CEC: Change vendor command handling" 2022-02-01 12:56:13 +00:00
Joe Bolinger
084c7daa6a Fix enrollment cancelation race conditions. am: abc127673b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16687106

Change-Id: If5fb6553ed99aefb894e00f4baf637329387d50e
2022-01-26 18:50:24 +00:00
Joe Bolinger
abc127673b Fix enrollment cancelation race conditions.
Bug: 210090299

Change-Id: Idd1485f182cf841b96ced1dab4b8330ff3b57c2a
Merged-In: Idd1485f182cf841b96ced1dab4b8330ff3b57c2a
2022-01-26 01:07:38 +00:00
Thiébaud Weksteen
a233ce9dc7 Merge "Transition SerialManager to @EnforcePermission" am: dd9db63692 am: ada390bead am: ed7e6f6bdf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1946227

Change-Id: Id09a90dcc98540e1ad09947dceac9afd8be91e83
2022-01-19 01:01:51 +00:00
Thiébaud Weksteen
ed7e6f6bdf Merge "Transition SerialManager to @EnforcePermission" am: dd9db63692 am: ada390bead
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1946227

Change-Id: I0e5fb34d0a93f0d0ac695d6ba3a46846171b7b70
2022-01-19 00:50:34 +00:00
Thiébaud Weksteen
dd9db63692 Merge "Transition SerialManager to @EnforcePermission" 2022-01-19 00:28:57 +00:00
David Zeuthen
2bf36b756d Merge "identity: Add multi-document presentation support." am: 91b96e3454 am: ae0d53c78d am: 62c776a7c2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1824674

Change-Id: Idb4d1ddd89a5ca58ccc852c67f098dad04cb1c5c
2022-01-14 21:56:18 +00:00
David Zeuthen
62c776a7c2 Merge "identity: Add multi-document presentation support." am: 91b96e3454 am: ae0d53c78d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1824674

Change-Id: I8b5ade103c4275871e990369c36480013f47f129
2022-01-14 21:39:07 +00:00
David Zeuthen
91b96e3454 Merge "identity: Add multi-document presentation support." 2022-01-14 21:07:03 +00:00
Thiébaud Weksteen
c4895c4aa6 Transition SerialManager to @EnforcePermission
Use the new @EnforcePermission annotation for SerialService.

Test: Manually inspect ISerialManager.java, the permission checks are
      correctly generated.
Test: Run SerialChat app as regular app, SecurityException triggered
      when launching the app.
Test: Run SerialChat as priv-app. Access is granted, the app executes
      normally.
Bug: 197828948
Change-Id: Ide1d2809f2226f7cd84efa0d364dc78da726f294
2022-01-12 16:26:09 +11:00
David Zeuthen
6fc37331a6 identity: Add multi-document presentation support.
This new PresentationSession interface enables an application to do a
multi-document presentation, something which isn't possible with the
existing API. As a practical example of this consider presenting both
your Mobile Driving License and your Vaccination Certificate in a single
transaction.

Also update the documentation for IdentityCredential to clarify that
the same AuthKey is used for multiple getEntries() calls on the same
credential.

Also deprecate existing IdentityCredential.getEntries() method and
related methods and classes.

Bug: 197965513
Test: New CTS tests and new screen in CtsVerifier
Change-Id: I74534969143882552407917a82f44d43da12711c
2022-01-11 10:40:51 -05:00
Venkatarama NG. Avadhani
6c65342c8d CEC: Change vendor command handling
If a vendor command without vendor ID is received, the message is now
forwarded to all registered listeners, irrespective of the device type.

If a vendor command with ID is received, the message is forwarded to all
listeners registered with that vendor ID

Bug: 177061176
Test: atest com.android.server.hdmi.HdmiControlServiceTest#addVendorCommandListener_noCallback_VendorCmdDiffIdTest
  atest com.android.server.hdmi.HdmiControlServiceTest#addVendorCommandListener_receiveCallback_VendorCmdNoIdTest
  atest com.android.server.hdmi.HdmiControlServiceTest#addVendorCommandListener_receiveCallback_VendorCmdWithIdTest
Change-Id: I84e010ccbe58ff090348babba05db0c31add1136
2022-01-06 18:50:51 +05:30
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