-----BEGIN PGP SIGNATURE-----
iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ9i73wAKCRDorT+BmrEO
eCi5AKCHAzJVFdsm++eJGXcPb6LbaKIGTQCcDiWODLyLOWCK64nt7tfCwTgUFCE=
=3OQU
-----END PGP SIGNATURE-----
gpgsig -----BEGIN SSH SIGNATURE-----
U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgPpdpjxPACTIhnlvYz0GM4BR7FJ
+rYv3jMbfxNKD3JvcAAAADZ2l0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5
AAAAQGzx1CwS4pcfih6dNJzdvsHLng+4M9qD8N/OatGRRJF0ck6x3Qwifdp45ItOlU7d0T
52HZvmRrb/FCpQQR9Z/QE=
-----END SSH SIGNATURE-----
Merge tag 'aml_tz6_351400020' into staging/lineage-23.0_merge-aml_tz6_351400020
aml_tz6_351400020 (13155446,com.google.android.go.tzdata6,com.google.android.tzdata6)
# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ9i73wAKCRDorT+BmrEO
# eCi5AKCHAzJVFdsm++eJGXcPb6LbaKIGTQCcDiWODLyLOWCK64nt7tfCwTgUFCE=
# =3OQU
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Mar 18 02:18:39 2025 EET
# gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [ultimate]
# By Jaegeuk Kim (6) and others
# Via Android (Google) Code Review (55) and others
* tag 'aml_tz6_351400020': (74 commits)
Fix comment
Adjust the version set in manifest xml and matrix xml
Add astd sepolicy to gs-common for P26 factory builds
Allow tachyon service to make binder calls to gca
display: add drm_atomic_state to debug-build bugreport
init.pixel-perf.rc: Setup default rampup multiplier and util_est
Allow write for restorecon
Dump F2FS disk_map and UFS phy version
Fix UFS err_stats
Fix selinux permission denials
move common init perf settings to gs_common
Revert "Set up access control rule for aocxd"
16KB: Move CopyEfsTest to device/google/gs-common
Revert^2 "Add Bluetooth extension HAL - CCO"
gs-common: wlc: add tx update permission for hal_googlebattery
Revert "Add Bluetooth extension HAL - CCO"
storage: fix userdata_exp.ai partition selinux error
Revert "move common init perf settings to gs_common"
insmod-sh: Allow writing to kmsg
RamdumpService: Fix the SELinux errors from introducing Firebase Analytics.
...
Conflicts:
display/dump_pixel_display.mk
Change-Id: Iaa05ef7e62a7b8320f320ad4db482998863fe136
Bug: 382192979
Test: ran abtd test with both git_main and git_main-without-vendor
Flag: EXEMPT Cannot flag mk file changes
Change-Id: Ic7fc13ad191abb1147f35d8d4bd1fd02dc56e772
-----BEGIN PGP SIGNATURE-----
iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ1IssQAKCRDorT+BmrEO
eIS/AJ9ojetnDXDlslBpaDU7nNPVrNv+WgCeMKWKeHmJn6acS37FiZBS9+jvpec=
=JvPS
-----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
iQJLBAABCgA1FiEEHrBYPudH862glXQBzJUERRm+ZmkFAmdY7O4XHG1rYmVzdGFz
QGxpbmVhZ2Vvcy5vcmcACgkQzJUERRm+ZmnGCw//XCwIcPsFqQSwygK76wo5ZsCO
Mex6U5SdmtBecQ2VmIZKofe4/HIog9Wne3GFE6Xjj1bZHxtp/W4uURp6BQ8LuqA5
zqhkzc/Ijz6W+8wJ7n4k+V+N33N9ZYrbxQdqmBbMzLO0kOv86vC0HbKHLLgvT5d4
yYTe3TmGUMXTysky8+Y5YJoIHXqy847ohsOg7yzo9wtEzNZpDXLjDCfp4H8Gei8c
RIw/g+P2WwXGEntlXMtt6lajLF5m2GOtGLL5S+IrtoskpISC6jOmnD+WDwG8VJRW
dts4yqRtB47uz53sLE618zOXE/Tz3Akppq73bJ9I5dk3qHCx7NBVy5HLFE8O6rJL
KVjMj88sMShd4wMbHEy+Sh0jVlcKXuxFJeU0MZ0bqoM5/MDDZXQvJDOOQK7noQHS
RGnsXFwgZnLZEW375FJv4T8S19logSJqAYEkjSdrzU3oIUZqNgFHqQcGDLC8ukOc
79PbK53RvmzyEedYonH7Zn/ImGwmJxlyVey5jFX+O1S9RsVD4AyrgT1dn3s0KniK
1UiPi7sHBsL2yE4rp63UEysFZU9uj2gy3xf4PxBi97LV7mLUfE2YqsDwOrII82Ao
xjyEKTxSMADdwHHI15yf52eNRCf3eBakL54TbZZJ184FZYeTGvOpvc5yCuiITqm9
RauADk94HVdaaMJXyk4=
=l74W
-----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
# eIS/AJ9ojetnDXDlslBpaDU7nNPVrNv+WgCeMKWKeHmJn6acS37FiZBS9+jvpec=
# =JvPS
# -----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 Randall Huang (12) and others
# Via Android (Google) Code Review (58) and others
* tag 'android-15.0.0_r6': (91 commits)
gsc: Change the criteria for building GSC targets
sepolicy: remove irregular policy
Revert^2 "Allow devices that use HIDL to find AIDL radio_ext_service"
Revert "Allow devices that use HIDL to find AIDL radio_ext_service"
gs-common: add rules for euiccpixel_app
audio: allow set_prop for vendor_audio_prop_restricted
Allow devices that use HIDL to find AIDL radio_ext_service
Add sepolicy for NNAPI HAL to access hal_graphics_allocator_service, This is required for AHardwareBuffer allocation.
storage: fix ota selinux error
Storage: add sepolicy for recovery mode
Add sepolicy for gcam app
check_current_prebuilt: Symlink current prebuilt folder to android root
shamp: Update shared_modem_platform HAL version to 3
dumpstate: gsa: Add GSA logs to dumpstate
storage: fix vendor_init avc denied
storage: fix vold avc denied
storage: fix adb bugreport and refactor the existing rules
storage: fix PowerStats avc denied
storage: move sepolicy to common folder
shamp: Update shared_modem_platform HAL version to 2
...
Conflicts:
camera/lyric.mk
storage/init.storage.rc
Change-Id: I5ed6cff3b54261c949ec6ba60b32820b264b4ec2
Add modem_svc_sit to gs-common. modem_svc_sit will support devices from gs101 to zuma_pro. The shared_modem_platform will be updated to support devices after zumapro (not include).
Bug: 372400955
Flag: NONE local testing only
Change-Id: I0bcc9baf69045327e6fcca92ab8003e303db2649
Revert submission 30519089-move_modem_sepolicy
Reason for revert: DroidMonitor: Potential culprit for http://b/380274930 - 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:30519089-move_modem_sepolicy
Change-Id: I241b3aba370f77c705ca3890151e760b4764beca
This reverts commit 1685969e60.
Reason for revert: Droidmonitor created revert due to b/367330939.
Change-Id: Idd70cf3d846fad1a25060ebfb6ae6a99599fd861
Move the type to a common sepolicy so it can be shared.
avc: denied { find } for pid=6493 uid=10256 name=vendor.google.radio_ext.IRadioExt/default scontext=u:r:grilservice_app:s0:c0,c257,c512,c768 tcontext=u:object_r:default_android_service:s0 tclass=service_manager permissive=0
NO_AVC_EVIDENCE_CHECK=default_android_service not supported
Bug: 365099058
Test: manual
Flag: EXEMPT mk file
Change-Id: I9c2471792c2a423e19f1472bd7923a5284f9127e
Bug: 322731425
ag/29120584 provides a new V3 version
Test: `atest vts_treble_vintf_vendor_test:DeviceManifest/SingleAidlTest#HalIsServed/com_google_pixel_shared_modem_platform_ISharedModemPlatform_default_V1_84`
Flag: EXEMPT can't flag manifest changes
Change-Id: Ia91d7499f218a733906173e388a287cd591b8c01
Bug: 364363838
ag/28965951 accidentally started providing a V2 when the manifests only said V1 which broke some VTS tests.
Test: `atest vts_treble_vintf_vendor_test:DeviceManifest/SingleAidlTest#HalIsServed/com_google_pixel_shared_modem_platform_ISharedModemPlatform_default_V1_84`
Flag: EXEMPT can't flag manifest changes
Change-Id: I17113f86e9bceaa3efe2f0d4d76e8349fe2c456e
Bug: 329367768
This is the basic SELinux setup for a HAL. Since this lives in
gs-common and not all pixel devices will have the corresponding vendor
manifest, this hal will have to be marked as optional.
Test: If this was configured incorrectly, then the build should fail
Doc: go/shared-modem-platform-cpp-backend
Change-Id: I6dd0ee3d68ff226e14e3bdffe2e828c1184c1a01
Bug: 328704096
The soong config variable should be defined for all pixel products to
enforce backwards compatability (ensure that this is never built for non
enabled devices). In the case where `SHARED_MODEM_PLATFORM` is not
defined, then the soong config variable will choose the default
placeholder implmentation.
Doc: go/shared-modem-platform-cpp-backend
Test: Build for enabled and disabled targets and ensure that the
correct version of `shared_modem_platform` is being built.
Change-Id: I06ebdada2324fdd86cbb7718fd66602dd52070ea
Since we have a lot of code for modem apps and services that is shared
across a lot of different devices and will live in gs-common, it would
be nice to have ownership of these files so that we can push code
without having to involve the gs-common team.
Test: N/A
Bug: N/A
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3cf675e1f557d5dcc2358457820177a3fa6d7335)
Merged-In: I909392864ee9e0aa29f415d13869ba0083449094
Change-Id: I909392864ee9e0aa29f415d13869ba0083449094
Dynamic log mask events can occur without leaving the logging status
property as enabled, which means when dumpstate should always try to
stop modem logging so that the new logs can be copied over.
Having the copying of logs and stopping of modem logging combined in
one command is no longer an ideal design, so b/289435256 was created
to find a better solution to this.
Test: build, flash, trigger log mask event, check logs in bugreport.
Bug: 302435001
Change-Id: I56358d3f08ac1f2a6099ede14c5e17b5ebffabbd
Several different services need to be able to set the output directory
for copying modem logs, as well as how many files should be copied.
Test: N/A just defining constants
Bug: 302435001
Change-Id: I3e9f2462a42e3b074810e6fb0a925a8ca026f89d
A lot of different modem related processes require reading / writing to
the same android system properties. This CL solifies them all into
one place to avoid duplication.
Test: build
Bug: 302435001
Change-Id: I113f43bb68833224f45ad91668cd327587e1649b
A lot of modem code requires sleeping while vendor services do some
background processing. Since we don't want to actually sleep for unit
tests, an interface is provided here so that a fake sleep can be
injected.
Test: N/A. Directly forwards methods or does nothing.
Bug: 302435001
Change-Id: I3bcf0307156d93756d69cd9f749c88b508ba9466
android_property_manager is moved to its own folder in the root of the
modem folder. This is so that libeomservice proxy has a specific build
target to include.
Test: build, flash, check modem logs in bugreport
Bug: 302435001
Change-Id: Ifc4a0c888717f5c28cf9b642d0b978b495be29d0
Since radioext has already moved to this folder, it doesn't make sense
for the base folder to be dump_modemlog. This change moves it to its
own subfolder so that we can also add more in the future.
Test: build and flash, trigger bugreport and check modem logs are there
Bug: 302435001
Change-Id: Ia83378074068526023f591d63b1e5ac4700b8103
Note: This is copy of the reverted commit
cbc4b64bd1 (ag/24799507) plus the fix to
the problem that caused the revert which is to mark the radio_ext
service as optional in the compatibility matrix.
Bug: 285459428
Test: manually verified dumpsys and logs that service starts without
errors
Change-Id: Ibcd427c501633a95e74e392837b41b0ef513a4a8
Merged-In: Ibcd427c501633a95e74e392837b41b0ef513a4a8
Note: This is copy of the reverted commit
cbc4b64bd1 (ag/24799507) plus the fix to
the problem that caused the revert which is to mark the radio_ext
service as optional in the compatibility matrix.
Bug: 285459428
Test: manually verified dumpsys and logs that service starts without
errors
Change-Id: Ibcd427c501633a95e74e392837b41b0ef513a4a8
This was missed in the porting over from gs201/.../dumpstate.cpp.
Test: Manually trigger bugreport and ensure that LoggingHistory.csv and
LoggingMaskHistory.csv are included
Bug:284275049
Change-Id: Ia630f3f1883b338fa879cfd6ea6bdd4c2a00437c
We have a new syfs file to track the retries for PCIe linkdowns
and CPL timeouts. We are adding it to the dump_modem script to
export it as part of the bugreport.
Bug: 284947288
Change-Id: I42d06ab1e479db0a7cf7b553191bf8407b3bd32f
Signed-off-by: Mahesh Kallelil <kallelil@google.com>
The dump_modem script requires access to wakeup_events sysfs file.
Fixing a typo that caused permission error on accessing that file.
Bug: 281815537
Change-Id: I2f225e73b8515a478b597308b8726bffe6db3a76
Signed-off-by: Mahesh Kallelil <kallelil@google.com>
Adding /dev/logbuffer_cpif and wakeup_events sysfs attribute
under cpif to the modem bugreport.
Test: Tested bugreport on P23
Bug: 278501642
Change-Id: Ic4fcc5d637a59245f966442294e180d19de27f00
Signed-off-by: Mahesh Kallelil <kallelil@google.com>
