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

Commit 127a0ecf authored by Xin Li's avatar Xin Li
Browse files

Merge 25Q1 (ab/12770256) to aosp-main-future 

Bug: 385190204
Merged-In: I1c5acde9514207aba7cabceeaca9ccbd8c7f461a
Change-Id: I6a1d965a56f4f370c3dc9971999fe34a32219e75
parents e1eb84d9 2f27354e

Android.bp

+8 −8
Original line number Diff line number Diff line
@@ -82,14 +82,14 @@ java_library { 
        "android.hardware.radio-V1.4-java",

        "android.hardware.radio-V1.5-java",

        "android.hardware.radio-V1.6-java",

        "android.hardware.radio.config-V3-java",

        "android.hardware.radio.data-V3-java",

        "android.hardware.radio.ims-V2-java",

        "android.hardware.radio.messaging-V3-java",

        "android.hardware.radio.modem-V3-java",

        "android.hardware.radio.network-V3-java",

        "android.hardware.radio.sim-V3-java",

        "android.hardware.radio.voice-V3-java",

        "android.hardware.radio.config-V4-java",

        "android.hardware.radio.data-V4-java",

        "android.hardware.radio.ims-V3-java",

        "android.hardware.radio.messaging-V4-java",

        "android.hardware.radio.modem-V4-java",

        "android.hardware.radio.network-V4-java",

        "android.hardware.radio.sim-V4-java",

        "android.hardware.radio.voice-V4-java",

        "voip-common",

        "ims-common",

        "unsupportedappusage",

flags/Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ aconfig_declarations { 
        "subscription.aconfig",

        "uicc.aconfig",

        "satellite.aconfig",

        "iwlan.aconfig"

        "iwlan.aconfig",

        "carrier.aconfig",

    ],

}

flags/calling.aconfig

+20 −0
Original line number Diff line number Diff line
@@ -62,3 +62,23 @@ flag { 
        purpose: PURPOSE_BUGFIX

    }

}



# OWNER=yongnamcha TARGET=25Q2

flag {

    name: "emergency_callback_mode_notification"

    namespace: "telephony"

    description: "Used to notify the emergency callback mode for call/SMS to other applications."

    bug:"359064059"

    is_exported: true

}



# OWNER=sewookseo TARGET=25Q2

flag {

    name: "pass_copied_call_state_list"

    namespace: "telephony"

    description: "To prevent passing the TelephonyRegistry's original instance to listeners in the same process"

    bug:"379126049"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}
 
 No newline at end of file

flags/carrier.aconfig

0 → 100644
+32 −0
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"

    is_exported: true

    namespace: "telephony"

    description: "Improve readability of update state logic"

    bug:"232141900"

    metadata {

      purpose: PURPOSE_BUGFIX

    }

}



# OWNER=melhuishj TARGET=25Q2

flag {

    name: "temporary_failures_in_carrier_messaging_service"

    is_exported: true

    namespace: "telephony"

    description: "Enable temporary failures in CarrierMessagingService"

    bug:"326610112"

}

flags/data.aconfig

+5 −8
Original line number Diff line number Diff line
@@ -121,14 +121,11 @@ flag { 
  }

}



# OWNER=jackyu TARGET=25Q1

# OWNER=jackyu TARGET=25Q2

flag {

  name: "sim_disabled_graceful_tear_down"

  name: "oem_paid_private"

  namespace: "telephony"

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

  bug: "362372940"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

  description: "Support OEM_PAID and OEM_PRIVATE networks"

  bug: "366194627"

  is_exported: true

}