Commit Graph

4862 Commits

Author SHA1 Message Date
Treehugger Robot
7845f672bf Merge "Consolidate input OWNERS files" am: 467ebb8379
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2021015

Change-Id: Ie1b6446275299c2941271e433746d0b605404e0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 19:01:24 +00:00
Treehugger Robot
467ebb8379 Merge "Consolidate input OWNERS files" 2022-05-18 18:42:33 +00:00
Badhri Jagan Sridharan
4a61540d9f Support IUsb AIDL interface am: b09d68a2ea
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2046443

Change-Id: Icdb81cefb211ac84cd41307a26aa1beee048118f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 17:39:58 +00:00
Badhri Jagan Sridharan
b09d68a2ea Support IUsb AIDL interface
UsbPortManager is made to support both AIDL & HIDL interface until
HIDL is deprecated eventually. UsbPortHal abstract class is defined
which the UsbPortManager grabs an instance of from UsbPortHalInstance
method to talk to the Hal implementation process. UsbPortHalInstance
queries the underlying hal implementation and instantiates UsbPortHal
with either UsbPortHidl or UsbPortAidl based on the IUsb interface
implemented by HAL implementation.

go/iusb-aidl-migrate.

Bug: 200993386
Bug: 199357330
Bug: 211677613
Bug: 213312081
Bug: 199358576
Test: Manually tested through UI.
CTS-Coverage-Bug: 215019881
Change-Id: I246fd6e5bee8138d3ad3b6994665a1d4788c8789
Merged-In: I246fd6e5bee8138d3ad3b6994665a1d4788c8789
(cherry picked from commit bbfa92e694)
2022-04-26 16:04:13 +08:00
Nathalie Le Clair
d27da8101b Don't remove devices on onHotplug() am: c188a56888
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2039064

Change-Id: I222cf5c44dfc9059f3e503cd2d6b0a10b3d76e46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-04 16:13:43 +00:00
Nathalie Le Clair
aa6698b0b4 Merge changes I46fb8cfe,I4181b465,I99e1ca1d,I66b09693
* changes:
  Only invoke listener once physical address becomes known
  Don't remove devices on onHotplug()
  Assign local device portId 0
  Set device type on first message received
2022-04-04 15:48:29 +00:00
Nathalie Le Clair
c188a56888 Don't remove devices on onHotplug()
This CL affects TV panels and Audio Systems only.
Before HdmiCecNetwork existed: devices were removed when
HotplugDetectionAction detected a hotplug out, and TIF was informed.
Before this CL: devices were removed from the CEC network onHotplug,
but the listener to inform TIF wasn't invoked. This was causing
multiple issues.
After: on TV panels and Audio Systems, only remove devices when
HotplugDetectionAction detects a hotplug out,
just like before HdmiCecNetwork existed.

Test: atest
Bug:213417037

Change-Id: I4181b4650b70101da44fd205e4df9eb566f74496
Merged-In: I4181b4650b70101da44fd205e4df9eb566f74496
2022-04-01 07:07:38 +00:00
David Christie
731c34c0e7 Merge "Update location OWNERS files" am: b3249c820f am: d0e5951d42
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2042803

Change-Id: I42ea4af76cb77bc04eeb17837bae95f3ffb0cb4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 19:53:48 +00:00
David
b84bb82fbc Update location OWNERS files
Test: N/A
Change-Id: I4a2871228a179eb80f556719aae0a78fca1616da
2022-03-28 09:25:17 -07:00
David Christie
5be4f1c431 [automerge] Update GeofenceHardwareRequestParcelable to match parcel/unparcel format. 2p: e20d8ae710
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17183360

Bug: 216631962
Change-Id: Ifb0a5e2aa0d649e100ada36b8019983a59316bf1
2022-03-14 19:51:59 +00:00
David Christie
e20d8ae710 Update GeofenceHardwareRequestParcelable to match parcel/unparcel format.
Test: manual
Bug: 216631962

Change-Id: I3d6d1be9d6c312fe0bf98f600ff8fc9c617f8ec3
2022-03-14 19:51:40 +00:00
Prabir Pradhan
2f67512923 Consolidate input OWNERS files
Make all input OWNERS file point to frameworks/base/INPUT_OWNERS.

Bug: None
Test: upload
Change-Id: I8d6e10585faf7b83cef74cb3a0313c1d8f28efb4
2022-03-10 18:07:50 +00:00
Treehugger Robot
580c3b06ee Merge "Fix registerListener documentation bug in which the notice does not contain the notice contents." am: e1ce0243a3 am: 8ff4db2d9d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1985887

Change-Id: Iabedcceb302623774d7736b3bc313e9c260bb5d9
2022-02-15 15:55:07 +00:00
Treehugger Robot
8ff4db2d9d Merge "Fix registerListener documentation bug in which the notice does not contain the notice contents." am: e1ce0243a3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1985887

Change-Id: Ie1b3cbb261a8aea72a78ba1f6e916344848a1c23
2022-02-15 15:39:12 +00:00
Dereck Bridie
a24c4e8072 Fix registerListener documentation bug in which the notice does not contain the notice contents.
Change-Id: Ia123d583c0f4464b935751e1f389b3998a60d006
2022-02-15 09:34:19 +00:00
Xin Li
5ad6db7742 Merge sc-v2-dev-plus-aosp-without-vendor@8084891
Bug: 214455710
Merged-In: I8cfa435bb6233818adb9cc99dadeeb06a03443d5
Change-Id: Ib93992d88fd1704179009a3872798b9e7b83a6d1
2022-02-11 07:25:43 +00:00
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