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

Unverified Commit 745fd8c5 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-16.0.0_r4' into staging/lineage-23.2_merge-android-16.0.0_r4 

Android 16.0.0 release 4

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCaS5htAAKCRDorT+BmrEO
# eJutAJ48PgRjYCUcVGGjq+s9qz2r8KD8hgCfXBBXNWF8SNR3SlAd9qYouNdM31s=
# =DUYm
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Dec  2 05:49:08 2025 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [ultimate]

* tag 'android-16.0.0_r4': (190 commits)
  Restored the incorrect CDMA code removal
  Fixed the incorrect dead code removal
  Fixed network capabilities metrics
  [Flag Removal] Remove flag com.android.internal.telephony.flags.qos_update_network_agent
  flags: fix namespace in minimal_telephony_cdm_check_board_api_level
  Fix to not mark MT CS call as an emergency call
  DSRM: Prevent data stall recovered events without prior data stall detected
  Prevent ClassCastException in UiccCarrierPrivilegeRules by adding a type check for the result of iccOpenLogicalChannel.
  Add P-CSCF address flag
  Check against current board API level to look for C/D/M support
  Always use TelephonyCapabilities to check for C/D/M support
  Send onEmergencyModeChanged before returning the result of the enable request
  [Flag Removal] Remove flag com.android.internal.telephony.flags.immediately_process_do_not_show_again_broadcast
  Set emergency mode for E-SMS with test number
  Cleanup flag: disableEcbmBasedOnRat
  Supports to get NR Duplex Mode in ServiceState
  fetch 3 digit mnc correctly for 262-800 mcc mnc
  Fixed multiple remote SIM can't be inserted issue
  Allow NONE service class in terminal based call waiting
  [Telephony][Security Fix] Launch Browser only if device is unlocked.
  ...

 Conflicts:
	proto/src/persist_atoms.proto
	src/java/com/android/internal/telephony/metrics/MetricsCollector.java
	src/java/com/android/internal/telephony/metrics/SatelliteStats.java
	src/java/com/android/internal/telephony/satellite/SatelliteController.java
	src/java/com/android/internal/telephony/satellite/metrics/ControllerMetricsStats.java
	tests/telephonytests/src/com/android/internal/telephony/metrics/PersistAtomsStorageTest.java
	tests/telephonytests/src/com/android/internal/telephony/satellite/SatelliteControllerTest.java

Change-Id: I30ac66865c8cfc9a747a472d2f828c48b48a27c2
parents 9f5f0cbb 864b2fe3

Android.bp

+8 −4
Original line number Diff line number Diff line
@@ -114,10 +114,14 @@ 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"],

        proguard_compatibility: false,

        proguard_flags_files: [

            "proguard.flags",

            ":framework-sdk-proguard-rules",

        ],

        // Disallow access modification during optimization that would promote

        // members into the public or protected API surface.

        protect_api_surface: true,

    },

    lint: {

        baseline_filename: "lint-baseline.xml",

OWNERS

+0 −2
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ grantmenke@google.com 
huiwang@google.com

jackyu@google.com

jayachandranc@google.com

linggm@google.com

pmadapurmath@google.com

rgreenwalt@google.com

sarahchin@google.com
@@ -15,7 +14,6 @@ sasindran@google.com 
tgunn@google.com

tjstuart@google.com

tnd@google.com

xiaotonj@google.com



# Domain Selection code is co-owned, adding additional owners for this code

per-file EmergencyStateTracker*=hwangoo@google.com,avinashmp@google.com,mkoon@google.com,seheele@google.com,jdyou@google.com

flags/calling.aconfig

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

    }

}



# OWNER=tjstuart TARGET=25Q2

flag {

    name: "vvm_async_sim_state_handling"

    namespace: "telephony"

    description: "Prevent ANRs in the VvmSimStateTracker by moving tasks to the background"

    bug:"433343546"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



# OWNER=pmadapurmath TARGET=26Q2

flag {

    name: "support_auto_unhold"

    namespace: "telephony"

    description: "Add support for auto-unholing the bg call for remotely disconnected calls (based on carrier config key)"

    bug:"439893979"

}
 
 No newline at end of file

flags/carrier.aconfig

+6 −25
Original line number Diff line number Diff line 
package: "com.android.internal.telephony.flags"

container: "system"



# OWNER=nharold TARGET=24Q4

flag {

    name: "async_init_carrier_privileges_tracker"

    is_exported: true

    namespace: "telephony"

    description: "Offload the heavyweight initialization of CarrierPrivilegesTracker to a worker thread"

    bug:"357096337"

}



# OWNER=melhuishj TARGET=25Q1

flag {

    name: "cleanup_carrier_app_update_enabled_state_logic"
@@ -31,24 +22,14 @@ flag { 
    bug:"326610112"

}



# OWNER=melhuishj TARGET=25Q3

flag {

    name: "disable_carrier_network_change_on_carrier_app_lost"

    namespace: "telephony"

    description: "Set carrier network change status to false whenever the carrier app is lost"

    bug:"333571417"

    metadata {

      purpose: PURPOSE_BUGFIX

    }

}



# OWNER=melhuishj TARGET=25Q3

# OWNER=tgunn TARGET=26Q2

flag {

    name: "cleanup_carrier_network_change_by_phoneid"

    name: "log_calls_answered_elsewhere"

    is_exported: true

    namespace: "telephony"

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

    bug:"333571417"

    description: "New CC key Log calls which were answered on another device."

    bug: "405460896"

    metadata {

      purpose: PURPOSE_BUGFIX

        purpose: PURPOSE_FEATURE

    }

}

flags/data.aconfig

+28 −24
Original line number Diff line number Diff line
@@ -12,17 +12,6 @@ flag { 
  }

}



# 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

  }

}



# OWNER=sarahchin TARGET=24Q3

flag {

  name: "slicing_additional_error_codes"
@@ -41,15 +30,6 @@ flag { 
  bug:"286171724"

}



# OWNER=jackyu TARGET=25Q2

flag {

  name: "oem_paid_private"

  namespace: "telephony"

  description: "Support OEM_PAID and OEM_PRIVATE networks"

  bug: "366194627"

  is_exported: true

}



# OWNER=gwenlin TARGET=25Q2

flag {

  name: "incall_handover_policy"
@@ -89,17 +69,19 @@ flag { 
    bug:"401006757"

}



# OWNER=sewookseo TARGET=25Q4

# OWNER=rambowang TARGET=25Q4

flag {

  name: "qos_update_network_agent"

  name: "monitor_carrier_config_change_for_auto_data_switch"

  namespace: "telephony"

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

  bug:"412542821"

  description: "This flag lets AutoDataSwitchController monitor carrier config changes and update the policy accordingly."

  bug:"436856439"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}







# OWNER=gwenlin TARGET=26Q2

flag {

  name: "data_service_notify_ims_data_network"
@@ -107,3 +89,25 @@ flag { 
  description: "Support notifying IMS data network"

  bug:"389103112"

}



# OWNER=melhuishj TARGET=25Q4

flag {

  name: "inactive_data_network_is_not_stalled"

  namespace: "telephony"

  description: "A DataNetwork that is not the active DataNetwork should not broadcast a data stall"

  bug:"430976119"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}



# OWNER=melhuishj TARGET=25Q4

flag {

  name: "ignore_initial_data_stall_recovered"

  namespace: "telephony"

  description: "Prevent DataStallRecoveryManager from broadcasting a data stall event during initial setup when no data stall has occurred"

  bug:"432293174"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}