Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Unverified Commit 0f31d233 authored by Michael Bestas's avatar Michael Bestas
Browse files

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+BmrEOeAUCZ1IssgAKCRDorT+BmrEO
# eC3+AJ9a9VCKpfOKnMP5ZPWBAd0buMptZACdGRcQ61xSfRS7Qg1QA8FCGEDZst0=
# =+I9z
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri Dec  6 00:44:02 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 2468 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 Jack Yu (19) and others
# Via Android (Google) Code Review (145) and others
* tag 'android-15.0.0_r6': (186 commits)
  Revert "If the phone crash try to clean up the channel which was kept opened. If that fails then try to reuse the existing channel."
  Revert "Check if AID is equals to ISD_R_AID."
  Revert "Optimize euicc invocations by keeping channel open sessi..."
  Cancelling the notification once the satellite conenction got disconnected
  added eSOS test mode flag
  Add some logs for SOS recommender
  Fixed get packages for HSUM devices
  Don't check provisioned condition for register APIs
  Use carrier timer only when connected to carrier satellite within hysteresis time
  CarrierServiceBindHelper: incorrect user unlocked event received in HSUM
  Add onRegistrationFailure api
  CarrierPrivilegesTracker: support HSUM
  Update Usage Setting After Success Rsp from Modem
  Redial CS calls via emergency routing
  Fixed the incorrect check
  Fixed the incorrect uid check for HSUM mode
  Fixed activity not started for current user
  Select proper handler to process datagram transfer state
  Provision to enable VDBG logs through mobile for UICC component.
  Add additional field for CarrierRoamingSatelliteController atom
  ...

 Conflicts:
	src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java
	src/java/com/android/internal/telephony/satellite/SatelliteController.java

Change-Id: If3e2e00bd5457d61fb609ec9a64e18ab5f91c4ee
parents 6f74d80e 00a8e105
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment