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

Unverified Commit 952c4994 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-14.0.0_r29' into staging/lineage-21.0_merge-android-14.0.0_r29 

Android 14.0.0 release 29

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZeZW4QAKCRDorT+BmrEO
# eEALAJ9EXsFYji5U7z5IPVHoatrT66gaxQCfX4/jSRCRg1/uFsHi63niSM6XWm0=
# =IScM
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Mar  5 01:18:57 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 2345 signatures in the past
#      2 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 Ling Ma (45) and others
# Via Automerger Merge Worker (1988) and others
* tag 'android-14.0.0_r29': (334 commits)
  Removed a feature flag
  Change the default infrastructure value to 'cellular|satellite'.
  Modify error handling for registerForNtnSignalStrength
  Changing the visibility of getCarrierRestrictionStatus API to public with flagged annotation
  Fix minimum ril hal version required by getSystemSelectionChannels
  Update modems on identifier disclosure transparency preference changes
  Revert "DataCallSessionStats captures Cross-SIM calling"
  Fix video Call goes on hold instead of terminating when accepting 2nd video call as audio only
  Shorten cooldown time service state metrics
  Add vonr_enabled to voice call metric
  Add feature flag to terminate active video call instead holding when accepting 2nd incoming video call as audio only
  Check if the NTN is connected or not and change the signal threshold criteria.
  Flag:RadioInfoIsRadioOn, change to use radio power for isRadioOn
  Save call disconnect info for error propagation
  Gate default with explicit flag
  Switch "postsubmit" to "presubmit" after soak
  Exit emergency callback mode before turning off radio power
  Revert "ConnectivityManager#registerNetworkAgent gains an argument"
  Add flag for auto data switch rat and ss
  Consider roaming when auto switch
  ...

 Conflicts:
	src/java/com/android/internal/telephony/RIL.java
	src/java/com/android/internal/telephony/RadioNetworkProxy.java
	src/java/com/android/internal/telephony/RadioResponse.java

Change-Id: I77a62ef6526e3e5928f46cb433a27692ea59985a
parents ba7525b3 dda3d6df

Android.bp

+9 −16
Original line number Diff line number Diff line
@@ -83,14 +83,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-V2-java",

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

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

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

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

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

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

        "android.hardware.radio.voice-V2-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",

        "voip-common",

        "ims-common",

        "unsupportedappusage",
@@ -100,23 +100,16 @@ java_library { 
        "android.hardware.radio.config-V1.1-java-shallow",

        "android.hardware.radio.config-V1.2-java-shallow",

        "android.hardware.radio.config-V1.3-java-shallow",

        "android.hardware.radio.deprecated-V1.0-java-shallow",

        "ecc-protos-lite",

        "libphonenumber-nogeocoder",

        "PlatformProperties",

        "net-utils-framework-common",

        "telephony-protos",

        "modules-utils-build_system",

        "modules-utils-fastxmlserializer",

        "modules-utils-statemachine",

    ],



    product_variables: {

        pdk: {

            // enable this build only when platform library is available

            enabled: false,

        },

    },



    optimize: {

        enabled: true,

        shrink: true,

OWNERS

+3 −4
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ amagup@google.com 
amallampati@google.com

amruthr@google.com

breadley@google.com

chinmayd@google.com

fionaxu@google.com

grantmenke@google.com

huiwang@google.com

jackyu@google.com

jayachandranc@google.com
@@ -17,6 +17,5 @@ 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,forestchoi@google.com,avinashmp@google.com,mkoon@google.com,seheele@google.com

TEST_MAPPING

+2 −1
Original line number Diff line number Diff line
@@ -9,7 +9,8 @@ 
      ]

    },

    {

      "name": "CarrierAppIntegrationTestCases"

      "name": "CarrierAppIntegrationTestCases",

      "keywords": ["internal"]

    },

    {

      "name": "CtsTelephony2TestCases",

flags/Android.bp

0 → 100644
+37 −0
Original line number Diff line number Diff line 
//

// Copyright (C) 2023 The Android Open Source Project

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//      http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.

//



package {

    default_applicable_licenses: ["Android-Apache-2.0"],

}



aconfig_declarations {

    name: "telephony_flags",

    package: "com.android.internal.telephony.flags",

    srcs: [

      "data.aconfig",

      "domainselection.aconfig",

      "ims.aconfig",

      "messaging.aconfig",

      "misc.aconfig",

      "network.aconfig",

      "subscription.aconfig",

      "uicc.aconfig",

      "satellite.aconfig",

      "iwlan.aconfig",

      "telephony.aconfig",

    ],

}

flags/data.aconfig

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



flag {

  name: "auto_switch_allow_roaming"

  namespace: "telephony"

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

  bug: "306488039"

}



flag {

  name: "auto_data_switch_rat_ss"

  namespace: "telephony"

  description: "Whether switch for better rat and signal strength"

  bug:"260928808"

}



flag {

  name: "use_alarm_callback"

  namespace: "telephony"

  description: "Use alarm callback instead of broadcast."

  bug: "311476875"

}



flag {

  name: "refine_preferred_data_profile_selection"

  namespace: "telephony"

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

  bug: "311476883"

}



flag {

  name: "unthrottle_check_transport"

  namespace: "telephony"

  description: "Check transport when unthrottle."

  bug: "303922311"

}



flag {

  name: "relax_ho_teardown"

  namespace: "telephony"

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

  bug: "270895912"

}



flag {

  name: "allow_mmtel_in_non_vops"

  namespace: "telephony"

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

  bug: "241198464"

}



flag {

  name: "metered_embb_urlcc"

  namespace: "telephony"

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

  bug: "301310451"

  }



flag {

  name: "slicing_additional_error_codes"

  namespace: "telephony"

  description: "Support additional slicing error codes and functionality."

  bug: "307378699"

}



flag {

  name: "apn_setting_field_support_flag"

  namespace: "telephony"

  description: "Expose apn setting supporting field"

  bug: "307038091"

}



flag {

  name: "network_validation"

  namespace: "telephony"

  description: "Request network validation for data networks and response status."

  bug:"286171724"

}



flag {

 name: "notify_data_activity_changed_with_slot"

  namespace: "telephony"

  description: "notify data activity changed for slot id"

  bug: "309896936"

}



flag {

  name: "vonr_enabled_metric"

  namespace: "telephony"

  description: "Collect vonr status in voice call metric"

  bug:"288449751"

}