Commit graph

2747 commits

Author SHA1 Message Date
Roy Luo
b7c25ccbc3 Use absolute path for udc device am: 0c18eacf8f
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3164638

Change-Id: Ib83ba7a01082822e5eac2d9a311f8ad06b65a19f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-10 19:46:12 +00:00
Roy Luo
0c18eacf8f Use absolute path for udc device
Avoid search in /sys/class/udc directory

Bug: 339241080
Test: tested on Shiba
Flag: EXEMPT bugfix
Change-Id: Iad74cae0d6ad6887d79d705dc8478f1b44532503
Merged-In: Iad74cae0d6ad6887d79d705dc8478f1b44532503
2024-07-10 18:11:50 +00:00
Shikha Panwar
696ed20840 Zuma: Disable Secretkeeper HAL for aosp build am: 91d8fcccea
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3161976

Change-Id: I335c38558c0ea53476e5d077ccb249086aff1161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-08 13:21:34 +00:00
Shikha Panwar
91d8fcccea Zuma: Disable Secretkeeper HAL for aosp build
The AOSP builds do not have a compatible BL for Secretkeeper (24Q3+).
This leads the crashing of HAL since the backing trusty is not updated
with the TA.

Test: lunch aosp & non-aosp targets -> get_build_var SECRETKEEPER_ENABLED
Bug: 350482613
Change-Id: I49d30914bc7a4b2b752a6d9eb7db0e7959638d98
2024-07-08 10:26:16 +00:00
Xin Li
80cfd703d6 Merge 24Q3 (ab/11976889) to aosp-main-future
Bug: 347831320
Merged-In: I38eef1dff949c4275bf0b355582238678a6894a7
Change-Id: I46d9c1d5e2e949cdb9e262921d2f1f4d220d7cba
2024-06-18 14:13:24 -07:00
Treehugger Robot
ba186ad62c Merge "Remove unused device/google/zuma/Android.mk" into main am: 60384da8cb
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3135713

Change-Id: Ic86a2eaaf957d7f9a52cafb7ba11c440ca1f280b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-18 09:27:42 +00:00
Treehugger Robot
60384da8cb Merge "Remove unused device/google/zuma/Android.mk" into main 2024-06-18 09:09:15 +00:00
Xin Li
1aade33ca5 Merge Android 14 QPR3 to AOSP main am: c3387ab656
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3132134

Change-Id: Ib7a8ed951ffe015060bb9ba2f69171fad85243b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-17 20:41:21 +00:00
Herbert Xue
2c8e3651e4 Remove unused device/google/zuma/Android.mk
There is no other Android.mk under subdirectory of device/google/zuma.

Bug: 347619275
Test: NA
Change-Id: I7a5e9afb1ccb75ed66e947a3fa1e0bda2c2223b6
2024-06-17 13:48:03 +08:00
Treehugger Robot
d17f068362 Merge "Add test for copy_efs_files_to_data script" into main 2024-06-14 21:37:11 +00:00
Kelvin Zhang
120974a4b1 Add test for copy_efs_files_to_data script
Test: atest CopyEfsTest
Bug: 346551655
Change-Id: I38eef1dff949c4275bf0b355582238678a6894a7
2024-06-14 13:12:19 -07:00
Xin Li
c3387ab656 Merge Android 14 QPR3 to AOSP main
Bug: 346855327
Merged-In:
Change-Id: I6e2d2db806623c6e6676d852eb62af6b426e9438
2024-06-13 10:49:16 -07:00
Kyle Tso
d17fdff5f8 usb: Log for retry on role switch
Add a log for the retry. Also define the sleep time in the header file.

Bug: 341996696
Change-Id: Ib3cc0c6ad576e7cda26b7f50cdc61d52e6349c78
Signed-off-by: Kyle Tso <kyletso@google.com>
2024-06-13 16:54:37 +08:00
Joey Poomarin Phloyphisut
a9b7137ea9 Merge "pixelstats: add speaker_version sysfs for VendorSpeakerStatsReported" into main 2024-06-13 05:53:30 +00:00
Kyle Tso
9500db736e Merge "usb: Add retry on role switch" into main 2024-06-13 03:32:21 +00:00
Treehugger Robot
866d218686 Merge "Enable copy efs files support on pgagnotic target" into main 2024-06-13 02:46:40 +00:00
Salmax Chang
6432f05383 Merge "Restore permission of efs/efs_backup/modem_userdata after mount" into main 2024-06-12 10:25:58 +00:00
Kyle Tso
ef5856a447 usb: Add retry on role switch
Bug: 341996696
Change-Id: I8caa65288af1588d24fea4aa6c5768d45d69bbd5
Signed-off-by: Kyle Tso <kyletso@google.com>
2024-06-12 09:16:17 +00:00
KRIS CHEN
654485385c Merge "zuma: build fingerprint dump" into main 2024-06-12 04:39:32 +00:00
Treehugger Robot
4e845d9517 Merge "Update IDisplay to V12" into main 2024-06-12 03:20:59 +00:00
Kelvin Zhang
d45d697ded Enable copy efs files support on pgagnotic target
pgagnotic targets might boot into 16KB directly(w/o dev options),
in which case it would need copy efs files support to be enabled.

Test: boot device with dev option disabled, check efs
Bug: 346275905
Change-Id: If18bfa0b0646da8008c6d92bec094b236273cbfc
2024-06-11 16:25:52 -07:00
Kelvin Zhang
d3ce2b9873 Restore permission of efs/efs_backup/modem_userdata after mount
Test: Boot device, erase EFS, check selinux labels
Bug: 345803836
Change-Id: Ia511731e001d74409b40b087432e3535ca5cfc8f
2024-06-11 09:13:27 -07:00
Poomarin Phloyphisut
f3a1a067f1 pixelstats: add speaker_version sysfs for VendorSpeakerStatsReported
Bug: 326342880
Test: Local Test
Change-Id: Ib8c93e9297a7afb61005fb523fd664be0a00b459
2024-06-11 05:49:20 +00:00
chenkris
48e1f2418a zuma: build fingerprint dump
Bug: 346450599
Test: adb bugreport
Change-Id: I83f64cb3aa46007dd41674309a811d5f4c5a52a4
2024-06-11 02:51:37 +00:00
Dennis Shen
4ade1a2615 Merge "switch over to use new storage read api instead of server_configurable_flags, this new read api lib will be needed for new codegened aconfig flag lib." into main 2024-06-07 14:16:53 +00:00
Dennis Shen
1b3d66a9fb switch over to use new storage read api instead of
server_configurable_flags, this new read api lib will be needed for new
codegened aconfig flag lib.

Bug: 321077378
Test m and avd

Change-Id: I99307a4ad8f133232cfd8b47058f936445cb7cce
2024-06-07 13:07:42 +00:00
Xin Li
4dfbd6fc86 [automerger skipped] Merge "Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future" into aosp-main-future am: 646c59ec64 -s ours
am skip reason: Merged-In I7582ba278abcb30cebe041f775efe45633a58bad with SHA-1 82bb1a5112 is already in history

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

Change-Id: I6987b6972a4afa8958e54879bfcaaad2362946e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 21:37:33 +00:00
Xin Li
b8afbb8234 [automerger skipped] Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future am: afc3cc5de2 -s ours
am skip reason: Merged-In I7582ba278abcb30cebe041f775efe45633a58bad with SHA-1 82bb1a5112 is already in history

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

Change-Id: I82ad8f2cbd2af63d183af86c30924e70b0a54f38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 21:36:12 +00:00
Xin Li
646c59ec64 Merge "Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future" into aosp-main-future 2024-06-06 20:54:41 +00:00
Utku Utkan
7b5d247687 Merge "Remove ACCESS_FINE_LOCATION permission pregrant for PCS on Zuma" into main 2024-06-06 17:37:00 +00:00
Jim Tang
4afe14cec9 Make SUPPORT_MULTI_SIM recognizable in bp am: 1f43d128df am: df858c9c6b
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3115579

Change-Id: Ie33600690bfe61b8e867a9cda62361e7e13ece0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 08:35:35 +00:00
Jim Tang
df858c9c6b Make SUPPORT_MULTI_SIM recognizable in bp am: 1f43d128df
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3115579

Change-Id: I738f8061af6233116654c1a3f0af121b90308e89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 08:16:01 +00:00
Jim Tang
1f43d128df Make SUPPORT_MULTI_SIM recognizable in bp
This commit establishes a soong config variable `sim_count` for
easier converting Android.mk to Android.bp when dealing with multiple
SIMs.

Bug: 343823190
Test: presubmit
Change-Id: I93d355e30771868f1c4664eebbce579e1e37cdcb
2024-06-06 15:02:16 +08:00
Xin Li
afc3cc5de2 Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future
Bug: 343100748
Merged-In: I7582ba278abcb30cebe041f775efe45633a58bad
Change-Id: I687291c5b9c17cb27f13fde59370d91ced06ee09
2024-06-05 14:12:12 -07:00
Kelvin Zhang
ba06b04b9e Merge "Use dump.f2fs to extract files from efs partitions" into main 2024-06-05 16:05:21 +00:00
Utku Utkan
e2155d5cc4 Remove ACCESS_FINE_LOCATION permission pregrant for PCS on Zuma
FLAG: EXEMPT Cleanup of obsolete permission pregrant

Bug: 345021501
Test: m && flashall
Change-Id: Ia59acea79baadb45083adc76f52d62a0fb184762
2024-06-05 05:00:19 +00:00
Kelvin Zhang
e3ed1eabdf Use dump.f2fs to extract files from efs partitions
Previously, we rely on mount points to copy files out of
efs partitions. Switch over to dump.f2fs to read directly
from block device without mounting. This allows us to copy
files out of efs partition in both 4K and 16K mode.

Test: Boot dev option enabled ext4 device
Bug: 340965747
Change-Id: I9d3f3d5200adc31f13298488b5be068b0fe7c7f4
2024-06-04 10:02:36 -07:00
Treehugger Robot
e0129184f3 Merge "Add BT offload AOC services for Zuma" into main 2024-05-31 08:45:20 +00:00
Treehugger Robot
db78dab97e Merge "Only copy EFS files if /data is on ext4" into main 2024-05-30 23:52:34 +00:00
Kelvin Zhang
5978809ae7 Only copy EFS files if /data is on ext4
This reduces the amount of computation needed on critical
boot path for F2FS devices. Boot time is expected to improve
with this patch.

Bug: 341216848
Test: boot device with ext4 and f2fs
Change-Id: I7311a22a7bf9773d3909656d98cc578a43cb9477
2024-05-30 16:08:24 -07:00
Dmitry Skiba
905072c846 Merge "Revert "Restrict kcompactd thread to middle/little cores."" into main 2024-05-30 18:50:17 +00:00
Madhav Iyengar
5cdbd02063 Add BT offload AOC services for Zuma
Bug: 342415506
Test: Works with other CLs in topic.

Change-Id: Iadf8bc7baedf0b798de673735a6925f60b992646
2024-05-30 18:11:31 +00:00
Dmitry Skiba
721a8358c6 Revert "Restrict kcompactd thread to middle/little cores."
This reverts commit ef68e9b578.

Reason for revert: avoid 24Q3 (will reland later)

Bug: 340872453
Change-Id: Ia217c0e0f03035267a5b53e3dadaffc4e8febfd3
2024-05-30 16:38:22 +00:00
Zining Jiang
a45c09e380 Merge "[Scone] add BLUETOOTH_CONNECT to SCONE default permission" into main 2024-05-30 08:58:55 +00:00
jiangzining
ed630d88aa [Scone] add BLUETOOTH_CONNECT to SCONE default permission
MBA Approval: b/330640278
Bug: b/343608940
Test: Build and Flash

Change-Id: I93c68928990985244993b0d66edcfc4e05a669be
2024-05-30 15:20:22 +08:00
Dmitry Skiba
5e26ee65f8 Merge "Restrict kcompactd thread to middle/little cores." into main 2024-05-29 22:54:36 +00:00
Cyan_Hsieh
0f8c1340d4 Switch makefile owners to MK_OWNERS am: 86e9f51a58 am: 750d77c19f
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3106782

Change-Id: Idf76a53bdeca73ccd83c968548784a8d9dc19153
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 22:00:00 +00:00
Xin Li
edd718893b [automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: dd443fbb75 -s ours
am skip reason: Merged-In Ifd5f1b609c0bf5fa98677f9880bfa29496add95d with SHA-1 45b0145f0c is already in history

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

Change-Id: I3ff1268af0f6cf0a7a236b8151770d6e7a3670a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 20:48:24 +00:00
Cyan_Hsieh
750d77c19f Switch makefile owners to MK_OWNERS am: 86e9f51a58
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3106782

Change-Id: If1a015f6f3bba24c4f5e2fa3b8f2f610d57a7903
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 14:29:14 +00:00
Cyan_Hsieh
86e9f51a58 Switch makefile owners to MK_OWNERS
Bug: 278167548
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:621df82f7af10ff85fa290af75c729f734cb2938)
Merged-In: I7c3083ad4d881334c6f8f78d89b6a31fcd46c42e
Change-Id: I7c3083ad4d881334c6f8f78d89b6a31fcd46c42e
2024-05-29 10:00:58 +00:00