0f14f81d7c
Add indication APIs to expose Quality Of Service (QOS) information
from LTE and NR default as well as dedicated bearers. The QOS is
added to the existing SetupDataCallResult structure so that the
baseband can notify whenever there is a change in QoS on a PDN.
Bug: 158315614
Test: 1) Simulated V1_6 SetupDataCallResult and verified the Qos objects
are passed correctly in the APIs
2) atest frameworks/opt/telephony/tests/telephonytests/
Merged-In: I29b13975288286d9706a1c3fb227eeb46527efc3
Change-Id: I29b13975288286d9706a1c3fb227eeb46527efc3
387 lines
12 KiB
Plaintext
387 lines
12 KiB
Plaintext
// Copyright (C) 2019 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.
|
|
|
|
// How stubs are generated:
|
|
//
|
|
// raw source files --(metalava)--> stub source files --(javac)--> stub jar files
|
|
//
|
|
// - The metalava conversion is done by droidstub modules
|
|
// - The javac compilation is done by java_library modules
|
|
//
|
|
// The metalava conversion is also responsible for creating API signature files
|
|
// and comparing them against the checked in API signature, and also checking compatibility
|
|
// with the latest frozen API signature.
|
|
|
|
/////////////////////////////////////////////////////////////////////
|
|
// Common metalava configs
|
|
/////////////////////////////////////////////////////////////////////
|
|
|
|
packages_to_document = [
|
|
"android",
|
|
"dalvik",
|
|
"java",
|
|
"javax",
|
|
"junit",
|
|
"org.apache.http",
|
|
"org.json",
|
|
"org.w3c.dom",
|
|
"org.xml.sax",
|
|
"org.xmlpull",
|
|
]
|
|
|
|
stubs_defaults {
|
|
name: "metalava-non-updatable-api-stubs-default",
|
|
srcs: [
|
|
":framework-non-updatable-sources",
|
|
"core/java/**/*.logtags",
|
|
":opt-telephony-srcs",
|
|
":opt-net-voip-srcs",
|
|
":art.module.public.api{.public.stubs.source}",
|
|
":android_icu4j_public_api_files",
|
|
"**/package.html",
|
|
],
|
|
sdk_version: "core_platform",
|
|
arg_files: ["core/res/AndroidManifest.xml"],
|
|
// TODO(b/147699819): remove below aidl includes.
|
|
aidl: {
|
|
local_include_dirs: [
|
|
"apex/media/aidl/stable",
|
|
"telephony/java",
|
|
],
|
|
},
|
|
// These are libs from framework-internal-utils that are required (i.e. being referenced)
|
|
// from framework-non-updatable-sources. Add more here when there's a need.
|
|
// DO NOT add the entire framework-internal-utils. It might cause unnecessary circular
|
|
// dependencies gets bigger.
|
|
libs: [
|
|
"android.hardware.cas-V1.2-java",
|
|
"android.hardware.health-V1.0-java-constants",
|
|
"android.hardware.radio-V1.5-java",
|
|
"android.hardware.radio-V1.6-java",
|
|
"android.hardware.thermal-V1.0-java-constants",
|
|
"android.hardware.thermal-V2.0-java",
|
|
"android.hardware.tv.input-V1.0-java-constants",
|
|
"android.hardware.tv.tuner-V1.0-java-constants",
|
|
"android.hardware.usb-V1.0-java-constants",
|
|
"android.hardware.usb-V1.1-java-constants",
|
|
"android.hardware.usb.gadget-V1.0-java",
|
|
"android.hardware.vibrator-V1.3-java",
|
|
"framework-protos",
|
|
// There are a few classes from modules used as type arguments that
|
|
// need to be resolved by metalava. For now, we can use a previously
|
|
// finalized stub library to resolve them. If a new class gets added,
|
|
// this may be need to be revisited to use a manually maintained stub
|
|
// library with empty classes in order to resolve those references.
|
|
"sdk_system_30_android",
|
|
],
|
|
high_mem: true, // Lots of sources => high memory use, see b/170701554
|
|
installable: false,
|
|
annotations_enabled: true,
|
|
previous_api: ":android.api.public.latest",
|
|
merge_annotations_dirs: [
|
|
"metalava-manual",
|
|
],
|
|
api_levels_annotations_enabled: false,
|
|
filter_packages: packages_to_document,
|
|
}
|
|
|
|
/////////////////////////////////////////////////////////////////////
|
|
// These modules provide source files for the stub libraries
|
|
/////////////////////////////////////////////////////////////////////
|
|
|
|
droidstubs {
|
|
name: "api-stubs-docs-non-updatable",
|
|
defaults: ["metalava-non-updatable-api-stubs-default"],
|
|
args: metalava_framework_docs_args,
|
|
check_api: {
|
|
current: {
|
|
api_file: "core/api/current.txt",
|
|
removed_api_file: "core/api/removed.txt",
|
|
},
|
|
last_released: {
|
|
api_file: ":android-non-updatable.api.public.latest",
|
|
removed_api_file: ":android-non-updatable-removed.api.public.latest",
|
|
baseline_file: ":public-api-incompatibilities-with-last-released",
|
|
},
|
|
api_lint: {
|
|
enabled: true,
|
|
new_since: ":android-non-updatable.api.public.latest",
|
|
},
|
|
},
|
|
}
|
|
|
|
priv_apps =
|
|
" --show-annotation android.annotation.SystemApi\\(" +
|
|
"client=android.annotation.SystemApi.Client.PRIVILEGED_APPS" +
|
|
"\\)"
|
|
|
|
priv_apps_in_stubs =
|
|
" --show-for-stub-purposes-annotation android.annotation.SystemApi\\(" +
|
|
"client=android.annotation.SystemApi.Client.PRIVILEGED_APPS" +
|
|
"\\)"
|
|
|
|
test = " --show-annotation android.annotation.TestApi"
|
|
|
|
module_libs =
|
|
" --show-annotation android.annotation.SystemApi\\(" +
|
|
"client=android.annotation.SystemApi.Client.MODULE_LIBRARIES" +
|
|
"\\)"
|
|
|
|
droidstubs {
|
|
name: "system-api-stubs-docs-non-updatable",
|
|
defaults: ["metalava-non-updatable-api-stubs-default"],
|
|
args: metalava_framework_docs_args + priv_apps,
|
|
check_api: {
|
|
current: {
|
|
api_file: "core/api/system-current.txt",
|
|
removed_api_file: "core/api/system-removed.txt",
|
|
},
|
|
last_released: {
|
|
api_file: ":android-non-updatable.api.system.latest",
|
|
removed_api_file: ":android-non-updatable-removed.api.system.latest",
|
|
baseline_file: ":system-api-incompatibilities-with-last-released"
|
|
},
|
|
api_lint: {
|
|
enabled: true,
|
|
new_since: ":android-non-updatable.api.system.latest",
|
|
baseline_file: "core/api/system-lint-baseline.txt",
|
|
},
|
|
},
|
|
}
|
|
|
|
droidstubs {
|
|
name: "test-api-stubs-docs-non-updatable",
|
|
defaults: ["metalava-non-updatable-api-stubs-default"],
|
|
args: metalava_framework_docs_args + test + priv_apps_in_stubs,
|
|
check_api: {
|
|
current: {
|
|
api_file: "core/api/test-current.txt",
|
|
removed_api_file: "core/api/test-removed.txt",
|
|
},
|
|
api_lint: {
|
|
enabled: true,
|
|
baseline_file: "core/api/test-lint-baseline.txt",
|
|
},
|
|
},
|
|
dist: {
|
|
targets: ["sdk", "win_sdk"],
|
|
dir: "apistubs/android/test/api",
|
|
dest: "android.txt",
|
|
},
|
|
}
|
|
|
|
droidstubs {
|
|
name: "module-lib-api-stubs-docs-non-updatable",
|
|
defaults: ["metalava-non-updatable-api-stubs-default"],
|
|
args: metalava_framework_docs_args + priv_apps_in_stubs + module_libs,
|
|
check_api: {
|
|
current: {
|
|
api_file: "core/api/module-lib-current.txt",
|
|
removed_api_file: "core/api/module-lib-removed.txt",
|
|
},
|
|
last_released: {
|
|
api_file: ":android-non-updatable.api.module-lib.latest",
|
|
removed_api_file: ":android-non-updatable-removed.api.module-lib.latest",
|
|
},
|
|
api_lint: {
|
|
enabled: true,
|
|
new_since: ":android-non-updatable.api.module-lib.latest",
|
|
},
|
|
},
|
|
}
|
|
|
|
/////////////////////////////////////////////////////////////////////
|
|
// android_*_stubs_current modules are the stubs libraries compiled
|
|
// from stub sources
|
|
/////////////////////////////////////////////////////////////////////
|
|
|
|
java_defaults {
|
|
name: "android_defaults_stubs_current",
|
|
libs: [ "stub-annotations" ],
|
|
static_libs: [
|
|
// License notices from art module
|
|
"art-notices-for-framework-stubs-jar",
|
|
"framework-res-package-jar", // Export package of framework-res
|
|
],
|
|
errorprone: {
|
|
javacflags: [
|
|
"-XepDisableAllChecks",
|
|
],
|
|
},
|
|
sdk_version: "none",
|
|
system_modules: "none",
|
|
java_version: "1.8",
|
|
compile_dex: true,
|
|
}
|
|
|
|
java_defaults {
|
|
name: "android_stubs_dists_default",
|
|
dist: {
|
|
targets: ["sdk", "win_sdk"],
|
|
tag: ".jar",
|
|
dest: "android.jar",
|
|
},
|
|
}
|
|
|
|
java_library_static {
|
|
name: "android_stubs_current",
|
|
srcs: [ ":api-stubs-docs-non-updatable" ],
|
|
static_libs: [
|
|
"conscrypt.module.public.api.stubs",
|
|
"framework-media.stubs",
|
|
"framework-mediaprovider.stubs",
|
|
"framework-permission.stubs",
|
|
"framework-sdkextensions.stubs",
|
|
"framework-statsd.stubs",
|
|
"framework-tethering.stubs",
|
|
"framework-wifi.stubs",
|
|
"private-stub-annotations-jar",
|
|
],
|
|
defaults: ["android_defaults_stubs_current"],
|
|
}
|
|
|
|
java_library_static {
|
|
name: "android_system_stubs_current",
|
|
srcs: [ ":system-api-stubs-docs-non-updatable" ],
|
|
static_libs: [
|
|
"conscrypt.module.public.api.stubs",
|
|
"framework-media.stubs.system",
|
|
"framework-mediaprovider.stubs.system",
|
|
"framework-permission.stubs.system",
|
|
"framework-sdkextensions.stubs.system",
|
|
"framework-statsd.stubs.system",
|
|
"framework-tethering.stubs.system",
|
|
"framework-wifi.stubs.system",
|
|
"private-stub-annotations-jar",
|
|
],
|
|
defaults: [
|
|
"android_defaults_stubs_current",
|
|
"android_stubs_dists_default",
|
|
],
|
|
dist: {
|
|
dir: "apistubs/android/system",
|
|
},
|
|
dists: [
|
|
{
|
|
// Legacy dist path
|
|
targets: ["sdk", "win_sdk"],
|
|
tag: ".jar",
|
|
dest: "android_system.jar",
|
|
},
|
|
],
|
|
}
|
|
|
|
java_library_static {
|
|
name: "android_test_stubs_current",
|
|
srcs: [ ":test-api-stubs-docs-non-updatable" ],
|
|
static_libs: [
|
|
// Modules do not have test APIs, but we want to include their SystemApis, like we include
|
|
// the SystemApi of framework-non-updatable-sources.
|
|
"conscrypt.module.public.api.stubs",
|
|
"framework-media.stubs.system",
|
|
"framework-mediaprovider.stubs.system",
|
|
"framework-permission.stubs.system",
|
|
"framework-sdkextensions.stubs.system",
|
|
"framework-statsd.stubs.system",
|
|
"framework-tethering.stubs.system",
|
|
"framework-wifi.stubs.system",
|
|
"private-stub-annotations-jar",
|
|
],
|
|
defaults: [
|
|
"android_defaults_stubs_current",
|
|
"android_stubs_dists_default",
|
|
],
|
|
dist: {
|
|
dir: "apistubs/android/test",
|
|
},
|
|
dists: [
|
|
{
|
|
// Legacy dist path
|
|
targets: ["sdk", "win_sdk"],
|
|
tag: ".jar",
|
|
dest: "android_test.jar",
|
|
},
|
|
],
|
|
}
|
|
|
|
java_library_static {
|
|
name: "android_module_lib_stubs_current",
|
|
srcs: [ ":module-lib-api-stubs-docs-non-updatable" ],
|
|
defaults: [
|
|
"android_defaults_stubs_current",
|
|
"android_stubs_dists_default",
|
|
],
|
|
libs: ["sdk_system_29_android"],
|
|
dist: {
|
|
dir: "apistubs/android/module-lib",
|
|
},
|
|
}
|
|
|
|
java_library_static {
|
|
name: "android_non_updatable_stubs_current",
|
|
srcs: [":api-stubs-docs-non-updatable"],
|
|
defaults: ["android_defaults_stubs_current"],
|
|
libs: ["sdk_system_29_android"],
|
|
}
|
|
|
|
java_library_static {
|
|
name: "android_system_non_updatable_stubs_current",
|
|
srcs: [":system-api-stubs-docs-non-updatable"],
|
|
defaults: ["android_defaults_stubs_current"],
|
|
libs: ["sdk_system_29_android"],
|
|
}
|
|
|
|
/////////////////////////////////////////////////////////////////////
|
|
// hwbinder.stubs provides APIs required for building HIDL Java
|
|
// libraries.
|
|
/////////////////////////////////////////////////////////////////////
|
|
|
|
droidstubs {
|
|
name: "hwbinder-stubs-docs",
|
|
srcs: [
|
|
"core/java/android/os/HidlSupport.java",
|
|
"core/java/android/annotation/IntDef.java",
|
|
"core/java/android/annotation/IntRange.java",
|
|
"core/java/android/annotation/NonNull.java",
|
|
"core/java/android/annotation/SystemApi.java",
|
|
"core/java/android/os/HidlMemory.java",
|
|
"core/java/android/os/HwBinder.java",
|
|
"core/java/android/os/HwBlob.java",
|
|
"core/java/android/os/HwParcel.java",
|
|
"core/java/android/os/IHwBinder.java",
|
|
"core/java/android/os/IHwInterface.java",
|
|
"core/java/android/os/DeadObjectException.java",
|
|
"core/java/android/os/DeadSystemException.java",
|
|
"core/java/android/os/NativeHandle.java",
|
|
"core/java/android/os/RemoteException.java",
|
|
"core/java/android/util/AndroidException.java",
|
|
],
|
|
installable: false,
|
|
sdk_version: "core_platform",
|
|
annotations_enabled: true,
|
|
previous_api: ":android.api.public.latest",
|
|
merge_annotations_dirs: [
|
|
"metalava-manual",
|
|
],
|
|
args: priv_apps,
|
|
}
|
|
|
|
java_library_static {
|
|
name: "hwbinder.stubs",
|
|
sdk_version: "core_current",
|
|
srcs: [
|
|
":hwbinder-stubs-docs",
|
|
],
|
|
}
|