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

Commit bbca7e4d authored by Xin Li's avatar Xin Li
Browse files

Merge Android 24Q2 Release (ab/11526283) to aosp-main-future 

Bug: 337098550
Merged-In: I62ca42a254d6faa15a3adaef5ead9a1b9d17d2b1
Change-Id: I70b5d7486cad84db42d1c81285376048573b6b9f
parents cb88595d 61ea56e6

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
// See the License for the specific language governing permissions and

// limitations under the License.





package {

    // See: http://go/android-license-faq

    default_applicable_licenses: [
@@ -108,6 +107,7 @@ java_library { 
        "modules-utils-build_system",

        "modules-utils-fastxmlserializer",

        "modules-utils-statemachine",

        "services-config-update",

    ],



    optimize: {

flags/Android.bp

+12 −11
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ aconfig_declarations { 
    package: "com.android.internal.telephony.flags",

    container: "system",

    srcs: [

        "calling.aconfig",

        "data.aconfig",

        "domainselection.aconfig",

        "ims.aconfig",

flags/calling.aconfig

0 → 100644
+16 −0
Original line number Diff line number Diff line 
package: "com.android.internal.telephony.flags"

container: "system"



flag {

  name: "simultaneous_calling_indications"

  namespace: "telephony"

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

  bug: "297446980"

}



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"

}
 
 No newline at end of file

flags/data.aconfig

+40 −2
Original line number Diff line number Diff line
@@ -2,10 +2,13 @@ package: "com.android.internal.telephony.flags" 
container: "system"



flag {

  name: "auto_switch_allow_roaming"

  name: "auto_data_switch_allow_roaming"

  namespace: "telephony"

  description: "Allow using roaming network as target if user allows it from settings."

  bug: "306488039"

  bug: "287132491"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}



flag {
@@ -91,3 +94,38 @@ flag { 
  description: "Collect vonr status in voice call metric"

  bug:"288449751"

}



flag {

  name: "ignore_existing_networks_for_internet_allowed_checking"

  namespace: "telephony"

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

  bug: "284420611"

}



flag {

  name: "data_call_session_stats_captures_cross_sim_calling"

  namespace: "telephony"

  description: "The DataCallSessionStats metrics will capture whether the IWLAN PDN is set up on cross-SIM calling."

  bug: "313956117"

}



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"

}



flag {

  name: "reconnect_qualified_network"

  namespace: "telephony"

  description: "This flag is for internal implementation to handle reconnect request from QNS in telephony FWK."

  bug: "319520561"

}



flag {

  name: "dsrs_diagnostics_enabled"

  namespace: "telephony"

  description: "Enable DSRS diagnostics."

  bug: "319601607"

}
 
 No newline at end of file

flags/ims.aconfig

+21 −0
Original line number Diff line number Diff line
@@ -42,3 +42,24 @@ flag { 
    description: "This flag terminates active video call instead holding when accepting 2nd incoming video call as audio only"

    bug:"309548300"

}



flag {

    name: "emergency_registration_state"

    namespace: "telephony"

    description: "This flag is created to notify emergency registration state changed."

    bug:"312101946"

}



flag {

    name: "call_extra_for_non_hold_supported_carriers"

    namespace: "telephony"

    description: "For DSDA devices, controls whether the existing call will be dropped when an incoming call on a different sub is answered, when either sub does not support hold capability."

    bug:"315993953"

}



flag {

    name: "update_roaming_state_to_set_wfc_mode"

    namespace: "telephony"

    description: "This flag updates roaming state to set wfc mode"

    bug:"317298331"

}