Commit graph

5690 commits

Author SHA1 Message Date
Xin Li
2543f5b16d [automerger skipped] Merge 24Q4 into AOSP main am: 61061b74ae -s ours
am skip reason: Merged-In I38afa16f8f85e6aea31ddd5367c2e2d4a3249ced with SHA-1 1a173d6997 is already in history

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

Change-Id: Ie99645db6be25d30257a7df2209f1d6664d761e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-13 19:30:55 -08:00
Xin Li
46f147f372 [automerger skipped] Merge 24Q4 into AOSP main am: c5a0418122 -s ours
am skip reason: Merged-In I1c2fb12e09ffe8083d6b14b0ee5aa957e031ddf3 with SHA-1 f03cc7ce1c is already in history

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

Change-Id: I8b8c13745cfbffbf29411e410fef24fa284aa070
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-13 18:42:00 -08:00
Xin Li
61061b74ae Merge 24Q4 into AOSP main
Bug: 370570306
Merged-In: I38afa16f8f85e6aea31ddd5367c2e2d4a3249ced
Change-Id: I94bb03744bc0fbe5e8706aae30c366266ae770de
2024-12-13 11:15:10 -08:00
Xin Li
c5a0418122 Merge 24Q4 into AOSP main
Bug: 370570306
Merged-In: I1c2fb12e09ffe8083d6b14b0ee5aa957e031ddf3
Change-Id: I1f96c1fc29847035394513fad852d1bacbc43296
2024-12-13 11:15:10 -08:00
Nina Chen
e408d5681e Update SELinux error
Test: SELinuxUncheckedDenialBootTest
Flag: EXEMPT sepolicy
Bug: 383949325
Change-Id: I3392bafe7873812b2e7df6ecec5725097eb085ab
2024-12-12 22:40:45 -08:00
Paulsu Su
4d63a708a3 Set initial value for foreground_window group
For multi-window foreground app group.

Bug: 200769420
Change-Id: I2b65feb4732e33b27155dcfaf0b64a38b1b01026
Test: build pass
Flag: NONE vendor init file does not support flag
2024-12-12 22:14:22 -08:00
Piotr Klasa
8cff6f64fa Merge "Move all vendor_sched parameters and permissions to init.pixel.perf.rc" into main 2024-12-12 04:08:58 -08:00
chenkris
9ea8cdc64f zuma: Add selinux permission for fth
Fix the following avc denials:
avc:  denied  { open } for  path="/dev/fth_fd" dev="tmpfs" ino=1575 scontext=u:r:hal_fingerprint_default:s0 tcontext=u:object_r:device:s0 tclass=chr_file permissive=1
avc:  denied  { read } for  name="wakeup96" dev="sysfs" ino=101698 scontext=u:r:system_suspend:s0 tcontext=u:object_r:sysfs:s0 tclass=dir permissive=0

Bug: 383048849
Test: ls -lZ /sys/devices/platform/odm//odm:fps_touch_handler/wakeup
Test: authenticate fingerprint
Flag: EXEMPT NDK
Change-Id: Iec9de84c8faa6790f9f27c5875b5a822a02fcee9
2024-12-12 00:15:56 -08:00
Chungkai Mei
2716f03d7d set input to 100 explicitly in task_profile
instead of using ADPF, let's use task_profile to boost input tasks'
priroity

Bug: 378761104
Flag: EXEMPT new task_profile behavior
Change-Id: Ice311b1abcf3d629917e16f1490d4cb63fd83796
Signed-off-by: Chungkai Mei <chungkai@google.com>
2024-12-12 05:54:44 +00:00
Rios Kao
0ec0752893 zuma: recorder selinux configuration
note:
      Access Hal property permission.

Test: end-to-end test
Bug: 383647553
Flag: EXEMPT porting existed feature.

Change-Id: I6ac6ea5f573c45e999d81c08aa512b902527d5ef
2024-12-11 19:43:10 -08:00
Daniel Lowe
d822ead370 Merge "[Pixel VPN] Apply reviewed default permissions" into main 2024-12-11 10:38:55 -08:00
Piotr Klasa
3e803739bb Move all vendor_sched parameters and permissions to init.pixel.perf.rc
Bug: 335874870
Test: Checked that permissions and values ​​for all affected files are correct (ls -l, cat)
Flag: EXEMPT not supported by this component yet
Change-Id: Ifbea91bce20e046a6e1b92295814a27e99f41dbe
2024-12-11 15:29:57 +01:00
Michael Bestas
d06bae7ee7
zuma: Update linker.config from AP4A.241205.013
These libraries are used in camera HAL APEX.

Change-Id: I40a7ff722ae55a4ca9fd77f97a2b5e73af1898e2
2024-12-11 04:15:24 +02:00
Michael Bestas
d97db5601b Android 15.0.0 Release 6 (AP4A.241205.013)
-----BEGIN PGP SIGNATURE-----
 
 iFwEABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ1IssQAKCRDorT+BmrEO
 eMmQAJj8v6hZUtdtQwD+swBc8Ai58HICAJ9XVGRsPwZXj4SxZGaw88jxJvza7A==
 =Sdzw
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQJLBAABCgA1FiEEHrBYPudH862glXQBzJUERRm+ZmkFAmdY75kXHG1rYmVzdGFz
 QGxpbmVhZ2Vvcy5vcmcACgkQzJUERRm+ZmnfBBAAtQKkIYEyBoGodGbDN1Edq19Z
 +FQEGwR51+LN5hLV4WElrLfkSbm3rhA44Zw7mu/SoohS+gaJC08jJltvXsABarCM
 pdl6Ng6dhmUXJ27cAjQF3PdZd8qQ0rMDZwfbByHrl0t6T78pWbn+WECw2Yr/gNyn
 FOaGXSuZMAyXAs4xh5Ctx7dW+gQRWx+qlhdl/ZaH+R0ac2tkxLjHJHNk4vAdu+N/
 gCV1B52q2rZLTLBBrptWgEJ05r504z/H+fycUZrccMA5dhbcRtUBq05RPKbwOFVJ
 wXa+B91V818x5XcDW7pxfh6DyL4uqWwaEf4/rtHNjlVx44vC1CETvO1i87KtaJVq
 QvA45oMwIhQZM7SZWqBHHm+GQ2e7wSxAC5UEJwheQLi7y2Xe3nLL1gPW9ddduVKj
 Sdw+Ofis9hjx+/IhYDCnpy+81pMzXKrNnMZrQlc2VQJ2hXz83nyvyiVCjhqROgQh
 7bZoNpJWoaba5vdsZ+sdZVX8DPGE+r70Hx96dAMm0mp2ceGZzn8bBEMnang5m8SW
 sHdlb2KLW2CxDk8Oxpl07Ne36nmmhwO73XBvh7x43gvTN2jcFZ4J9dYwTlLSAfOr
 /1hGJGpvRaAfvlO2wAjooOfjf3ZzEa7HnfkLpf+h02bc8q8lQy6Y6Wc3foOCBG0y
 2XEcxXB4Mhh57TabN/o=
 =IhLY
 -----END PGP SIGNATURE-----

Merge tag 'android-15.0.0_r6' into staging/lineage-22.0_merge-android-15.0.0_r6

Android 15.0.0 Release 6 (AP4A.241205.013)

# -----BEGIN PGP SIGNATURE-----
#
# iFwEABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ1IssQAKCRDorT+BmrEO
# eMmQAJj8v6hZUtdtQwD+swBc8Ai58HICAJ9XVGRsPwZXj4SxZGaw88jxJvza7A==
# =Sdzw
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri Dec  6 00:44:01 2024 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 2483 signatures in the past
#      3 years.  Encrypted 4 messages in the past 2 years.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78

# By Daniel Chapin (3) and others
# Via Android Build Coastguard Worker (30) and others
* tag 'android-15.0.0_r6': (32 commits)
  Make android.framework.stats-v2-ndk app reachable
  Update SELinux error
  Change vendor_fingerprint_prop to vendor_restricted_prop
  Update SELinux error
  storage: move storage related device type to common folder
  Update SELinux error
  Revert^2 "Add udc sysfs to udc_sysfs fs context"
  Label sysfs node power_mode as sysfs_display.
  Revert^2 "zuma: update modem_svc sepolicy for UMI"
  Revert "zuma: update modem_svc sepolicy for UMI"
  Update SELinux error
  zuma: update modem_svc sepolicy for UMI
  Revert "trusty: storageproxy: add fs_ready_rw property context"
  DisplayPort Stats: add sysfs access permission on Zuma devices
  Revert "trusty: storageproxy: add fs_ready_rw property context"
  Revert "trusty: storageproxy: add fs_ready_rw property context"
  Correct the path of tcpm-source-psy device
  add hal_graphics_composer to access thermal temperature
  Revert "Add udc sysfs to udc_sysfs fs context"
  Add udc sysfs to udc_sysfs fs context
  ...

Change-Id: I0f827d7ab63b0cea6e3dfd3c3d28b03f53673a1e
2024-12-11 03:49:13 +02:00
Michael Bestas
164cd2f026 Android 15.0.0 Release 6 (AP4A.241205.013)
-----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ1IssQAKCRDorT+BmrEO
 eGMPAJ0QCkI3LO8goenx8IVscY5slyvypwCfZPPsAYYuAObV7/M/d1gUi/BEM6k=
 =igbk
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQJLBAABCgA1FiEEHrBYPudH862glXQBzJUERRm+ZmkFAmdY74sXHG1rYmVzdGFz
 QGxpbmVhZ2Vvcy5vcmcACgkQzJUERRm+ZmlNLhAAwuaDRS5q8mEBXMshtS3YrJYw
 8WpR+/W0LyK24JZ9mHYx0KxkeZtG8/SIvVDaWtUp24GNvBA9ViW2Kil+PFP0s6NK
 dwGFJNkaxA0NeU6LrJDVhAmW3vdP5D/Urav6NYrHdyLRGbGcTlbcLiMQmD3xuC8A
 U+kwGWItcdccRQ9uHtp+sGqyTanbSWBjWEMYC5FeXzoKHtDfyX33+3l1fwdqmO1K
 xamQbhaz3wITUxWGss7kMhqr6RT8atLeU+0vZUcgw0ZC03B0N7v7RNj8mD9xOyIN
 pGdjyRpultZU5BbPq8ksjStd79DjuaCmOiLZJ9sDMuD9ffG+WLH41csfCFEBWT/Q
 y0/qeemVcrFTBENmPWoSrocJQIPUqGtxJCGHYjuYFoiLkuYMykTjHbvrHcwnyPzV
 9PgsBpbYa60oVysUlrifhkzecWpw8mR84AAxyGaelm1ewhaZVfyLVEGAyIruzf09
 QERb0K3Ut4bN0fHIoMdPgbgVw4+cIa140yiR54iKIEd7bNtYdoYv+onjtS9hvdge
 Et7mSESUid4wGNjcA5W6mOicRSwXC6sJ+I3ACO0Soi9Td6Dzy0d9aNWC/0EA6JJr
 MaGOYxU8wSZ7yH03a2NNsi8eS1SHLBiXWggM+JF4v7BnaaDSIa+aKZgsr92S3dq6
 WqWQWIkgNtLi/WU0JiI=
 =KQw8
 -----END PGP SIGNATURE-----

Merge tag 'android-15.0.0_r6' into staging/lineage-22.0_merge-android-15.0.0_r6

Android 15.0.0 Release 6 (AP4A.241205.013)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ1IssQAKCRDorT+BmrEO
# eGMPAJ0QCkI3LO8goenx8IVscY5slyvypwCfZPPsAYYuAObV7/M/d1gUi/BEM6k=
# =igbk
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri Dec  6 00:44:01 2024 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 2483 signatures in the past
#      3 years.  Encrypted 4 messages in the past 2 years.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78

# By Herbert Xue (6) and others
# Via Android Build Coastguard Worker (48) and others
* tag 'android-15.0.0_r6': (72 commits)
  Set auto prefer idle task name
  Delete TARGET_CPU_VARIANT_RUNTIME.
  Add input event profile to mitigate input latency of input threads
  zuma: avoid vector<const T>
  16kb: Filter out zram.ko for dev options
  Support 16KB data reset
  Deprecate preloaded_nanoapps.json
  Revert "Disable incremental boot_otas"
  Add persist to CopyEfsTest
  Fix CopyEfsTest for symlinks
  Delete PRODUCT_FULL_TREBLE_OVERRIDE.
  Delete PRODUCT_FULL_TREBLE_OVERRIDE.
  Switch from the BFQ to the mq-deadline I/O scheduler
  extended_log: update directory permissions for zuma
  Revert "Add soong config use_google_qns in device/google/zuma/de..."
  Control the "init_dpm.sh" to be built in zuma devices
  Add soong config use_google_qns in device/google/zuma/device.mk
  Control GoogleDialer built from zuma/proprietary/GoogleDialer
  Restore preferred_idle_mask to the default setting
  audio: set util_clamp_min for s/w spatializer to avoid glitches
  ...

Change-Id: Ib335f5799d9c86adc8f9e9c9d1764814f00dc5ca
2024-12-11 03:48:59 +02:00
Android Build Coastguard Worker
d5c536a064 Snap for 12770256 from 2e5674bd21 to 25Q1-release
Change-Id: Ie91e6537c66b2d2445d88dccbd3320ed51be9acd
2024-12-10 00:33:40 +00:00
Android Build Coastguard Worker
bb3e2fd1c0 Snap for 12770256 from 0651bb2055 to 25Q1-release
Change-Id: Ic648c49f4bd9f2e3ad8ac8d52bb7ba5204c0871c
2024-12-10 00:33:39 +00:00
Eileen Lai
0651bb2055 Merge "modem_svc: use modem_svc_sit version sepolicy" into main 2024-12-09 15:09:37 +00:00
Eileen Lai
2e5674bd21 Merge "modem_svc: move shared_modem_platform related sepolicy to gs-common" into main 2024-12-09 15:09:36 +00:00
Nina Chen
b81b3428d8 Update SELinux error
Test: SELinuxUncheckedDenialBootTest
Bug: 383013471
Flag: EXEMPT sepolicy
Change-Id: Ia8c27c5031bb14d77f581b4569a8d39a5613244f
2024-12-09 03:32:09 +00:00
Daniel Lowe
a0b5342eff [Pixel VPN] Apply reviewed default permissions
Pregrantting below permissions:
READ_PHONE_STATE

Flag: EXEMPT add permission pregranted in b/337725984
Bug: 373686360
Test: presubmit, manual install on test device.
Change-Id: If6c3dfb1a29451d7b11a3ff10ec18b4c412056ed
2024-12-09 02:47:29 +00:00
Eileen Lai
4b9ca7c0a7 modem_svc: move shared_modem_platform related sepolicy to gs-common
Bug: 372400955

Change-Id: I3570cf0e90ceebc1ac6d19850e53df6c721b0020
Flag: NONE local testing only
2024-12-08 04:44:23 +00:00
Android Build Coastguard Worker
e6c5403be7 Snap for 12765415 from 5cd7ab9f96 to 25Q1-release
Change-Id: I383a642376e3b00c863c418de1d82782d6e69ed1
2024-12-07 23:06:13 +00:00
Eileen Lai
b6c6a96ce1 modem_svc: use modem_svc_sit version sepolicy
For solving sepolicy conflicts for different AP version, modem_svc_sit will support devices from gs101 to zuma_pro.

Bug: 372400955

Change-Id: Icef24314461008651230779358b253429c277b76
Flag: NONE local testing only
2024-12-07 17:06:11 +00:00
Daniel Zheng
5cd7ab9f96 Merge "update health HAL dependency" into main 2024-12-07 06:50:56 +00:00
Android Build Coastguard Worker
0fe5296007 Snap for 12763142 from 6e4418cacd to 25Q1-release
Change-Id: I93f1a5648c7425eff3b6fdbd27401c9b49a9ec9a
2024-12-07 02:05:49 +00:00
Android Build Coastguard Worker
5a42a2dc11 Snap for 12763142 from f2f02c5df6 to 25Q1-release
Change-Id: Id2a60f78a1ed593cb6bdb09f6e97e0eafc4c077a
2024-12-07 02:05:48 +00:00
Dinesh Yadav
6e4418cacd Merge "Allow tachyon service to make binder calls to GCA" into main 2024-12-06 16:20:42 +00:00
Rick Yiu
f2f02c5df6 Merge "Add sched qos support" into main 2024-12-06 08:20:09 +00:00
Dinesh Yadav
1b7a5a0078 Allow tachyon service to make binder calls to GCA
This permission is needed for tachyon service to call callbacks.

AVC Error seen when tachyon tries accessing GCA:
12-02 11:40:03.212  6987  6987 W com.google.edge: type=1400 audit(0.0:17): avc:  denied  { call } for  scontext=u:r:edgetpu_tachyon_server:s0 tcontext=u:r:google_camera_app:s0:c145,c256,c512,c768 tclass=binder permissive=0
12-03 07:12:26.424  4166  4166 W com.google.edge: type=1400 audit(0.0:254): avc:  denied  { call } for  scontext=u:r:edgetpu_tachyon_server:s0 tcontext=u:r:debug_camera_app:s0:c67,c257,c512,c768 tclass=binder permissive=0

Bug: 381787911
Flag: EXEMPT updates device sepolicy only
Change-Id: I5544fbc11cea0d98dfdeffd9d2871fc037d87c61
2024-12-06 04:13:42 +00:00
Rick Yiu
9cc872da8f Add sched qos support
Add task profiles and set permissions.

Bug: 355612114
Flag: NONE init rc file does not support flag
Test: build pass
Change-Id: I4b285a95b5a9d3934a5b95ba57424a89a98f9b2a
2024-12-06 02:08:57 +00:00
Nelson Li
c9e16ea272 [automerger skipped] Change TARGET_RECOVERY_UI_LIB to use fully qualified names in zuma am: 2620d19ec0 am: c89be9a29c -s ours
am skip reason: Merged-In I2912cbc905ff0ee716c293021c29061e3b6d3dca with SHA-1 d1cf23e6f7 is already in history

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

Change-Id: I48b292a241f1ee1b8531850190b174f6b9b8dea5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-06 01:46:49 +00:00
Nelson Li
c89be9a29c Change TARGET_RECOVERY_UI_LIB to use fully qualified names in zuma am: 2620d19ec0
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3391984

Change-Id: Ibf09f5a3214be084579feed71414fff0e6fb0f5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-06 01:35:49 +00:00
Android Build Coastguard Worker
d32502fc89 Snap for 12755599 from 9f0f02d33e to 25Q1-release
Change-Id: I2fc6c59f454635b424c71c7fcd38a237a8fe3e09
2024-12-06 00:04:25 +00:00
Android Build Coastguard Worker
32d4d59f81 Snap for 12755599 from 188ed581cd to 25Q1-release
Change-Id: I21321831564d66be4b3eeec2e38e8979770b8684
2024-12-06 00:04:24 +00:00
Daniel Zheng
f130ff4e49 update health HAL dependency
Bug: 381926253
Test: th
Change-Id: I1938e9f53a1ceec8f351cca10c97285a4b9588ed
2024-12-05 14:50:09 -08:00
Nina Chen
9f0f02d33e Update SELinux error
Remove b/376602341, b/314054292 and b/367943515 as they are closed

Flag: EXEMPT sepolicy
Test: SELinuxUncheckedDenialBootTest
Bug: 382362125
Change-Id: I7911102a96cdb602fecf8dae5f87c41448b7e6ba
2024-12-05 12:53:03 +08:00
Nelson Li
2620d19ec0 Change TARGET_RECOVERY_UI_LIB to use fully qualified names in zuma
Since the TARGET_RECOVERY_UI_LIB for each device is not exactly the
same, and most of the modules in it contain `soong_namespace{}` to
avoid conflicts between different devices, after converting
`librecovery_ui_ext` from Android.mk to Android.bp, it needs to be
changed to a `fully qualified name` in order to correctly use the
corresponding module.

Flag: EXEMPT refactor

Bug: 339143524
Test: m -j librecovery_ui_ext
Merged-In: I2912cbc905ff0ee716c293021c29061e3b6d3dca
Change-Id: I2912cbc905ff0ee716c293021c29061e3b6d3dca
2024-12-05 03:33:40 +00:00
Treehugger Robot
188ed581cd Merge "Change TARGET_RECOVERY_UI_LIB to use fully qualified names in zuma" into main 2024-12-05 02:39:17 +00:00
Android Build Coastguard Worker
421c286e6d Snap for 12748980 from 18df6c5e6f to 25Q1-release
Change-Id: I0c5f8708cf387f5df55d3e3b87a4d9e5a3207a1c
2024-12-05 00:04:48 +00:00
Android Build Coastguard Worker
2db10c5813 Snap for 12748980 from 443c13a172 to 25Q1-release
Change-Id: I2affef0445fc11e7f0f92dde7c3fd690a06bdb73
2024-12-05 00:04:47 +00:00
Hung-Yeh Lee
0bab5d4ca8 display-dump: make display dump project-specific
Bug: 376426334
Test: adb bugreport
Test: adb shell /vendor/bin/dump/dump_*_display
Test: adb shell /vendor/bin/dump/dump_*_second_display
Flag: EXEMPT bugfix
Change-Id: I3eedbd7bd2ad4574f6ac23ef509d57ebda4fb79d
2024-12-04 14:58:22 +08:00
Juan Yescas
443c13a172 Merge "16kb: zuma: Filter out unnecessary modules from 16k mode" into main 2024-12-04 04:49:34 +00:00
Roy Luo
18df6c5e6f Merge "Add udc sysfs to udc_sysfs fs context" into main 2024-12-04 03:31:01 +00:00
Roy Luo
2a8046a033 Merge "Enable usb state update via udc sysfs" into main 2024-12-04 03:31:01 +00:00
Chaohui Wang
feb420904b Merge "Clean up unnecessary data_connection_5g_plus overlay" into main 2024-12-04 01:21:44 +00:00
Android Build Coastguard Worker
81fcc1c7ad Snap for 12742097 from 7fd5197191 to 25Q1-release
Change-Id: I665ee40d1612bb9f6d3cbe87272c7b615aa9ff13
2024-12-04 00:04:54 +00:00
Nick Kralevich
7463e548bf Fix kasan logic
The command line "kasan=off" should be unconditionally set when we're
compiling for a normal (non-_fullmte) build. The current logic
sets "kasan=off" for a normal ENG build only, which is insufficent.

Test: _fullmte userdebug/eng: "sanitizer-status mte" shows MTE enabled.
Test: _fullmte userdebug/eng: "kasan=off" IS NOT present in /proc/cmdline
Test: !_fullmte userdebug: "sanitizer-status mte" shows MTE disabled.
Test: !_fullmte eng: "sanitizer-status mte" shows MTE enabled
Test: !_fullmte userdebug/eng: "kasan=off" IS present in /proc/cmdline
Change-Id: Idd61747156daa135e919ce71fd63bfab1f4d9239
Bug: 381940217
Flag: EXEMPT bugfix
2024-12-03 10:33:59 -08:00
Xin Li
7fd5197191 [automerger skipped] Merge ab/AP4A.241205.013 into aosp-main-future am: e589918368 -s ours
am skip reason: Merged-In I38afa16f8f85e6aea31ddd5367c2e2d4a3249ced with SHA-1 a6c71987d5 is already in history

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

Change-Id: I49afe6d3367ef8da752021f4e6cf39a44d89de07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-03 18:22:10 +00:00
Chaohui Wang
e9866ccdbf Clean up unnecessary data_connection_5g_plus overlay
This string is not device specific, and already set at,
frameworks/base/packages/SettingsLib/res/values-mcc311-mnc480/strings.xml
frameworks/base/packages/SettingsLib/res/values-mcc310-mnc004/strings.xml

Bug: 377907543
Flag: EXEMPT clean up
Test: m
Change-Id: I3bd290c8839ac510a0b11c70a7aaa55d58591964
2024-12-03 17:30:34 +08:00