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

Commit 492983e9 authored by Xin Li's avatar Xin Li Committed by Gerrit Code Review
Browse files

Merge "Merge Android 14 QPR2 to AOSP main" into main

parents 34573462 1b1530f8
Loading
Loading
Loading
Loading
+8 −9
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,7 +100,6 @@ 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",
+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"
}
+29 −0
Original line number Diff line number Diff line
package: "com.android.internal.telephony.flags"

flag {
    name: "ap_domain_selection_enabled"
    namespace: "telephony"
    description: "This flag controls AP domain selection feature."
    bug:"258112541"
}

flag {
    name: "use_aosp_domain_selection_service"
    namespace: "telephony"
    description: "This flag controls AOSP's domain selection service supported."
    bug:"258112541"
}

flag {
    name: "use_oem_domain_selection_service"
    namespace: "telephony"
    description: "This flag controls OEMs' domain selection service supported."
    bug:"258112541"
}

flag {
    name: "domain_selection_metrics_enabled"
    namespace: "telephony"
    description: "This flag controls domain selection metrics."
    bug:"258112541"
}
Loading