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

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

Merge tag 'android-14.0.0_r17' into staging/lineage-21.0_merge-android-14.0.0_r17

Android 14.0.0 Release 17 (UQ1A.231205.015)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZXDPMAAKCRDorT+BmrEO
# eEc8AJ9UwD/XggsIR+15nIYAcMJ1UYYHHwCeJagEtfLIjBMe33T39AT4+84hKcY=
# =Frpe
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed Dec  6 21:44:48 2023 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 2182 signatures in the past
#      2 years.  Encrypted 4 messages in the past 23 months.
# 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 Ling Ma (17) and others
# Via Automerger Merge Worker (360) and others
* tag 'android-14.0.0_r17': (64 commits)
  DO NOT MERGE Add helper method in phone to get new carrier config key.
  Only set the vonr setting when sim state loaded
  Add isDataEnabled field.
  Delay data switch untill call alerting
  Update matchAllRuleAllowed flag condition
  Control ratcheting logic based on carrier config
  Profile is getting activated on wrong portIndex
  Update cardId for downloaded embedded profile
  Update bandwidth threshhold for NR advanced
  Fix NR advanced logic for NR NSA
  Check mAdnCache is not null before loading FDN.
  Fix EVENT_SET_NULL_CIPHER_AND_INTEGRITY_DONE Error Handling
  Fixed eSIM activation failed issue
  Keep the TP-MessageRef as is for SMS Fallback
  Revert "Allow IWLAN network when power off modem"
  Fixed subscription database cache out of sync
  Check extras to determine if the call is cross sim
  Fixed incorrect phone number from inactive subscription
  Add logic to keep 5G+/5G UC icon when RRC idle
  Check mAdnCache is not null before loading FDN.
  ...

 Conflicts:
	src/java/com/android/internal/telephony/NetworkTypeController.java
	tests/telephonytests/src/com/android/internal/telephony/NetworkTypeControllerTest.java

Change-Id: Iadb4bc7db1e967b2b4da3c89cdbdbd74b211d43e
parents 52d0b067 9dc4b919
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