0ccf3fb461
The resolverOptions member of the ResolverParamsParcel has never been set by AOSP code but was only used by OEMs modifying DnsManager. Now that DnsManager is mainline code, this is no longer possible. So the DNS resolver introduces a new setResolverOptions IPC to allow OEMs to set the options and makes the resolverOptions nullable. Make DnsManager set resolverOptions to null, to ensure that when DnsManager calls setResolverConfiguration, it does not overwrite any options set by the OEM. Bug: 194048056 Test: Device boots and has connectivity Change-Id: I310a79521f5a365e50e2c65e9dd87d9b68f105d7 Merged-In: I310a79521f5a365e50e2c65e9dd87d9b68f105d7
118 lines
3.0 KiB
Plaintext
118 lines
3.0 KiB
Plaintext
//
|
|
// Copyright (C) 2020 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 {
|
|
// See: http://go/android-license-faq
|
|
default_applicable_licenses: ["Android-Apache-2.0"],
|
|
}
|
|
|
|
cc_library_shared {
|
|
name: "libservice-connectivity",
|
|
min_sdk_version: "30",
|
|
cflags: [
|
|
"-Wall",
|
|
"-Werror",
|
|
"-Wno-unused-parameter",
|
|
"-Wthread-safety",
|
|
],
|
|
srcs: [
|
|
"jni/com_android_server_TestNetworkService.cpp",
|
|
"jni/onload.cpp",
|
|
],
|
|
stl: "libc++_static",
|
|
header_libs: [
|
|
"libbase_headers",
|
|
],
|
|
shared_libs: [
|
|
"liblog",
|
|
"libnativehelper",
|
|
],
|
|
apex_available: [
|
|
"com.android.tethering",
|
|
],
|
|
}
|
|
|
|
java_library {
|
|
name: "service-connectivity-pre-jarjar",
|
|
sdk_version: "system_server_current",
|
|
min_sdk_version: "30",
|
|
srcs: [
|
|
"src/**/*.java",
|
|
":framework-connectivity-shared-srcs",
|
|
":services-connectivity-shared-srcs",
|
|
// TODO: move to net-utils-device-common, enable shrink optimization to avoid extra classes
|
|
":net-module-utils-srcs",
|
|
],
|
|
libs: [
|
|
"framework-annotations-lib",
|
|
"framework-connectivity.impl",
|
|
"framework-tethering.stubs.module_lib",
|
|
"framework-wifi.stubs.module_lib",
|
|
"unsupportedappusage",
|
|
"ServiceConnectivityResources",
|
|
],
|
|
static_libs: [
|
|
"dnsresolver_aidl_interface-V9-java",
|
|
"modules-utils-os",
|
|
"net-utils-device-common",
|
|
"net-utils-framework-common",
|
|
"netd-client",
|
|
"netlink-client",
|
|
"networkstack-client",
|
|
"PlatformProperties",
|
|
"service-connectivity-protos",
|
|
],
|
|
apex_available: [
|
|
"com.android.tethering",
|
|
],
|
|
}
|
|
|
|
java_library {
|
|
name: "service-connectivity-protos",
|
|
sdk_version: "system_current",
|
|
min_sdk_version: "30",
|
|
proto: {
|
|
type: "nano",
|
|
},
|
|
srcs: [
|
|
":system-messages-proto-src",
|
|
],
|
|
libs: ["libprotobuf-java-nano"],
|
|
apex_available: [
|
|
"com.android.tethering",
|
|
],
|
|
}
|
|
|
|
java_library {
|
|
name: "service-connectivity",
|
|
sdk_version: "system_server_current",
|
|
min_sdk_version: "30",
|
|
installable: true,
|
|
static_libs: [
|
|
"service-connectivity-pre-jarjar",
|
|
],
|
|
jarjar_rules: "jarjar-rules.txt",
|
|
apex_available: [
|
|
"com.android.tethering",
|
|
],
|
|
}
|
|
|
|
filegroup {
|
|
name: "connectivity-jarjar-rules",
|
|
srcs: ["jarjar-rules.txt"],
|
|
visibility: ["//packages/modules/Connectivity:__subpackages__"],
|
|
}
|