Commit graph

2815 commits

Author SHA1 Message Date
Android Build Coastguard Worker
fe3d51e4fe Snap for 11811809 from 4053a85fe7 to 24Q3-release
Change-Id: Icab9527fb8247df2b17ebe1b4697d5e98934fc66
2024-05-07 23:03:58 +00:00
Pechetty Sravani
4053a85fe7 Revert "Copy files on EFS partition to /data on boot"
Revert submission 26822004

Reason for revert: Potential culprit for b/339099720- verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:26822004

Change-Id: Ie9598a3b3b56c8ce26f475079798c44314696f44
2024-05-07 07:19:37 +00:00
Pechetty Sravani
327973016e Revert "Copy persist partition files to /data on boot"
Revert submission 26822004

Reason for revert: Potential culprit for b/339099720- verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:26822004

Change-Id: I744fccbf1aacd817ca1a0c6f4a121393307c8797
2024-05-07 07:19:37 +00:00
Android Build Coastguard Worker
84c5f5e3b5 Snap for 11806096 from 76caf6b954 to 24Q3-release
Change-Id: Ibfcb4a23bbb9d2fe1a0c6512ec65ef2c95ef360e
2024-05-06 23:03:44 +00:00
Kelvin Zhang
62b3d171c7 Copy persist partition files to /data on boot
Since /persisit was previously mounted during eraly-init stage,
this CL delays the /persist mount to post-fs-data stage.
Actions which depends on the /persist partition are also moved.

Bug: 319335586
Change-Id: I0e70f672b9a5f4b05b95dd30b0a74bb8f91f399a
2024-05-06 15:27:46 -07:00
Kelvin Zhang
7251274bee Copy files on EFS partition to /data on boot
During boot, this CL adds the following sequence of actions:

1. mount original efs partitions(most likely f2fs) on /mnt/vendor/efs
2. copy files in /mnt/vendor/efs to /data/vendor/copied/efs.img
3. fsync all the files in /data/vendor/copied/efs.img
4. rename /data/vendor/copied/efs.img to /data/vendor/copied/efs
5. bind-mount /data/vendor/copied/efs to /mnt/vendor/efs
6. repeat 1-5 for efs_backup and modem_userdata

The original EFS partitions are mounted and only used for file
copying, no destructive action done on original efs partitions.

Test: reformat /data as ext4, boot the device
Bug: 319335586
Change-Id: I4c4024b4cad18199226f5644f98254b2230574d6
2024-05-06 15:27:46 -07:00
Xin Li
dd443fbb75 Merge Android 24Q2 Release (ab/11526283) to aosp-main-future
Bug: 337098550
Merged-In: Ifd5f1b609c0bf5fa98677f9880bfa29496add95d
Change-Id: I15da0840ac7291b41519ae4ae82b09b3c6b5148f
2024-05-06 12:09:17 -07:00
Kelvin Zhang
39eccba58f Support booting on ext4 for zuma devices
When a user opts into 16K developer option, we would need to convert the
/data and /metadata partition into ext4. Add necessary fstab entries for
ext4 so that zuma devices can boot on ext4.

This CL does not automatically switch existing devices to ext4, the
newly added fstab entries are intentionally marked as "non-formattable",
so that we don't accidentally format a wiped device as ext4. This CL
merely allows the device to boot if the /data partition is already
formatted as ext4.

Test: adb shell cmd recovery wipe ext4 , make sure device boots
Bug: 293313353
Change-Id: I3a2a2e9d09cdea884f58b509a06c6829938dc369
2024-05-06 09:05:09 -07:00
Android Build Coastguard Worker
eae37991ed Snap for 11800966 from 736faaf9d3 to 24Q3-release
Change-Id: I7452f786627ecefc4827afc6859c57aae7bf9edb
2024-05-04 01:03:49 +00:00
Jaegeuk Kim
76caf6b954 Adjust the fstab option for ZUFS
Bug: 336319772
Change-Id: Ic3088e693d4dd9f784215da27a5c4b6c47759ef2
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2024-05-03 09:58:17 -07:00
Spade Lee
736faaf9d3 pixelstats: zuma: add all logbuffer paths am: 17b87611d9
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/27101371

Change-Id: I05911df01e73efd658b4a45f325ff2254ddc1e6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-03 05:24:16 +00:00
Android Build Coastguard Worker
6e0d641ac1 Snap for 11778614 from 104dda15e3 to 24Q3-release
Change-Id: I836b6b4b0b97dc18c148576405a56f93ba434a2a
2024-04-29 23:03:36 +00:00
Treehugger Robot
104dda15e3 Merge "Update USES_LASSEN_MODEM soong config settings for aosp projects." into main am: fca2c9d122 am: 646464efa7
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3037358

Change-Id: I2520734af8b8bacbd30d07064f6bc71f2b8cd020
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-29 09:59:33 +00:00
Treehugger Robot
646464efa7 Merge "Update USES_LASSEN_MODEM soong config settings for aosp projects." into main am: fca2c9d122
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3037358

Change-Id: I34b248f1d76b8b90079f775a9c6c76bf3265fea5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-29 09:42:17 +00:00
Treehugger Robot
fca2c9d122 Merge "Update USES_LASSEN_MODEM soong config settings for aosp projects." into main 2024-04-29 09:25:56 +00:00
Herbert Xue
34b4efdcc8 Update USES_LASSEN_MODEM soong config settings for aosp projects.
Add the flag "use_lassen_modem" for bp to do the same checking like
"USES_LASSEN_MODEM" in mk.

Bug: 330654744
Test: 1. lunch aosp_cheetah-trunk_staging-userdebug
      2. m RilConfigService
Change-Id: I4ef0fe469e98fa6315896bbe8c422f741e207664
2024-04-29 16:26:24 +08:00
Qian-Hao Huang
52494655a6 zuma: Change the path of prebuilt fips140.ko
Placing the fips140.ko at the same level as other kernel modules makes
it easier for automation tools to handle all of them.

Bug: 331791671
Change-Id: Id6d978afbd18f98f2a07d418c405699885c05bf0
Signed-off-by: Qian-Hao Huang <qhhuang@google.com>
2024-04-29 06:49:55 +00:00
Spade Lee
17b87611d9 pixelstats: zuma: add all logbuffer paths
Bug: 335934710
Change-Id: I79f65bc1069402a721bf75f97d6973c066a002a9
Signed-off-by: Spade Lee <spadelee@google.com>
2024-04-29 01:39:04 +00:00
Android Build Coastguard Worker
995e522871 Snap for 11766482 from b823c7afcb to 24Q3-release
Change-Id: If406253dc3fa4d0a811f713211b673faa24862e0
2024-04-25 23:03:41 +00:00
Enzo Liao
b823c7afcb [automerger skipped] Merge "Apply common SELinux policies related to ramdumps and coredumps to zuma." into 24D1-dev am: b149c66beb -s ours
am skip reason: Merged-In I9f0d29ef69dc88cb8e876e37aac09ed7331c79b7 with SHA-1 f8c54e9912 is already in history

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

Change-Id: Ifa42ada09fb3d458c02ab9e9f4e3e582b9bc2969
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-25 08:31:23 +00:00
Enzo Liao
1f246cdd5a [automerger skipped] Apply common SELinux policies related to ramdumps and coredumps to zuma. am: 54d3a9babc -s ours
am skip reason: Merged-In I9f0d29ef69dc88cb8e876e37aac09ed7331c79b7 with SHA-1 f8c54e9912 is already in history

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

Change-Id: I19412558e18de4d9c4ea4db61abefb24250ab092
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-25 08:31:15 +00:00
Enzo Liao
b149c66beb Merge "Apply common SELinux policies related to ramdumps and coredumps to zuma." into 24D1-dev 2024-04-25 08:22:07 +00:00
Spade Lee
6efbf8b937 [automerger skipped] pixelstats: zuma: add history validation path am: e5daed552d -s ours
am skip reason: Merged-In Ia134e6b6b8dc0c9db35bcf36bed700b67466f353 with SHA-1 a4b4967c03 is already in history

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

Change-Id: I9dd62a738903955b528b09043c52f6c4d6375b26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-25 08:20:31 +00:00
Chungro Lee
40688b57ec [automerger skipped] pixelstats: move learning/model load path to sysfs am: b9d89f2a98 -s ours
am skip reason: Merged-In I91039ce3a8ee4630a76113ef7ae6be3bc6908f64 with SHA-1 c0f9207cf5 is already in history

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

Change-Id: I467d0bf7a406567daacc4331ad5ff246e3142279
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-25 08:20:29 +00:00
Spade Lee
e5daed552d pixelstats: zuma: add history validation path
Bug: 329174074
Signed-off-by: Spade Lee <spadelee@google.com>
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a4b4967c038aad263bc75f9248a7850355af62a1)
Merged-In: Ia134e6b6b8dc0c9db35bcf36bed700b67466f353
Change-Id: Ia134e6b6b8dc0c9db35bcf36bed700b67466f353
2024-04-25 06:11:11 +00:00
Chungro Lee
b9d89f2a98 pixelstats: move learning/model load path to sysfs
Reporting learning(relaxation) and model loading once a day
 * learning and model loading path moved from uevent to
   sysfs collector.

Bug: 329124192
Signed-off-by: Chungro Lee <chungro@google.com>
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c0f9207cf5ad3b04ac4c64c844ab85c4a6803aab)
Merged-In: I91039ce3a8ee4630a76113ef7ae6be3bc6908f64
Change-Id: I91039ce3a8ee4630a76113ef7ae6be3bc6908f64
2024-04-25 06:11:02 +00:00
Android Build Coastguard Worker
7cd10f70c5 Snap for 11753769 from 6e58e58324 to 24Q3-release
Change-Id: I7b5e449ddd14b5ab65e353ecbfba9cadc53c7141
2024-04-23 23:03:52 +00:00
Sungtak Lee
6e58e58324 Merge "Reapply "Enable AIDL media.c2"" into main 2024-04-23 19:58:23 +00:00
Sungtak Lee
bfc4292c11 Reapply "Enable AIDL media.c2"
This reverts commit 4f00775b4e.

Bug: 321808716
Change-Id: I5f0b50b5e55924ea7c25f3bcfeabc0a4d5b32ffa
2024-04-23 08:50:23 +00:00
Kevin Ying
52be8e937c Add sepolicy for power_state node
Bug: 329703995
Test: manual - use camera
Change-Id: If9f14980e15a3b936bf2117f066e734ee122d72d
Signed-off-by: Kevin Ying <kevinying@google.com>
2024-04-22 22:20:42 +00:00
Enzo Liao
54d3a9babc Apply common SELinux policies related to ramdumps and coredumps to zuma.
Refer: ag/26620507

Bug: 298102808
Design: go/sys-software-logging
Test: Manual
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f8c54e99126678b4147885dbcddf7f0a25f1f3a3)
Merged-In: I9f0d29ef69dc88cb8e876e37aac09ed7331c79b7
Change-Id: I9f0d29ef69dc88cb8e876e37aac09ed7331c79b7
2024-04-22 03:02:41 +00:00
Kelvin Zhang
bb210c9c43 Move EFS/persist mount to a separate fstab
Next CLs in this stack will make changes to persist/efs mount process
This CL will first move relevant code to a separate file for easier
review.

To support booting under 16K page size, we need to copy files on
persist partition(F2FS, which does not support 16K page size)
to data partition(which will would be EXT4 for dev option enabled
devices).

Bug: 319335586
Change-Id: I2750eb8b53431037cecc972448799409345f5ca3
2024-04-19 20:22:56 -07:00
Android Build Coastguard Worker
76e980e515 Snap for 11740859 from 831f38051d to 24Q3-release
Change-Id: Ic08ca931ec86076a5873edd06758aa21beec7459
2024-04-20 01:03:17 +00:00
Priyanka Advani
831f38051d Merge "Revert "Enable AIDL media.c2"" into main 2024-04-19 21:40:43 +00:00
Priyanka Advani
4f00775b4e Revert "Enable AIDL media.c2"
Revert submission 26384060-c2aidl-pixel-enable

Reason for revert: Culprit for b/335892284. Will be verifying through ABTD for confirmation and before submitting the revert.

Reverted changes: /q/submissionid:26384060-c2aidl-pixel-enable

Change-Id: I7b331a48f64b89a19fcedeeae783fe8fc83c22c2
2024-04-19 20:44:19 +00:00
Treehugger Robot
deb2358c5b Merge "Enable AIDL media.c2" into main 2024-04-19 19:09:52 +00:00
Android Build Coastguard Worker
2a14a3a1ee Snap for 11733120 from 76bcb83719 to 24Q3-release
Change-Id: I6841e403508a10493b01313148c18ea3df1fdaaa
2024-04-18 23:03:16 +00:00
Martin Liu
2c344ad3fa move common MM settings to gs common folder
Bug: 332916849
Bug: 309409009
Test: boot
Change-Id: If5515f107b4fb2490d83c2d48c78727bd6f2e51f
Signed-off-by: Martin Liu <liumartin@google.com>
2024-04-18 03:49:46 +00:00
Android Build Coastguard Worker
f773dea246 Snap for 11728787 from 7ba8751e39 to 24Q3-release
Change-Id: Icd30fba115ab9bd9210434bbce5fec831667d580
2024-04-17 23:04:46 +00:00
Shashwat Razdan
76bcb83719 Merge "Revert "Adding android.software.contextualsearch to zuma devices."" into main 2024-04-17 22:44:18 +00:00
Hongyang Jiao
7ba8751e39 Add betterbug.mk to zuma am: 0725eeb711
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/26988195

Change-Id: Id9f23929eeabae57d7c88786388405cad46a3e98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-17 18:10:56 +00:00
Hongyang Jiao
c14d0d9f3d Merge "Revert "Add betterbug mk to zuma"" into 24D1-dev am: d83bf30cf8
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/26631135

Change-Id: I7552511fe6da836a99d40d786d9397ce060ff2ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-17 18:08:41 +00:00
Android Build Coastguard Worker
bb667d5fe9 Snap for 11722130 from 93b48f5934 to 24Q3-release
Change-Id: I09bda9ba5e541c840b4eb7b397d99b52a9bef0c8
2024-04-16 23:03:38 +00:00
Hongyang Jiao
0725eeb711 Add betterbug.mk to zuma
Test: manual test
Bug: 322543833
Change-Id: Ibd314393d11b2552b79a7f73cd7ed888e08934b2
2024-04-16 22:57:07 +00:00
Hongyang Jiao
d83bf30cf8 Merge "Revert "Add betterbug mk to zuma"" into 24D1-dev 2024-04-16 22:47:42 +00:00
Brian Egizi
93b48f5934 [manual merge] Update health AIDL HAL to V3
Change-Id: I276d38e4085707eaf56e72d848f6906d1f35d2d1
2024-04-15 20:52:16 +00:00
David Lin
bdf13ab632 Merge "Update health AIDL HAL to V3" into 24D1-dev 2024-04-15 10:05:53 +00:00
Android Build Coastguard Worker
7f04d5f6ec Snap for 11710546 from 18b05dee0e to 24Q3-release
Change-Id: Ic16b06b46ab63de1e633d41bb06a47337fd13fe8
2024-04-13 01:03:43 +00:00
Treehugger Robot
18b05dee0e Merge "Disable proactive compaction" into main 2024-04-12 15:03:00 +00:00
David Lin
5fdc059a2f [automerger skipped] Merge "Update health AIDL HAL to V3" into 24D1-dev am: ab17ee2548 -s ours
am skip reason: Merged-In I7582ba278abcb30cebe041f775efe45633a58bad with SHA-1 40f89b2d46 is already in history

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

Change-Id: I50e8d53be6e5c869b50eb6e31493b3a4ce36785a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-12 05:27:35 +00:00