Xin Li
7e18ab81e1
Merge 24Q3 to AOSP main
...
Bug: 357762254
Merged-In: I4b2a0a61ebaff5d85a4daac445d81ae3d21aa9c3
Change-Id: I56e1840b7862737c84f36c73296253726437d1ca
2024-09-05 17:02:39 -07:00
Elliott Hughes
d19b0c3942
The "messaging" package is being removed. am: bc6bb134b9
...
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3241223
Change-Id: I28aaa9dcc65b92db914834d4f2d835d420c7533a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-26 20:48:25 +00:00
Elliott Hughes
bc6bb134b9
The "messaging" package is being removed.
...
Change-Id: Ib952aa3798af0cd39f745991064433700b178e14
2024-08-26 16:06:18 +00:00
Xin Li
ac39e0aa98
Merge "Merge 24Q3 (ab/AP3A.240905.001) to aosp-main-future" into aosp-main-future
2024-08-12 17:14:31 +00:00
Cyan_Hsieh
a385f17c95
Add FSTAB_OWNERS and update OWNERS to include Android.bp am: 4c5e386a84
...
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3211864
Change-Id: Ie8d81638daa40c9bf4201fbb441e64d487ccc5ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-09 10:49:02 +00:00
Cyan_Hsieh
4c5e386a84
Add FSTAB_OWNERS and update OWNERS to include Android.bp
...
Flag: EXEMPT only changing OWNERS
Bug: 357036384
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4c28299c722226798388ceeade9859f05c6d33a1 )
Merged-In: I473ff74c06daabcd635eb464766f04725a2c2fbd
Change-Id: I473ff74c06daabcd635eb464766f04725a2c2fbd
2024-08-09 08:34:33 +00:00
Xin Li
868dc34238
Merge 24Q3 (ab/AP3A.240905.001) to aosp-main-future
...
Bug: 347831320
Merged-In: I4b2a0a61ebaff5d85a4daac445d81ae3d21aa9c3
Change-Id: I25d1a1793cc9eb7df743d1e6e9bc84e5f75fbd7d
2024-08-08 11:16:10 -07:00
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
Android Build Coastguard Worker
5ac4bfe691
Merge cherrypicks of ['googleplex-android-review.googlesource.com/27906354', 'googleplex-android-review.googlesource.com/27956012'] into 24Q3-release.
...
Change-Id: Ifa6c5d849423bf2cf03ad8a3bddb1a0a3ded8a87
2024-07-10 05:23:53 +00:00
Kelvin Zhang
2d0a254101
Mount persist partition in early-init
...
The graphics hal might need to access /persist early in the boot
process. So mount persist early for 4K devices.
Test: boot 4K device
Bug: 338504890
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:73a68dd6d3794ed8a4e791f2c86c4e55a61ea2aa )
Merged-In: I4b2a0a61ebaff5d85a4daac445d81ae3d21aa9c3
Change-Id: I4b2a0a61ebaff5d85a4daac445d81ae3d21aa9c3
2024-07-10 05:10:21 +00:00
Kelvin Zhang
9d0f747603
Only copy efs files to /data if device is 16K page size
...
Test: Boot device, test dev options
Bug: 341216848
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:763984677a0630a2100b150c057c3d128a8f6c3d )
Merged-In: I0bf328b8ff90e125dcbca5261fb8dd4e0ad458d8
Change-Id: I0bf328b8ff90e125dcbca5261fb8dd4e0ad458d8
2024-07-10 05:10:05 +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
Android Build Coastguard Worker
4b4d45dee1
Merge cherrypicks of ['googleplex-android-review.googlesource.com/28051077'] into 24Q3-release.
...
Change-Id: Iae0bff35c67755063410c2758d47c13229fc864a
2024-06-28 23:16:37 +00:00
liangjlee
3e96ca1dcf
zuma: Include power/power.mk
...
Bug: 331612600
Flag: EXEMPT (bug 337358613)
Signed-off-by: liangjlee <liangjlee@google.com>
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:48c79683bcac4b697cfa08949dfa4c4c7daed683 )
Merged-In: I370cd115855b43d890dd488de65572593b238efb
Change-Id: I370cd115855b43d890dd488de65572593b238efb
2024-06-28 23:08:36 +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
Android Build Coastguard Worker
1a0e33236c
Snap for 11975806 from d17f068362
to 24Q3-release
...
Change-Id: Ic3830a2992458b6bbfd8c8fefe3cd0ba1037d53f
2024-06-15 21:03:25 +00:00
Android Build Coastguard Worker
5cc832e4e7
Snap for 11973804 from d17fdff5f8
to 24Q3-release
...
Change-Id: I8b384c229281b36e39d2361148e093d81c48593f
2024-06-15 01:03:32 +00: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
Android Build Coastguard Worker
0562582075
Snap for 11967491 from a9b7137ea9
to 24Q3-release
...
Change-Id: I033bb919c5dc1fb879e77b5e03b01b819c5f111c
2024-06-13 23:03:29 +00: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
Android Build Coastguard Worker
a134922ea9
Snap for 11959661 from 6432f05383
to 24Q3-release
...
Change-Id: Ib639adf8cb2c09216c824e26ffa0f6589c5d1975
2024-06-12 23:03:50 +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
Android Build Coastguard Worker
83d4a1011f
Snap for 11944020 from 4ade1a2615
to 24Q3-release
...
Change-Id: I0b2c2c5aac0a992b845ae8d011eeca6f01b49d86
2024-06-08 01:03:57 +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
Android Build Coastguard Worker
69a598cb70
Snap for 11938003 from 7b5d247687
to 24Q3-release
...
Change-Id: I916ed10111bd857712360dda6ea2e6b398e31351
2024-06-06 23:03:31 +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