Commit graph

5656 commits

Author SHA1 Message Date
Xin Li
6794f8de27 [automerger skipped] Merge 24Q3 (ab/11976889) to aosp-main-future am: 1398498663 -s ours
am skip reason: Merged-In Ief591d28aaea4223f05917d29bc896edec065613 with SHA-1 5ff76196c8 is already in history

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

Change-Id: I9417fe46a2e10ad3d4231520cd43976e442835fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-20 19:56:58 +00:00
Kelvin Zhang
763984677a Only copy efs files to /data if device is 16K page size
Test: Boot device, test dev options
Bug: 341216848

Change-Id: I0bf328b8ff90e125dcbca5261fb8dd4e0ad458d8
2024-06-20 11:13:41 -07:00
YiKai Peng
579a541f26 zuma: wlc: add authstart permission
Bug: 348272247
Test: Build/Flash
Flag: EXEMPT bugfix
Change-Id: I881dd032c7dbcc8bca55c1346e02d21b1f2c0145
Signed-off-by: YiKai Peng <kenpeng@google.com>
2024-06-20 06:29:49 +00:00
Android Build Coastguard Worker
cfed47ef14 Snap for 11987757 from 528ffcec22 to 24Q4-release
Change-Id: Ia5f4e1c3d84d55c56f9cd7fcd712c352d9edf141
2024-06-18 23:03:40 +00:00
Android Build Coastguard Worker
24acfc9849 Snap for 11987757 from 2720a57023 to 24Q4-release
Change-Id: Idd8f384d8f3f4903c81dad6ccec793b7ab597028
2024-06-18 23:03:39 +00:00
Xin Li
1398498663 Merge 24Q3 (ab/11976889) to aosp-main-future
Bug: 347831320
Merged-In: Ief591d28aaea4223f05917d29bc896edec065613
Change-Id: I67f7818f77210af410f58ed070b0443af4dbcf56
2024-06-18 14:13:25 -07: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
2720a57023 Merge "Remove unused device/google/zuma/Android.mk" into main am: 60384da8cb am: ba186ad62c
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3135713

Change-Id: I729eac86f45d142a7e07cbbb9166ef8eb2e3e39a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-18 10:02:14 +00: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
528ffcec22 [automerger skipped] Merge Android 14 QPR3 to AOSP main am: 9af99be0b2 -s ours am: 00177acdd0 -s ours
am skip reason: Merged-In I61f611a2fcb900fcb4bb035c2abfbb19a840fddb with SHA-1 42aa8de219 is already in history

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

Change-Id: I8702f8ff010a643436cbab8689384bf2e3833c86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-18 05:56:06 +00:00
Xin Li
54f9d0f7b0 Merge Android 14 QPR3 to AOSP main am: c3387ab656 am: 1aade33ca5
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3132134

Change-Id: Id0a170bed1efab623f82bba624849ef71356a29a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-18 05:55:36 +00:00
Android Build Coastguard Worker
2c3f33edf0 Snap for 11981331 from 7969077e3b to 24Q4-release
Change-Id: I0b7920b8d94ee646e9ad8c8371ae3fb2f43a0523
2024-06-17 23:04:27 +00:00
Android Build Coastguard Worker
c7a783220e Snap for 11981331 from 735afdceb3 to 24Q4-release
Change-Id: I1819d1a8632a7fa9719a9b2020e94edca78abec3
2024-06-17 23:04:26 +00:00
Xin Li
00177acdd0 [automerger skipped] Merge Android 14 QPR3 to AOSP main am: 9af99be0b2 -s ours
am skip reason: Merged-In I61f611a2fcb900fcb4bb035c2abfbb19a840fddb with SHA-1 42aa8de219 is already in history

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

Change-Id: Ica9df917ccf440e316760fae33ed9beff3f7bf27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-17 20:42:11 +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
Treehugger Robot
735afdceb3 Merge "Remove CopyEfsTest from test mapping" into main 2024-06-17 19:02:12 +00:00
Kelvin Zhang
cf0619c40d Remove CopyEfsTest from test mapping
treehugger does not have any test suite setup for zuma target,
and CopyEfsTest should only be run on zuma targets. So remove
from test mapping to unbreak tests.

Test: th
Bug: 347396961
Change-Id: I079d24cae4808d3370c3821412640f7fef1d0cc7
2024-06-17 11:13:53 -07:00
Jerry Huang
fe63fa4236 zuma: video: change to use c2 "default" AIDL service
Bug: 322920559
Change-Id: Ia2e6cac052bc0ee417e179f61804eada9ae87bf5
2024-06-17 08:05:37 +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
9af99be0b2 Merge Android 14 QPR3 to AOSP main
Bug: 346855327
Merged-In: I61f611a2fcb900fcb4bb035c2abfbb19a840fddb
Change-Id: I01a531331e180880cca379ac6f4b6199f2bebd5e
2024-06-13 10:49:16 -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
Android Build Coastguard Worker
8c9dd0dbcd Snap for 11959661 from 7969077e3b to 24Q3-release
Change-Id: I01c3e835b1a3e15068320f89aa7ec3d0460ff794
2024-06-12 23:03:51 +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
Cheng Chang
7969077e3b gps: Move hal_gnss_pixel declaration to device folder am: 5ff76196c8
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/27576137

Change-Id: Ic16f628926a47350f0e0caf7293e1cfa4521a7fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 07:27: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
Cheng Chang
5ff76196c8 gps: Move hal_gnss_pixel declaration to device folder
Bug: 343280252
Test: b/343280252 compile and abtd test
Change-Id: Ief591d28aaea4223f05917d29bc896edec065613
2024-06-11 06:23:21 +00: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
c4f18159a7 Snap for 11947112 from 4ade1a2615 to mainline-tzdata6-release
Change-Id: Ib0d9dbd0b27b29916ee1448c06a4d6b9de655f5d
2024-06-10 10:13:59 +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