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
Android Build Coastguard Worker
f82350775f
Snap for 11931036 from 667f2a4670
to 24Q3-release
...
Change-Id: Ic2fcc14b412ecc37c4af6ebece36aac9be32843f
2024-06-05 23:08:22 +00:00
Android Build Coastguard Worker
bbdbad2c7c
Snap for 11931036 from ba06b04b9e
to 24Q3-release
...
Change-Id: I3a3af357084ffda402d0fc075c206826c853c70d
2024-06-05 23:08:21 +00:00
Wesley Lee
cda0de8c3b
enable Zuma AV1 HDR editing
...
Bug: 345301797
Change-Id: I06ceeaadd67e5c3bf5118ab33217b2fcfb554b2b
Signed-off-by: Wesley Lee <szuweilee@google.com>
2024-06-05 15:43:20 -07: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
667f2a4670
Allow copy_efs_files_to_data to read efs block devices
...
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 ext4 device with dev option enabled
Bug: 340965747
Change-Id: Ie3108319cfdb5d922a18863de7431c3cfcc4cf16
2024-06-04 16:49:42 -07: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
Android Build Coastguard Worker
45eb025190
Snap for 11919022 from e0129184f3
to mainline-tzdata6-release
...
Change-Id: Idc4d4252c1d000416000f291e09a43d4799685fb
2024-06-03 15:32:05 +00:00
Android Build Coastguard Worker
fafd41772c
Snap for 11914274 from e0129184f3
to 24Q3-release
...
Change-Id: I53a69c86f29b71f2bd2fddd5acd8e03a9b9b5fa3
2024-06-01 01:03:32 +00:00
Android Build Coastguard Worker
380a00046a
Snap for 11915075 from 79e1531622
to 24Q4-release
...
Change-Id: I33710600a44bc9372a6e2d8f33e0e21a4d797728
2024-06-01 01:03:23 +00:00
Android Build Coastguard Worker
492a60f283
Snap for 11915075 from e0129184f3
to 24Q4-release
...
Change-Id: I311430e4a163db4abad5b113cb13a799022bc828
2024-06-01 01:03:22 +00: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
Android Build Coastguard Worker
2a661c558a
Snap for 11908474 from 79e1531622
to 24Q3-release
...
Change-Id: I38da6fde5b6332366a927e30ed83a61081cf3cb6
2024-05-30 23:03:35 +00:00
Android Build Coastguard Worker
1d78a43cab
Snap for 11908474 from 905072c846
to 24Q3-release
...
Change-Id: I4c873a28044659fee8f8fa11653116f16676a813
2024-05-30 23:03:34 +00: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
Android Build Coastguard Worker
e3a178da81
Snap for 11902131 from 090928722e
to 24Q3-release
...
Change-Id: Ic24673ab0c63239952bf61b92e634b8b7fdb9cce
2024-05-29 23:03:42 +00: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
Xin Li
79e1531622
[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: 42aa8de219
-s ours
...
am skip reason: Merged-In I56143303453cce01d812997ed4a06d815f2a6859 with SHA-1 97a16aff57
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma-sepolicy/+/27273322
Change-Id: Ib48cb1570130e89e98ce755f22b4b222be981e69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 19:46:13 +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
chenkris
090928722e
Add sepolicy for fingerprint HAL to check NSP file
...
Fix the following avc denials:
avc: denied { search } for name="copied" dev="dm-58" ino=428
scontext=u:r:hal_fingerprint_default:s0
tcontext=u:object_r:modem_efs_image_file:s0 tclass=dir
avc: denied { search } for name="persist" dev="dm-58" ino=443
scontext=u:r:hal_fingerprint_default:s0
tcontext=u:object_r:persist_file:s0 tclass=dir
avc: denied { search } for name="ss" dev="dm-58" ino=445
scontext=u:r:hal_fingerprint_default:s0
tcontext=u:object_r:persist_ss_file:s0 tclass=dir
avc: denied { read } for name="nsp" dev="dm-58" ino=15500
scontext=u:r:hal_fingerprint_default:s0
tcontext=u:object_r:persist_ss_file:s0 tclass=file
avc: denied { open } for path="/data/vendor/copied/persist/ss/nsp"
dev="dm-58" ino=15500
scontext=u:r:hal_fingerprint_default:s0
tcontext=u:object_r:persist_ss_file:s0 tclass=file
Bug: 335525798
Test: Use UDFPS repair tool to update calibration files
Change-Id: Ic233a07ced8fd828c0e4b4ae1cffa93763a83b42
2024-05-29 04:39:37 +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
Leo Chen
7c30487eff
Update IDisplay to V12
...
Test: trigger test build
Bug: 309897479
Change-Id: I5f6fb353f1096d600ddbe3a985bd30caf1df97b6
Signed-off-by: Leo Chen <yinchiuan@google.com>
2024-05-23 06:42:16 +00:00
Android Build Coastguard Worker
804c39b6fc
Snap for 11859356 from ba614b35b9
to 24Q3-release
...
Change-Id: Ifa43f35c8f6cf58642f140f1e7ffb2557a0cb641
2024-05-18 03:03:23 +00:00
Sungtak Lee
ba614b35b9
Merge "Remove codec2 hidl fragments" into main
2024-05-17 06:25:28 +00:00
Android Build Coastguard Worker
3271f0670d
Snap for 11853201 from 80cb09b4c4
to 24Q3-release
...
Change-Id: I08bec837c6023583099ae9f028ba742cb0a43833
2024-05-17 01:03:18 +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
Android Build Coastguard Worker
5ddd7b5615
Snap for 11847214 from cdc4acc647
to 24Q3-release
...
Change-Id: I92a3c51fda5a9033640caa6fdfecd5577b58a8f9
2024-05-16 01:03:55 +00:00
Android Build Coastguard Worker
0145d37546
Snap for 11847214 from ab17b46c51
to 24Q3-release
...
Change-Id: Id969f480868fbd9f08ead7b3f9d94798ca9dfa0b
2024-05-16 01:03:54 +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
Wilson Sung
cdc4acc647
Update SELinux error
...
Test: SELinuxUncheckedDenialBootTest
Bug: 340722729
Change-Id: I8f11ea5848724f18765cca2dda91a7d916b82f72
2024-05-15 03:50:08 +00:00
Treehugger Robot
1f3594dafe
Merge "Split zuma fstab into two files" into main
2024-05-14 23:05:08 +00:00
Android Build Coastguard Worker
95a907c784
Snap for 11840485 from b15e00e8f5
to 24Q3-release
...
Change-Id: Iea27b67ac59b9aafefc8ac6951eb4e971c7d7249
2024-05-14 23:03:43 +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