Commit graph

2664 commits

Author SHA1 Message Date
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
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
Kelvin Zhang
ba06b04b9e Merge "Use dump.f2fs to extract files from efs partitions" into main 2024-06-05 16:05:21 +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
Dmitry Skiba
ef68e9b578 Restrict kcompactd thread to middle/little cores.
Bug: 340872453
Test: Confirmed kcompactd affinity with taskset -p
Change-Id: I1cc92927dfc22d878819010aa2e9f01b5a3b8851
Signed-off-by: Dmitry Skiba <dskiba@google.com>
2024-05-28 23:50:44 +00:00
Sungtak Lee
ba614b35b9 Merge "Remove codec2 hidl fragments" into main 2024-05-17 06:25:28 +00:00
Sungtak Lee
629eabc6c5 Remove codec2 hidl fragments
Bug: 321808716
Change-Id: Iaf80f2c61cb3d9f1b1761e33ecf92ccc27ad3423
2024-05-16 21:31:54 +00:00
Jerry Huang
80cb09b4c4 Merge "zuma: update performance point based on AP3A.240513.001" into main 2024-05-16 06:34:42 +00:00
Kelvin Zhang
ab17b46c51 Merge "Allow devices to pick ext4 as default fs at build time" into main 2024-05-15 06:08:46 +00:00
Treehugger Robot
1f3594dafe Merge "Split zuma fstab into two files" into main 2024-05-14 23:05:08 +00:00
Kelvin Zhang
5a679bbf76 Allow devices to pick ext4 as default fs at build time
Products using 16KB kernel may wish to boot into 16KB mode
directly. To do this, these targets would need to use ext4
as their default fs type for /data and /metadata . Add
a build time flag which would install ext4 fstabs.

Test: th
Bug: 339337171
Change-Id: I53de1599bbff583b45ca2bf6d3e3efb83957913e
2024-05-14 15:42:14 -07:00
Kelvin Zhang
c542bcfd03 Split zuma fstab into two files
Common fstab entries(everything but /metadata and /data) are
moved to a separate fstab file.
This allows us to create an ext4 variant of the same fstab later.

Test: device boots
Bug: 339337171
Change-Id: I3129551c98b14473c776f2cf3dee1b81fc0c84b3
2024-05-14 10:03:27 -07:00
Jerry Huang
f6025c54da zuma: update performance point based on AP3A.240513.001
Bug: 335350051
Test: CtsMediaDecoderTestCases android.media.decoder.cts.VideoDecoderPerfTest
Change-Id: I54a234ec6f3b1ed59087aacb0e2855477492584e
2024-05-14 09:25:51 +00:00
Joerg Wagner
b15e00e8f5 Merge "Use 2024-03-01 deqp levels for GLES and Vulkan" into main 2024-05-14 08:55:11 +00:00
Treehugger Robot
fe169c6406 Merge "Set default pin amount for home app" into main 2024-05-13 22:59:01 +00:00
Edgar Arriaga
f8a1670819 Set default pin amount for home app
Bug: 288900050
Test: dumpsys pinner
Flag: EXEMPT refactor

Change-Id: I86a1bd0a82513e8b45247b6fc12d4cd7a552d7db
2024-05-13 19:55:06 +00:00
Pawan Wagh
213da03c2b Use lzo-rle for 16kb page kernel
Test: Checked zram compression with 4KB and 16KB kernel
======== Using 4KB kernel================
$ adb shell getconf PAGE_SIZE
4096
$ adb shell cat  /sys/block/zram0/comp_algorithm
[lz77eh] zstd deflate lz4 lzo-rle lzo
======== Using 16KB kernel================
$ adb root
restarting adbd as root
$ adb shell cat  /sys/block/zram0/comp_algorithm
lz77eh zstd deflate lz4 [lzo-rle] lzo
$ adb shell getconf PAGE_SIZE
16384

Bug: 316158358
Change-Id: I068cf4f9ab9a1fdc36f141a1de6f4ea293db9d6f
2024-05-10 01:13:39 +00:00
Shiyong Li
0f9fe30938 Merge "Add sepolicy for power_state node" into 24D1-dev am: eaa2a2ee8c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/27056931

Change-Id: Ib3a211c40b3ce8fbade8ceb2c72b99ef2277191c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-09 05:21:44 +00:00
Shiyong Li
eaa2a2ee8c Merge "Add sepolicy for power_state node" into 24D1-dev 2024-05-09 05:16:16 +00:00
Jörg Wagner
76717decdc Use 2024-03-01 deqp levels for GLES and Vulkan
Bug: 327589279
Change-Id: If76465a473a582a7c5f2502872876b3a682eacc0
2024-05-08 18:46:13 +00:00
Treehugger Robot
fbf479dae5 Merge changes from topic "revert-27206172-revert-26822004-SXUPLCUANW-MLEHIGOHIM" into main
* changes:
  Reland: Copy persist partition files to /data on boot
  Reland: Copy files on EFS partition to /data on boot
2024-05-08 16:13:27 +00:00
Treehugger Robot
b41d97bc37 Merge "Update IDisplay to V11-V12" into main 2024-05-08 10:02:13 +00:00
Leo Chen
388bdee3f5 Update IDisplay to V11-V12
V12 is not frozen yet. We should still allow V11 for `next` build.

Test: trigger test build
Bug: 309897479
Bug: 303162192
Change-Id: I14582a51cde66698013b275ec1d668f858ad7cba
Signed-off-by: Leo Chen <yinchiuan@google.com>
2024-05-08 08:48:46 +00:00
Kelvin Zhang
4bc3f5a338 Reland: 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: I6bcc775f16331905c6896f3a2ec5bbea9e20744f
2024-05-07 21:31:13 -07:00
Kelvin Zhang
b08f8dbf23 Reland: 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: Ide78be316778acfc5c582c4a7b78853796cf4c1e
2024-05-07 21:31:13 -07: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
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
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
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