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

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

flags/calling.aconfig

+34 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ container: "system" 
# OWNER=breadley TARGET=24Q3

flag {

  name: "simultaneous_calling_indications"

  is_exported: true

  namespace: "telephony"

  description: "APIs that are used to notify simultaneous calling changes to other applications."

  bug: "297446980"
@@ -19,6 +18,17 @@ flag { 
  bug: "300142897"

}



# OWNER=stevestatia TARGET=24Q4

flag {

    name: "national_country_code_formatting_for_local_calls"

    namespace: "telephony"

    description: "Make requests and bug fixes for formatting local calls based on country codes easier with a more scalable solution."

    bug: "293993310"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



# OWNER=stevestatia TARGET=24Q4

flag {

    name: "remove_country_code_from_local_singapore_calls"
@@ -29,3 +39,26 @@ flag { 
        purpose: PURPOSE_BUGFIX

    }

}



# OWNER=grantmenke TARGET=25Q1

flag {

    name: "remap_disconnect_cause_sip_request_cancelled"

    namespace: "telephony"

    description: "Fix dialer UI bug by remapping disconnect CODE_SIP_REQUEST_CANCELLED to DisconnectCause.NORMAL"

    bug: "351258918"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

    is_exported: true

}



# OWNER=breadley TARGET=24Q4

flag {

    name: "delay_phone_account_registration"

    namespace: "telephony"

    description: "Fix bug where telephony would try to register for PhoneAccounts when Telecom isn't ready yet"

    bug: "349731543"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}

flags/data.aconfig

+31 −71
Original line number Diff line number Diff line
@@ -34,53 +34,6 @@ flag { 
  }

}



# OWNER=linggm TARGET=24Q2

flag {

  name: "use_alarm_callback"

  namespace: "telephony"

  description: "Use alarm callback instead of broadcast."

  bug: "311476875"

}



# OWNER=linggm TARGET=24Q2

flag {

  name: "refine_preferred_data_profile_selection"

  namespace: "telephony"

  description: "Upon internet network connect, refine selection of preferred data profile."

  bug: "311476883"

}



# OWNER=linggm TARGET=24Q2

flag {

  name: "unthrottle_check_transport"

  namespace: "telephony"

  description: "Check transport when unthrottle."

  bug: "303922311"

}



# OWNER=linggm TARGET=24Q1

flag {

  name: "relax_ho_teardown"

  namespace: "telephony"

  description: "Relax handover tear down if the device is currently in voice call."

  bug: "270895912"

}



# OWNER=linggm TARGET=24Q2

flag {

  name: "allow_mmtel_in_non_vops"

  namespace: "telephony"

  description: "Allow bring up MMTEL in nonVops area specified by carrier config."

  bug: "241198464"

}



# OWNER=jackyu TARGET=24Q2

flag {

  name: "metered_embb_urlcc"

  namespace: "telephony"

  description: "Force networks that have PRIORITIZE_BANDWIDTH or PRIORITIZE_LATENCY to be metered."

  bug: "301310451"

  }



# OWNER=sarahchin TARGET=24Q3

flag {
@@ -109,14 +62,6 @@ flag { 
  bug:"286171724"

}



# OWNER=nagendranb TARGET=24Q2

flag {

 name: "notify_data_activity_changed_with_slot"

  namespace: "telephony"

  description: "notify data activity changed for slot id"

  bug: "309896936"

}



# OWNER=qingqi TARGET=24Q3

flag {

  name: "vonr_enabled_metric"
@@ -125,14 +70,6 @@ flag { 
  bug:"288449751"

}



# OWNER=willycwhu TARGET=24Q2

flag {

  name: "ignore_existing_networks_for_internet_allowed_checking"

  namespace: "telephony"

  description: "Ignore existing networks when checking if internet is allowed"

  bug: "284420611"

}



# OWNER=apsankar TARGET=24Q3

flag {

  name: "data_call_session_stats_captures_cross_sim_calling"
@@ -141,14 +78,6 @@ flag { 
  bug: "313956117"

}



# OWNER=jackyu TARGET=24Q2

flag {

  name: "force_iwlan_mms"

  namespace: "telephony"

  description: "When QNS prefers MMS on IWLAN, MMS will be attempted on IWLAN if it can, even though if existing cellular network already supports MMS."

  bug: "316211526"

}



# OWNER=sewook TARGET=24Q3

flag {

  name: "reconnect_qualified_network"
@@ -172,3 +101,34 @@ flag { 
  description: "Write DataRatStateChanged atom"

  bug:"318519337"

}



# OWNER=jackyu TARGET=24Q4

flag {

  name: "dds_callback"

  namespace: "telephony"

  description: "Adding new callback when DDS changed"

  bug:"353723350"

}



# OWNER=jackyu TARGET=25Q1

flag {

  name: "support_network_provider"

  namespace: "telephony"

  description: "Deprecate network factory and adapt the new network provider model from connectivity service"

  bug: "343370895"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}



# OWNER=jackyu TARGET=25Q1

flag {

  name: "sim_disabled_graceful_tear_down"

  namespace: "telephony"

  description: "Gracefully tear down the networks when SIM is disabled."

  bug: "362372940"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}

flags/domainselection.aconfig

+8 −0
Original line number Diff line number Diff line
@@ -33,3 +33,11 @@ flag { 
    description: "This flag controls domain selection metrics."

    bug:"258112541"

}



# OWNER=jdyou TARGET=24Q4

flag {

    name: "hangup_emergency_call_for_cross_sim_redialing"

    namespace: "telephony"

    description: "This flag controls the behavior of terminating an emergency call for cross SIM redialing."

    bug:"336398541"

}

flags/ims.aconfig

+22 −0
Original line number Diff line number Diff line
@@ -115,3 +115,25 @@ flag { 
        purpose: PURPOSE_BUGFIX

    }

}



# OWNER=joonhunshin TARGET=24Q4

flag {

    name: "prevent_hangup_during_call_merge"

    namespace: "telephony"

    description: "This flag prevents hangup call during call merge"

    bug:"317070933"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



# OWNER=joonhunshin TARGET=24Q4

flag {

    name: "avoid_deleting_ims_object_from_cache"

    namespace: "telephony"

    description: "This flag controls deleting cached object to synchronize part of application callback and part of ImsFeature behavior"

    bug:"353577279"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}

flags/messaging.aconfig

+8 −0
Original line number Diff line number Diff line
@@ -39,3 +39,11 @@ flag { 
        purpose: PURPOSE_BUGFIX

    }

}



# OWNER=nykkumar TARGET=25Q2

flag {

  name: "sms_mms_deliver_broadcasts_redirect_to_main_user"

  namespace: "telephony"

  description: "This flag controls the redirection of SMS_DELIVER AND WAP_PUSH_DELIVER broadcasts to the MAIN user."

  bug: "314321617"

}
 
 No newline at end of file