Commit graph

2275 commits

Author SHA1 Message Date
Midas Chien
cdd405ec70 display: allow hwcomposer to access DRM module debug file
Change the owner and group of the DRM module debug file to system to
grant permission for hwcomposer.

Bug: 301599195
Test: check HWC can access it
Change-Id: I985c402bc2d920a43493dddd73e9470ab0228104
2023-09-22 16:01:34 +00:00
Treehugger Robot
a20daced19 Merge "usb.rc: Advertise 360p and 480p support through UVC" into udc-qpr-dev am: d9c5533695 am: a505906121
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24812887

Change-Id: I846c2b8c04e73f4f3b3471ba1e4dae2b9eaa26af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 04:38:37 +00:00
Treehugger Robot
a505906121 Merge "usb.rc: Advertise 360p and 480p support through UVC" into udc-qpr-dev am: d9c5533695
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24812887

Change-Id: I000970d97a4788cdc6e61b0d7f61bb534f9fad26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 03:40:13 +00:00
Treehugger Robot
d9c5533695 Merge "usb.rc: Advertise 360p and 480p support through UVC" into udc-qpr-dev 2023-09-22 02:44:20 +00:00
Treehugger Robot
b9abd19bc2 Merge "Set owner for dp_hotplug_error_code" into main 2023-09-21 20:42:33 +00:00
RD Babiera
873766c6f0 usb: check for port partner Thunderbolt capability
Query the port partner's SVIDs when the DisplayPort driver sysfs
is not recognized so that the USB HAL can identify whether or not
the port partner supports Thunderbolt.

Test: manual verification on device - test to see that cableStatus
is set to NOT_CAPABLE on hub that supports Thunderbolt but not
DisplayPort Alt Mode. Then verify that device not capable of being
a DisplayPort sink but does support Thunderbolt does not trigger
this status.
Bug: 288150501
Change-Id: Iaba60ecc5510acecee1e1d3241611906c738a263
Signed-off-by: RD Babiera <rdbabiera@google.com>
2023-09-21 18:28:50 +00:00
Treehugger Robot
2c8f57245a Merge "Usb.cpp: Fix typos when unable to disable USB data" into udc-qpr-dev am: 16d00110ec am: 05f20fefad
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24799970

Change-Id: Ifd028d32242e88a8c9e327f303bdbd2c75df8dab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 11:31:00 +00:00
Treehugger Robot
05f20fefad Merge "Usb.cpp: Fix typos when unable to disable USB data" into udc-qpr-dev am: 16d00110ec
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24799970

Change-Id: Ie035d4904a3c5c66b0758a79866cbe19579c2293
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 10:34:30 +00:00
Treehugger Robot
16d00110ec Merge "Usb.cpp: Fix typos when unable to disable USB data" into udc-qpr-dev 2023-09-21 09:55:00 +00:00
Daniel Sandler
869384d7e5 Merge "Fix a crash trying to boot the device in a pseudolocale." into udc-qpr-dev am: 45b237962d am: fd03d5117c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24812874

Change-Id: I20d17783f967698ccbbe284738b9331abc129e60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 22:07:48 +00:00
Jonglin Lee
7a36dc3576 Merge "Revert "Sched lib affinity and freq settings"" into udc-qpr-dev am: 67ce7e3fa8 am: 7b5ed115a0
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24814561

Change-Id: Ifcc48d916b40fa273f1dd5c2f153d6c1a2c9582f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 22:07:39 +00:00
Daniel Sandler
fd03d5117c Merge "Fix a crash trying to boot the device in a pseudolocale." into udc-qpr-dev am: 45b237962d
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24812874

Change-Id: I13da342facda5521ac79b8ffcba620b423fd7ec6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 21:11:39 +00:00
Jonglin Lee
7b5ed115a0 Merge "Revert "Sched lib affinity and freq settings"" into udc-qpr-dev am: 67ce7e3fa8
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24814561

Change-Id: Ie07a08815c43ed394365ec367df45cc960049b35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 21:11:19 +00:00
Daniel Sandler
45b237962d Merge "Fix a crash trying to boot the device in a pseudolocale." into udc-qpr-dev 2023-09-20 20:20:30 +00:00
Sergey Volk
69e8e28d1e Set owner for dp_hotplug_error_code
dp_hotplug_error_code owner needs to be the system user, since HWC
needs to be able to write into it, to reset the error code.

Test: manual
Bug: 283461313
Change-Id: I0866e39f3cd75878628d44b4afaf53df61448213
2023-09-20 20:19:37 +00:00
Jonglin Lee
67ce7e3fa8 Merge "Revert "Sched lib affinity and freq settings"" into udc-qpr-dev 2023-09-20 20:08:45 +00:00
RD Babiera
05cedc1314 usb: enable/disable displayport alt mode through enableUsbData
Adds functionality for enabling and disabling DisplayPort Alt Mode
on the port through enableUsbData in the USB HAL to comply with USB
restrictions for heightened security mode.

Test: manual test on device - use enableUsbData dumpsys command to
      turn off DisplayPort and then turn it back on while connected to a
      partner sink.
Bug: 297208252
Change-Id: I9f071bce802b728f2229abc08efb2204e4c2505a
Signed-off-by: RD Babiera <rdbabiera@google.com>
2023-09-20 19:52:07 +00:00
David Kimmel
b833218671 Revert "Sched lib affinity and freq settings"
This reverts commit 253d3d48fa.

Reason for revert: Scheduling while atomic b/301031609

Bug: 301031609
Change-Id: I8179a926315da55ede03653a1517f13f61f3fdeb
2023-09-20 19:51:15 +00:00
Klines Jiang
e256e7e39b [automerger skipped] Merge "[SELinux] Add gyotaku_app doamin to Pixel 2023." into udc-qpr-dev am: 192e50a9c6 am: 7b166c874c -s ours
am skip reason: Merged-In I58d9fb298477cc67ec2cd4a308be679e2e75c98d with SHA-1 d7963d3537 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24702883

Change-Id: Ia527c94305d5b0a24ebae3690561208b08727646
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 18:40:23 +00:00
Amit Sunil Dhamne
5454adc8dc Merge "UsbGadget: Update SDP enum timeout when gadget is pulled up" into udc-qpr-dev am: 5d78a3f43b am: e4486f9834
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24805490

Change-Id: I51613d9969e34619e433479e7fe2eae42ec5a88b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 18:38:16 +00:00
Amit Sunil Dhamne
c666d98b7d Merge "usb: Modify sdp enumeration timeout value in charger mode" into udc-qpr-dev am: 1cc4aff2c4 am: 4506a64624
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24805555

Change-Id: Ic0e04355dc132bebfacc8c92e764e2fcafe07875
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 18:35:12 +00:00
Klines Jiang
7b166c874c Merge "[SELinux] Add gyotaku_app doamin to Pixel 2023." into udc-qpr-dev am: 192e50a9c6
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24702883

Change-Id: I70d5611757fb829f852cc4df34dce7a8ec44da8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 18:30:41 +00:00
Klines Jiang
192e50a9c6 Merge "[SELinux] Add gyotaku_app doamin to Pixel 2023." into udc-qpr-dev 2023-09-20 18:03:04 +00:00
Amit Sunil Dhamne
e4486f9834 Merge "UsbGadget: Update SDP enum timeout when gadget is pulled up" into udc-qpr-dev am: 5d78a3f43b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24805490

Change-Id: Ibd39ba1c232a87a8bf60a4e82409e093f39e4c22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 17:39:01 +00:00
Amit Sunil Dhamne
4506a64624 Merge "usb: Modify sdp enumeration timeout value in charger mode" into udc-qpr-dev am: 1cc4aff2c4
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24805555

Change-Id: I23d4bff2471bdb9d256cfbadebb521a51eafe080
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 17:37:50 +00:00
Dan Sandler
daa06b517e Fix a crash trying to boot the device in a pseudolocale.
Bug: 280361527
Test: Boot in XA
Change-Id: Ief6a17da63ebe8ede682cb7fc537af77d02fc183
2023-09-20 17:29:28 +00:00
Avichal Rakesh
429d54af35 usb.rc: Advertise 360p and 480p support through UVC
Many host applications expect and ask for lower resolution streams when
streaming from a USB webcam. To support those applications, this CL
adds support for 640x480 and 640x360 streams.

Bug: 301170431
Test: Manually tested that the resolution is advertised and streamed.
Change-Id: Ifda2322747fced10c164afa98420fd35b17dbdd1
2023-09-20 10:20:55 -07:00
Amit Sunil Dhamne
5d78a3f43b Merge "UsbGadget: Update SDP enum timeout when gadget is pulled up" into udc-qpr-dev 2023-09-20 16:24:48 +00:00
Amit Sunil Dhamne
1cc4aff2c4 Merge "usb: Modify sdp enumeration timeout value in charger mode" into udc-qpr-dev 2023-09-20 16:24:04 +00:00
Richard Chang
77d5f19a0c Merge "Add p23 perf setup script" into udc-qpr-dev am: 5153214bca am: 80d378171c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24798172

Change-Id: Icd4d5e98b8691577dc708949e315b56b5c417102
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 12:19:55 +00:00
Richard Chang
80d378171c Merge "Add p23 perf setup script" into udc-qpr-dev am: 5153214bca
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24798172

Change-Id: I3a202ab9171e71b37fa567a99b8ba38a9f8a0ae8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 11:23:21 +00:00
Richard Chang
5153214bca Merge "Add p23 perf setup script" into udc-qpr-dev 2023-09-20 10:48:47 +00:00
Treehugger Robot
19957d8abc Merge "init.debug.rc: enable etm/etm2dram when SJTAG is unlocked" into main 2023-09-20 08:24:55 +00:00
Jyun LuoLai
4328d4140c Merge "Remove READ_PHONE_STATE for dcservice" into udc-qpr-dev am: a2ebdba340 am: 6e0a55017c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24797288

Change-Id: I12cc54340e7c81642b37fcf9c6ba6584e49d29cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 02:34:24 +00:00
Jyun LuoLai
6e0a55017c Merge "Remove READ_PHONE_STATE for dcservice" into udc-qpr-dev am: a2ebdba340
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24797288

Change-Id: I1bce5566b330c528f3dbcd098fd594b39b440a09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 01:36:49 +00:00
Jyun LuoLai
a2ebdba340 Merge "Remove READ_PHONE_STATE for dcservice" into udc-qpr-dev 2023-09-20 00:33:13 +00:00
Amit Sunil Dhamne
e97fc75c92 usb: Modify sdp enumeration timeout value in charger mode
Write to /sys/class/typec/port<...>/device/update_sdp_enum_timeout
to reduce SDP enumeration timeout value when device is in charger
mode. This will enable faster detection of a DCP port.

ported from 6710e31a629f81cf308e1099f75a01c82db6d006

Test: Validate (in charger mode) that the sysfs attribute is 1
      (meaning lower sdp timeout value is being used). Read dmesg to
      see print showing timeout value is 5000ms.
Bug: 275687235
Change-Id: I1bc872911d7f1eab26e62fe6f12fba05608e0f83
Signed-off-by: Amit Sunil Dhamne <amitsd@google.com>
2023-09-19 13:58:20 -07:00
Amit Sunil Dhamne
e683802386 UsbGadget: Update SDP enum timeout when gadget is pulled up
Indicate to the kernel that the usb gadget is pulled up
by writing to `update_sdp_enum_timeout` sysfs node. Write
to this node will inform the kernel that it can lower the SDP
timeout alarm value which is used to detect an SDP port
vs a DCP.

(ported from c5c5b127a7ed0db559d286284fe77b656bef6945)

Bug:275687235
Test: Check `update_sdp_enum_timeout` is written into after usb
     gadget is pulled up. Verify that the alarm timeout lowers.
Change-Id: Id3ae7e7a20b236cec6604414a7f81860e868bdd0
Signed-off-by: Amit Sunil Dhamne <amitsd@google.com>
2023-09-19 13:45:30 -07:00
Wilson Wu
cf1ef8eb47 Merge "Disable variable refresh rate when typing on zuma" into udc-qpr-dev am: a04563d81b am: 0dad04a877
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24798174

Change-Id: Ia5d574ab18fded55cda3fdc85197827441d76853
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 11:32:12 +00:00
Wilson Wu
0dad04a877 Merge "Disable variable refresh rate when typing on zuma" into udc-qpr-dev am: a04563d81b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24798174

Change-Id: I8ad36b9b76d9e733255d627b2b9ef40813576883
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 10:37:02 +00:00
Wilson Wu
a04563d81b Merge "Disable variable refresh rate when typing on zuma" into udc-qpr-dev 2023-09-19 09:22:05 +00:00
Kuen-Han Tsai
3ce6a5fe2e Usb.cpp: Fix typos when unable to disable USB data
If Usb.cpp cannot write a zero value to the USB_DATA_PATH file, display
the message of "Not able to turn off usb connection notification".

Test: refactoring CL. Existing tests still pass.
Bug: 301016122
Change-Id: I5d2c24154bd1d2c20810bcb4db0a3b2cc575fcfe
2023-09-19 17:03:16 +08:00
Richard Chang
e70b0f0b25 Add p23 perf setup script
Bug: 295218781
Test: Build
Change-Id: I0d708db94f38da16103140b978f8429c8bb9aa7c
2023-09-19 07:11:59 +00:00
Wilson Wu
5d570937bc Disable variable refresh rate when typing on zuma
Turn off config_variableRefreshRateTypingSupported on zuma.

Bug: 299966467
Test: presubmit
Change-Id: I7c58ef2e756553ed11b98b68b846228251942bd2
2023-09-19 06:11:05 +00:00
Kalesh Singh
f2a5ce9f0a zuma: Set max supported page size to 4096 am: 9b743e5938 am: d59cc0f6e0
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24790440

Change-Id: I80956a1765efceb0bb68f20936423554ee07b959
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 04:31:24 +00:00
Kalesh Singh
d59cc0f6e0 zuma: Set max supported page size to 4096 am: 9b743e5938
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24790440

Change-Id: I0f6785d87c07ec78b664c9ea206117872fe968bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 03:36:14 +00:00
Jyun LuoLai
1a3925509e Remove READ_PHONE_STATE for dcservice
We'll rerun the review to use READ_PRIVILEGED_PHONE_STATE in QPR2
instead

Bug: 293811206
TESTED=Manual

Change-Id: I71bc67b102f5c7f021d774c5c505e0a8713f36e6
2023-09-19 01:45:10 +00:00
Kalesh Singh
9b743e5938 zuma: Set max supported page size to 4096
Temporarily reset the max page size on zuma devices to 4096 to avoid
extra gap VMAs in P23 devices for qpr1.

Bug: 300942232
Test: readelf -Wl /system/bin/init
Change-Id: I1fda0599a21c633292062db1278df0fed50de23e
Signed-off-by: Kalesh Singh <kaleshsingh@google.com>
2023-09-18 18:35:13 +00:00
Wei Wang
0cb01e0155 Merge "Sched lib affinity and freq settings" into udc-qpr-dev am: c54ce72fc0 am: 668a34c402
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24542974

Change-Id: I22c1657ca590baa7e96ada6ed0f4516e04ceb108
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 01:45:20 +00:00
Wei Wang
668a34c402 Merge "Sched lib affinity and freq settings" into udc-qpr-dev am: c54ce72fc0
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24542974

Change-Id: Ief8fd9eb8c7d5eecd022fa74a9ed84e1b96de783
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 00:28:59 +00:00