Commit graph

2265 commits

Author SHA1 Message Date
RD Babiera
04d1e94d10 usb: reattempt to enter displayport alt mode if driver entry process fails
In the kernel, it is possible for the DisplayPort Alt Mode
driver to queue an Enter Mode message to the tcpm and have
that message be interupted by a Power Role or Vconn swap,
which results in the Port Partner never entering Alt Mode.

Add a debounce that checks to make sure that the port partner
enters Alt Mode when DisplayPort Alt Mode is active on the
port. On trigger, reattempt to send Enter Mode through the
tcpm up to 2 times.

Test: Manual test on device - put device into Preferred
      Source role, test to see if Alt Mode reentry triggers
      when original entry is interrupted by PR Swap from
      monitor.
Bug: 308383356
Change-Id: I96563c9900a01e428850e4873371bcdb0225aa07
Signed-off-by: RD Babiera <rdbabiera@google.com>
2023-11-15 22:08:36 +00:00
Treehugger Robot
78a70da442 Merge "zuma: update AIDL IGoogleBattery manifest version to 3" into main 2023-11-13 06:58:05 +00:00
Alan Chen
128a61054b Merge "Add extensive_logging config file" into main 2023-11-13 05:47:28 +00:00
Will McVicker
d6716ccd63 fstab: allow unlocked devices to boot with AVB test key am: 1bc7e21a38 am: 9e663230ab
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/25347023

Change-Id: I21eed5267eeff6443478301fe9b039c27aaf3f99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13 04:39:36 +00:00
Will McVicker
9e663230ab fstab: allow unlocked devices to boot with AVB test key am: 1bc7e21a38
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/25347023

Change-Id: I2af7647f22ccbee3b5dd55f8d022e444d3d461f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13 04:07:51 +00:00
Will McVicker
1bc7e21a38 fstab: allow unlocked devices to boot with AVB test key
Set `avb_keys=no_such_key` for dynamic kernel partitions to allow booting
unlocked devices with a custom kernel. This allows a few things:

1) Dogfooders can flash a custom kernel without wiping their device.
   This can help developers track down hard-to-reproduce bugs without
   rolling out a patch to the whole dogfooder population.
2) Developers can uprev their device's kernel without wiping their
   device or packaging the kernel with an Android platform build.

Note: we are using "no_such_key" to ensure an AVB keys file doesn't
accidentally get created.

Test: Flash CI build. Then flash custom kernel on top.
Bug: 274825778
Change-Id: Ibf3cee491404b9efc18c49936edf64c2e3084adf
2023-11-11 15:44:29 -08:00
Jack Wu
5c6e25c1b1 zuma: update AIDL IGoogleBattery manifest version to 3
Bug: 309518527
Test: TH
Change-Id: I6f80e0456eb5906feb4a6b0243765cbf6978b051
Signed-off-by: Jack Wu <wjack@google.com>
2023-11-11 03:46:33 +00:00
Alan Chen
9c8f2bdaeb Add extensive_logging config file
Bug: 302417853
Test: manual, file shows on device
Change-Id: I930d93ab5f3275bf39373cea51067b9787286da0
2023-11-10 12:42:40 +08:00
Roy Luo
398ceca7a9 usb: update incompatible charger warning reason
Report COMPLIANCE_WARNING_INPUT_POWER_LIMITED instead of
COMPLIANCE_WARNING_OTHER to flag incompatible chargers. The underlying
logic that generates the warning remains the same, what's changed is
the enum that's being used.
The purpose of the change is to have a warning type that better
represents what actually happens and free up COMPLIANCE_WARNING_OTHER
that was intended to act as a fallback reason code.
The flag enable_input_power_limited_warning controls whether to switch
to the new enum, while the flag enable_usb_data_compliance_warning
controls the new enums that are added as FlaggedApi in the framework.
Both flags need to be on to enable the change.

Bug: 308700954
Test: manual tests with local flag override
Change-Id: I6595706d1b83d533fc2d3e29086773270e045ede
2023-11-09 19:11:32 +00:00
Devika Krishnadas
64853c99f4 Merge "Revert^2 "Use graphics allocator 2"" into main 2023-11-08 23:21:09 +00:00
Treehugger Robot
ff513752a1 Merge "zuma: HWC access to panel refresh_ctrl node" into main 2023-11-08 04:20:23 +00:00
Devika Krishnadas
4c7ea96e6b Revert^2 "Use graphics allocator 2"
5c5e1b804f

Bug: 287353739
Test: VtsHalGraphicsMapperV4_0TargetTest
Change-Id: I8ba05825ea3aba89b907adc11c01268ae425f6ed
2023-11-07 06:45:50 +00:00
Jack Wu
5f6d9cc357 dump_power: fix the problem of not being able to dump properties
Bug: 309011602
Test: adb bugreport and check dumpstate_board.txt
Change-Id: I8a6251e03bcf16b2c1f4242a724f1949dab75759
Signed-off-by: Jack Wu <wjack@google.com>
2023-11-06 20:42:03 +08:00
Chris Lu
c09eb8dc6b zuma: HWC access to panel refresh_ctrl node
Bug: 295603692
Test: write the node successfully
Change-Id: I7a5e908ec6d253791954d1b2071f3d59871650eb
2023-11-06 08:02:29 +00:00
Jeff Chang
73d96fb40f Merge "Update default allow list for VRR small dirty detection" into main 2023-11-02 10:48:23 +00:00
Jeff Chang
da02d10181 Update default allow list for VRR small dirty detection
The feature will be enabled by the feature flag

Bug: 308742727
Test: Build
Change-Id: Ifb11472ca2c500923508cf175db130ab56ed9386
2023-11-01 10:30:38 +00:00
Jasmine Cha
4a0a7997b5 Merge "audio: remove prescale for BT absolute volume" into main 2023-11-01 06:02:07 +00:00
Treehugger Robot
d2c07f3b87 Merge "dump_power: adding defender logs for charger and active time" into main 2023-10-30 03:25:58 +00:00
Will Song
fa6626b128 Merge "PREUPLOAD: Enforce jsonlint in preupload" into main 2023-10-29 07:20:18 +00:00
Will Song
89c02823d2 PREUPLOAD: Enforce jsonlint in preupload
Checks syntax and simple brace balances for all JSON files.

Test: Edit any json file and try upload
Bug: 127794899
Change-Id: Ia302d5aa13328ca4e0c7c2c8b10bf54c2542a1ff
2023-10-29 05:47:46 +00:00
Jaegeuk Kim
44082e91da Run fsck to resolve possible data corruption
Cherry-picked from 19eb98145d.

Trigger fsck on mount of /data if the value of ro.preventative_fsck is
not equal to the contents of /metadata/vold/preventative_fsck, then set
the file to the property to prevent future runs

See b/305658663 for context

Bug: 305658663
Test: Make sure fsck run after first boot and not after second
Change-Id: Ie6b9fc94752d91e77e8fc48979216917c1fd9ec3
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2023-10-27 20:52:33 +00:00
Daniel Okazaki
ee805f1dcc dump_power: adding defender logs for charger and active time
Bug: 306108267
Test: build/flash
Test: adb bugreport
Change-Id: I3f67e07853334457c74808869df78c323458f2df
Signed-off-by: Daniel Okazaki <dtokazaki@google.com>
2023-10-27 18:46:12 +00:00
Jaegeuk Kim
f60b0e874f [automerger skipped] [conflict] DO NOT MERGE - Run fsck to resolve possible data corruption am: 19eb98145d am: 707c8849e5 am: 41e8062cf5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2f26d479b3606bdef521c73b2adc286a4e4b881f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 01:50:41 +00:00
Jaegeuk Kim
41e8062cf5 [conflict] DO NOT MERGE - Run fsck to resolve possible data corruption am: 19eb98145d am: 707c8849e5
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/25189351

Change-Id: Ie31d9d93d3c0c9c0f712177eceeb801815b5b209
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 01:18:36 +00:00
Jaegeuk Kim
707c8849e5 [conflict] DO NOT MERGE - Run fsck to resolve possible data corruption am: 19eb98145d
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/25175376

Bug: 305658663
Change-Id: Icc611e53d39734b7f6ce9c70ca601d61ec4d4e33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 20:27:50 +00:00
Jaegeuk Kim
203db0472f [automerger skipped] DO NOT MERGE - Run fsck to resolve possible data corruption am: 9c0fdde694 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6bc22f23a9b529b1339639b2d1296ed7d3d4098d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 02:02:35 +00:00
Jaegeuk Kim
19eb98145d DO NOT MERGE - Run fsck to resolve possible data corruption
Cherry-picked from http://ag/25163335.

Trigger fsck on mount of /data if the value of ro.preventative_fsck is
not equal to the contents of /metadata/vold/preventative_fsck, then set
the file to the property to prevent future runs

See b/305658663 for context

Bug: 305658663
Test: Make sure fsck run after first boot and not after second
Change-Id: I1263d2d55fe22d994ae8c8654b1e75ad9e4ddafe

Change-Id: Ie6b9fc94752d91e77e8fc48979216917c1fd9ec3
Merged-In: Ie6b9fc94752d91e77e8fc48979216917c1fd9ec3
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2023-10-26 01:13:46 +00:00
Jaegeuk Kim
9c0fdde694 DO NOT MERGE - Run fsck to resolve possible data corruption
Cherry-picked from http://ag/25163335.

Trigger fsck on mount of /data if the value of ro.preventative_fsck is
not equal to the contents of /metadata/vold/preventative_fsck, then set
the file to the property to prevent future runs

See b/305658663 for context

Bug: 305658663
Test: Make sure fsck run after first boot and not after second
Change-Id: I1263d2d55fe22d994ae8c8654b1e75ad9e4ddafe

Change-Id: Ie6b9fc94752d91e77e8fc48979216917c1fd9ec3
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2023-10-25 18:12:43 -07:00
Chris.CC Lee
151ef4d45d Grant the post notification permission to SearchSelector am: 7061bc09aa am: e397e410b5
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/25160287

Change-Id: I2d5c7aa6de6710e62e6212387ebafa35a6e495ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 02:03:54 +00:00
Chris.CC Lee
e397e410b5 Grant the post notification permission to SearchSelector am: 7061bc09aa
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/25160287

Change-Id: I712eb4d5a27b742c86579bfb016c1fe882ed0d01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 01:36:52 +00:00
Chris.CC Lee
7061bc09aa Grant the post notification permission to SearchSelector
By the legal requirement, Pixel devices shipped in 2024 shall show the
default browser/search engine selector. The SearchSelector app provides
the selector flow and a non-dismissable notification to comply the
requirement.

This feature is approved for 24Q1 and is required to cherrypick to
selected Pixel devices.

Test: Flash a ROM build and validated the permission being granted by
default.

Bug: 298575926
Bug: 302280560
Change-Id: I895b9f0ed3980e31714ae0ee18071dab8b9039ec
2023-10-24 20:25:00 +08:00
Orhan Uysal
2129b7fe3f Revert "Grant the post notification permission to SearchSelector" am: 7730eb106a am: 22202523d9
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/25153483

Change-Id: I474c171e0c0b1a5ebbdbbd34a3e02894e0d93c79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 11:16:58 +00:00
Orhan Uysal
22202523d9 Revert "Grant the post notification permission to SearchSelector" am: 7730eb106a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/25153483

Change-Id: Ifb0f448ddf960c4fcc7841832196700bddee6c79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 10:51:13 +00:00
Orhan Uysal
7730eb106a Revert "Grant the post notification permission to SearchSelector"
Revert submission 25144243-Initial SearchSelector Drop

Reason for revert: DroidMonitor-triggered revert due to a breakage, bug b/307486020

Bug: 307486020

Reverted changes: /q/submissionid:25144243-Initial+SearchSelector+Drop

Change-Id: I141000a9bc18409652f8824f686793f1e4fdeb3d
2023-10-24 10:30:56 +00:00
Jenny Ho
6f0402322b Merge "pixelstats: add gmsr path" into main 2023-10-24 09:17:20 +00:00
Chris.CC Lee
7996939717 Grant the post notification permission to SearchSelector am: 1ed6fd0235 am: 9ccb00d527
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/25144243

Change-Id: I41be554d4efae1b9b78d4c843d6b6a07414fcd79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 09:13:36 +00:00
Chris.CC Lee
9ccb00d527 Grant the post notification permission to SearchSelector am: 1ed6fd0235
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/25144243

Change-Id: I23d3ff8529bffa5205fa8db490d1509d27b38e70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 08:47:57 +00:00
Chris.CC Lee
1ed6fd0235 Grant the post notification permission to SearchSelector
By the legal requirement, Pixel devices shipped in 2024 shall show the
default browser/search engine selector. The SearchSelector app provides
the selector flow and a non-dismissable notification to comply the
requirement.

This feature is approved for 24Q1 and is required to cherrypick to
selected Pixel devices.

Test: Flash a ROM build and validated the permission being granted by
default.

Bug: 298575926
Bug: 302280560
Change-Id: I86a4d77579039cd76c813103d91e56021ebda361
2023-10-24 14:58:22 +08:00
Jenny Ho
061526f4ab pixelstats: add gmsr path
Bug: 300590097
Change-Id: I413431f41d8cc71727e9473fdf7ba74e2a68d629
Signed-off-by: Jenny Ho <hsiufangho@google.com>
2023-10-24 11:49:30 +08:00
Treehugger Robot
6d8d3d3f8f Merge "Update IDisplay to V10" into main 2023-10-24 02:40:50 +00:00
Sergey Volk
a4c5c5f621 Merge "Add a sysprop for passing errors between HWC and SF" into main 2023-10-23 15:50:54 +00:00
Jacky Liu
a3772510e6 Update i2c pathes with new static i2c bus numbers
Bug: 305242309
Test: Boot to home
Change-Id: I87687b2e3a479a166257ad958ddd07af7967f416
2023-10-23 14:17:22 +08:00
Treehugger Robot
ab93874c5e Merge "pixelstats: add bt_usage sysfs for VendorAudioBTMediaStatsReported" into main 2023-10-23 04:39:20 +00:00
Kieran Cyphus
ebe3cf6812 Merge "Add Lassen Default Mask to list of masks" into main 2023-10-20 03:04:01 +00:00
Sergey Volk
90251c3e31 Add a sysprop for passing errors between HWC and SF
Test: manual
Bug: 283461313
Change-Id: Id18e4431d72533ba92b63fc6139abaf1cf7c7b5c
2023-10-20 02:02:26 +00:00
Bruno BELANYI
ab87cd4fae Merge "Enable HDR shader priming in SurfaceFlinger" into main 2023-10-18 12:44:07 +00:00
Jasmine Cha
d77b117b40 audio: fix typo
Bug: 305838207
Test: build pass/ recording runtime tuning

Change-Id: I9b54b02373fc9a7acb90101941669461079fd60e
Signed-off-by: Jasmine Cha <chajasmine@google.com>
2023-10-17 15:12:53 +08:00
Bruno BELANYI
fd59789d14 Enable HDR shader priming in SurfaceFlinger
Bug: 295257834
Test: manual - check that HDR shaders are generated after applying
Change-Id: I157217a2f86d37dff3eacd7696df121f7b3820d7
2023-10-16 16:30:44 +00:00
Jasmine Cha
e4b0a42691 audio: remove prescale for BT absolute volume
Bug: 302553525
Test: build pass

Change-Id: Ie37a90ec57a00347f183bc0882372ce50a18db75
Signed-off-by: Jasmine Cha <chajasmine@google.com>
2023-10-16 16:16:17 +08:00
RD Babiera
5cc2bfebf4 Merge "usb: enable/disable displayport alt mode through enableUsbData" into main 2023-10-13 21:23:38 +00:00