Benedict Wong 26732ca479 Merge changes I3b769562,I63203188,Ia9396d66,Ifec34fad am: 20bfe66a02 am: f2d8cfe88c am: 32f80922f0 ...

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1515262

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I26acb191d2cbe5a7483a7dca0d1a5705f3819e8b

2021-01-09 00:02:19 +00:00

..

annotations

…

apf

…

http

…

metrics

…

netstats/provider

…

nsd

…

util

…

vcn

…

wimax

…

CaptivePortal.java

…

CaptivePortalData.aidl

…

CaptivePortalData.java

…

ConnectionInfo.aidl

…

ConnectionInfo.java

…

ConnectivityDiagnosticsManager.aidl

…

ConnectivityDiagnosticsManager.java

…

ConnectivityManager.java

…

ConnectivityMetricsEvent.aidl

…

ConnectivityMetricsEvent.java

…

ConnectivityThread.java

…

Credentials.java

…

DataUsageRequest.aidl

…

DataUsageRequest.java

…

DhcpInfo.aidl

…

DhcpInfo.java

…

DhcpResults.aidl

…

DhcpResults.java

…

DnsResolver.java

…

DnsResolverServiceManager.java

…

EthernetManager.java

…

EventLogTags.logtags

…

ICaptivePortal.aidl

…

IConnectivityDiagnosticsCallback.aidl

…

IConnectivityManager.aidl

…

IEthernetManager.aidl

…

IEthernetServiceListener.aidl

…

IIpConnectivityMetrics.aidl

…

IIpSecService.aidl

…

Ikev2VpnProfile.java

…

InetAddresses.java

…

INetdEventCallback.aidl

…

INetworkManagementEventObserver.aidl

…

INetworkPolicyListener.aidl

…

INetworkPolicyManager.aidl

…

INetworkRecommendationProvider.aidl

…

INetworkScoreCache.aidl

…

INetworkScoreService.aidl

…

INetworkStatsService.aidl

…

INetworkStatsSession.aidl

…

InterfaceConfiguration.aidl

…

InterfaceConfiguration.java

…

InvalidPacketException.java

…

IpConfiguration.aidl

…

IpConfiguration.java

…

IpPrefix.aidl

…

IpPrefix.java

…

IpSecAlgorithm.java

…

IpSecConfig.aidl

…

IpSecConfig.java

…

IpSecManager.java

…

IpSecSpiResponse.aidl

…

IpSecSpiResponse.java

…

IpSecTransform.java

…

IpSecTransformResponse.aidl

…

IpSecTransformResponse.java

…

IpSecTunnelInterfaceResponse.aidl

…

IpSecTunnelInterfaceResponse.java

…

IpSecUdpEncapResponse.aidl

…

IpSecUdpEncapResponse.java

…

ISocketKeepaliveCallback.aidl

…

ITestNetworkManager.aidl

…

ITetheredInterfaceCallback.aidl

…

ITetheringStatsProvider.aidl

…

KeepalivePacketData.aidl

…

KeepalivePacketData.java

…

LinkAddress.aidl

…

LinkAddress.java

…

LinkProperties.aidl

…

LinkProperties.java

…

LinkQualityInfo.aidl

…

LinkQualityInfo.java

…

LocalServerSocket.java

…

LocalSocket.java

…

LocalSocketAddress.java

…

LocalSocketImpl.java

…

MacAddress.aidl

…

MacAddress.java

…

MailTo.java

…

MatchAllNetworkSpecifier.java

…

MobileLinkQualityInfo.java

…

NattKeepalivePacketData.aidl

…

NattKeepalivePacketData.java

…

NattSocketKeepalive.java

…

network-policy-restrictions.md

…

Network.aidl

…

Network.java

…

NetworkAgent.java

…

NetworkAgentConfig.aidl

…

NetworkAgentConfig.java

…

NetworkBadging.java

…

NetworkCapabilities.aidl

…

NetworkCapabilities.java

…

NetworkConfig.java

…

NetworkIdentity.java

…

NetworkInfo.aidl

…

NetworkInfo.java

…

NetworkKey.aidl

…

NetworkKey.java

…

NetworkPolicy.aidl

…

NetworkPolicy.java

…

NetworkPolicyManager.java

…

NetworkProvider.java

…

NetworkQuotaInfo.aidl

…

NetworkQuotaInfo.java

…

NetworkRecommendationProvider.java

…

NetworkRequest.aidl

…

NetworkRequest.java

…

NetworkScoreManager.java

…

NetworkScorerAppData.aidl

…

NetworkScorerAppData.java

…

NetworkSpecifier.java

…

NetworkStack.java

…

NetworkState.aidl

…

NetworkState.java

…

NetworkStats.aidl

…

NetworkStats.java

…

NetworkStatsHistory.aidl

…

NetworkStatsHistory.java

…

NetworkTemplate.aidl

…

NetworkTemplate.java

…

NetworkUtils.java

…

NetworkWatchlistManager.java

…

OemNetworkPreferences.aidl

…

OemNetworkPreferences.java

…

OWNERS

…

package.html

…

PacProxySelector.java

…

ParseException.java

…

PlatformVpnProfile.java

…

PrivateDnsConnectivityChecker.java

…

Proxy.java

…

ProxyInfo.aidl

…

ProxyInfo.java

…

RouteInfo.aidl

…

RouteInfo.java

…

RssiCurve.java

…

ScoredNetwork.aidl

…

ScoredNetwork.java

…

SntpClient.java

…

SocketKeepalive.java

…

SSLCertificateSocketFactory.java

…

SSLSessionCache.java

…

StaticIpConfiguration.aidl

…

StaticIpConfiguration.java

…

StringNetworkSpecifier.java

…

TcpKeepalivePacketData.aidl

…

TcpKeepalivePacketData.java

…

TcpRepairWindow.java

…

TcpSocketKeepalive.java

…

TelephonyNetworkSpecifier.java

…

TEST_MAPPING

…

TestNetworkInterface.aidl

…

TestNetworkInterface.java

…

TestNetworkManager.java

…

TrafficStats.java

…

TransportInfo.java

…

UidRange.aidl

…

UidRange.java

…

Uri.aidl

…

Uri.java

…

UriCodec.java

…

UrlQuerySanitizer.java

…

VpnManager.java

…

VpnService.java

…

WebAddress.java

…

WifiKey.java

…

WifiLinkQualityInfo.java

…