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

Unverified Commit 9f5f0cbb authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-16.0.0_r3' into staging/lineage-23.0_merge-android-16.0.0_r3 

Android 16.0.0 Release 3 (BP3A.250905.014)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCaRO/HAAKCRDorT+BmrEO
# eEocAJ9ubov6FREozvGbcPGSz//P8hIfJACeJm2V1KRgw/tVafrzuiAQJUJzigI=
# =9u2K
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed Nov 12 00:56:28 2025 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [ultimate]

# By Aishwarya Mallampati (66) and others
# Via Android (Google) Code Review (179) and Android Build Coastguard Worker (66)
* tag 'android-16.0.0_r3': (202 commits)
  Add satellite config data field for the satellite metrics
  [Satellite] Satellite entitlement data read fix from the persistance memory.
  Distinguish APM vs shut down
  Revert^2 "Notify IMS data network from DataNetwork"
  Handle the event onSatelliteEntitlementStatusUpdated inside SatelliteController handler
  uicc_app_count_check_to_create_channel Flag cleanup.
  imsi_key_retry_download_on_phone_unlock Flag cleanup.
  Introduce UT for UiccPortInfo and UiccCardInfo
  Revert "Revert "Support notifyImsDataNework in CommandsInterface..."
  Revert "Support notifyImsDataNework in CommandsInterface, RILJ a..."
  Revert "Notify IMS data network from DataNetwork"
  Enable explicit R8 compat mode for telephony-common
  Notify IMS data network from DataNetwork
  Support notifyImsDataNework in CommandsInterface, RILJ and proxy
  Support overriding emergency call monitoring timeout duration
  Update resource overlay configuration when default subscription changes
  cleanup flag doNotOverridePreciseLabels
  Introdue aconfig flag for macro-based opportunistic network feature
  force_imsi_certificate_delete Flag cleanup.
  Fixed the empty implementation of fake context
  ...

 Conflicts:
	src/java/com/android/internal/telephony/satellite/DatagramDispatcher.java
	src/java/com/android/internal/telephony/satellite/SatelliteController.java
	tests/telephonytests/src/com/android/internal/telephony/satellite/SatelliteControllerTest.java

Change-Id: I2e31d9b7cdf9bfed64c18275d3638090cf89375b
parents dc243038 3f0afb87

Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -114,6 +114,9 @@ java_library { 
        enabled: true,

        shrink: true,

        obfuscate: false,

        // TODO(b/421510447): Remove compat mode override after resolving

        // issues with API signatures in full mode.

        proguard_compatibility: true,

        proguard_flags_files: ["proguard.flags"],

    },

    lint: {

flags/calling.aconfig

+0 −8
Original line number Diff line number Diff line
@@ -10,14 +10,6 @@ flag { 
  is_exported: true

}



# OWNER=yomna TARGET=24Q3

flag {

  name: "show_call_fail_notification_for_2g_toggle"

  namespace: "telephony"

  description: "Used in DisconnectCause and TelephonyConnection if a non-emergency call fails on a device with no 2G, to guard whether a user can see an updated error message reminding the 2G is disabled and potentially disrupting their call connectivity"

  bug: "300142897"

}



# OWNER=stevestatia TARGET=24Q4

flag {

    name: "national_country_code_formatting_for_local_calls"

flags/carrier.aconfig

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

    }

}



# OWNER=melhuishj TARGET=25Q3

flag {

    name: "cleanup_carrier_network_change_by_phoneid"

    namespace: "telephony"

    description: "use phoneId to cleanup carrierNetworkChange status when carrier app is lost"

    bug:"333571417"

    metadata {

      purpose: PURPOSE_BUGFIX

    }

}

flags/data.aconfig

+51 −12
Original line number Diff line number Diff line 
package: "com.android.internal.telephony.flags"

container: "system"



# OWNER=linggm TARGET=25Q2

# OWNER=linggm TARGET=26Q2

flag {

  name: "auto_data_switch_enhanced"

  name: "keep_wfc_on_apm"

  namespace: "telephony"

  description: "Ramp up RAT signal strength based auto data switch"

  bug: "287132491"

  description: "Keep WFC even when turn on APM."

  bug:"420996981"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}



# OWNER=linggm TARGET=25Q3

flag {

  name: "auto_data_prune_listener"

  namespace: "telephony"

  description: "Unregister listeners when user disable settings or connect to wifi."

  bug:"389591869"

  metadata {

    purpose: PURPOSE_BUGFIX

  }
@@ -30,14 +41,6 @@ flag { 
  bug:"286171724"

}



# OWNER=jackyu TARGET=24Q4

flag {

  name: "dds_callback"

  namespace: "telephony"

  description: "Adding new callback when DDS changed"

  bug:"353723350"

}



# OWNER=jackyu TARGET=25Q2

flag {

  name: "oem_paid_private"
@@ -68,3 +71,39 @@ flag { 
    purpose: PURPOSE_BUGFIX

  }

}



# OWNER=kuenyuet TARGET=26Q2

flag {

  name: "data_service_user_data_toggle_notify"

  namespace: "telephony"

  description: "Support notify data services when user data and user data roaming is toggled."

  bug:"389120182"

}



# OWNER=rambowang TARGET=25Q4

flag {

    name: "macro_based_opportunistic_networks"

    is_exported: true

    namespace: "telephony"

    description: "This flag enable the macro-based opportunistic networks with auto data switch"

    bug:"401006757"

}



# OWNER=sewookseo TARGET=25Q4

flag {

  name: "qos_update_network_agent"

  namespace: "telephony"

  description: "Update network agent in QosCallbackTracker when DN recreates network agent"

  bug:"412542821"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}



# OWNER=gwenlin TARGET=26Q2

flag {

  name: "data_service_notify_ims_data_network"

  namespace: "telephony"

  description: "Support notifying IMS data network"

  bug:"389103112"

}

flags/domainselection.aconfig

+0 −8
Original line number Diff line number Diff line
@@ -34,14 +34,6 @@ flag { 
    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"

}



# OWNER=avinashmp TARGET=25Q1

flag {

    name: "add_ims_redial_codes_for_emergency_calls"