resolve merge conflicts of 546e2e895f to sc-dev

Browse Source

Bug: None, merge conflict
Change-Id: Id07440d6a55111a1a7ddbf3df306f4466073fd1d

...

This commit is contained in:

Remi NGUYEN VAN

2021-02-01 10:25:24 +00:00

parent d346ee5315 546e2e895f

commit 09119c2ceb

74 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

core/java/android/net/CaptivePortal.java → packages/Connectivity/framework/src/android/net/CaptivePortal.java

0

core/java/android/net/CaptivePortalData.aidl → packages/Connectivity/framework/src/android/net/CaptivePortalData.aidl

0

core/java/android/net/CaptivePortalData.java → packages/Connectivity/framework/src/android/net/CaptivePortalData.java

0

core/java/android/net/ConnectionInfo.aidl → packages/Connectivity/framework/src/android/net/ConnectionInfo.aidl

0

core/java/android/net/ConnectionInfo.java → packages/Connectivity/framework/src/android/net/ConnectionInfo.java

0

core/java/android/net/ConnectivityDiagnosticsManager.aidl → packages/Connectivity/framework/src/android/net/ConnectivityDiagnosticsManager.aidl

0

core/java/android/net/ConnectivityDiagnosticsManager.java → packages/Connectivity/framework/src/android/net/ConnectivityDiagnosticsManager.java

0

core/java/android/net/ConnectivityManager.java → packages/Connectivity/framework/src/android/net/ConnectivityManager.java

0

core/java/android/net/ConnectivityMetricsEvent.aidl → packages/Connectivity/framework/src/android/net/ConnectivityMetricsEvent.aidl

0

core/java/android/net/ConnectivityThread.java → packages/Connectivity/framework/src/android/net/ConnectivityThread.java

0

core/java/android/net/DhcpInfo.aidl → packages/Connectivity/framework/src/android/net/DhcpInfo.aidl

0

core/java/android/net/DhcpInfo.java → packages/Connectivity/framework/src/android/net/DhcpInfo.java

0

core/java/android/net/DnsResolver.java → packages/Connectivity/framework/src/android/net/DnsResolver.java

0

core/java/android/net/ICaptivePortal.aidl → packages/Connectivity/framework/src/android/net/ICaptivePortal.aidl

0

core/java/android/net/IConnectivityDiagnosticsCallback.aidl → packages/Connectivity/framework/src/android/net/IConnectivityDiagnosticsCallback.aidl

0

core/java/android/net/IConnectivityManager.aidl → packages/Connectivity/framework/src/android/net/IConnectivityManager.aidl

0

core/java/android/net/ISocketKeepaliveCallback.aidl → packages/Connectivity/framework/src/android/net/ISocketKeepaliveCallback.aidl

0

core/java/android/net/ITestNetworkManager.aidl → packages/Connectivity/framework/src/android/net/ITestNetworkManager.aidl

0

core/java/android/net/InetAddresses.java → packages/Connectivity/framework/src/android/net/InetAddresses.java

0

core/java/android/net/InterfaceConfiguration.aidl → packages/Connectivity/framework/src/android/net/InterfaceConfiguration.aidl

0

core/java/android/net/InvalidPacketException.java → packages/Connectivity/framework/src/android/net/InvalidPacketException.java

0

core/java/android/net/IpConfiguration.aidl → packages/Connectivity/framework/src/android/net/IpConfiguration.aidl

0

core/java/android/net/IpConfiguration.java → packages/Connectivity/framework/src/android/net/IpConfiguration.java

0

core/java/android/net/IpPrefix.aidl → packages/Connectivity/framework/src/android/net/IpPrefix.aidl

0

core/java/android/net/IpPrefix.java → packages/Connectivity/framework/src/android/net/IpPrefix.java

0

core/java/android/net/KeepalivePacketData.aidl → packages/Connectivity/framework/src/android/net/KeepalivePacketData.aidl

0

core/java/android/net/KeepalivePacketData.java → packages/Connectivity/framework/src/android/net/KeepalivePacketData.java

0

core/java/android/net/LinkAddress.aidl → packages/Connectivity/framework/src/android/net/LinkAddress.aidl

0

core/java/android/net/LinkAddress.java → packages/Connectivity/framework/src/android/net/LinkAddress.java

0

core/java/android/net/LinkProperties.aidl → packages/Connectivity/framework/src/android/net/LinkProperties.aidl

0

core/java/android/net/LinkProperties.java → packages/Connectivity/framework/src/android/net/LinkProperties.java

0

core/java/android/net/MacAddress.aidl → packages/Connectivity/framework/src/android/net/MacAddress.aidl

0

core/java/android/net/MacAddress.java → packages/Connectivity/framework/src/android/net/MacAddress.java

0

core/java/android/net/NattKeepalivePacketData.java → packages/Connectivity/framework/src/android/net/NattKeepalivePacketData.java

0

core/java/android/net/NattSocketKeepalive.java → packages/Connectivity/framework/src/android/net/NattSocketKeepalive.java

0

core/java/android/net/Network.aidl → packages/Connectivity/framework/src/android/net/Network.aidl

0

core/java/android/net/Network.java → packages/Connectivity/framework/src/android/net/Network.java

0

core/java/android/net/NetworkAgent.java → packages/Connectivity/framework/src/android/net/NetworkAgent.java

0

core/java/android/net/NetworkAgentConfig.aidl → packages/Connectivity/framework/src/android/net/NetworkAgentConfig.aidl

0

core/java/android/net/NetworkAgentConfig.java → packages/Connectivity/framework/src/android/net/NetworkAgentConfig.java

0

core/java/android/net/NetworkCapabilities.aidl → packages/Connectivity/framework/src/android/net/NetworkCapabilities.aidl

0

core/java/android/net/NetworkCapabilities.java → packages/Connectivity/framework/src/android/net/NetworkCapabilities.java

0

core/java/android/net/NetworkConfig.java → packages/Connectivity/framework/src/android/net/NetworkConfig.java

0

core/java/android/net/NetworkInfo.aidl → packages/Connectivity/framework/src/android/net/NetworkInfo.aidl

0

core/java/android/net/NetworkInfo.java → packages/Connectivity/framework/src/android/net/NetworkInfo.java

0

core/java/android/net/NetworkProvider.java → packages/Connectivity/framework/src/android/net/NetworkProvider.java

0

core/java/android/net/NetworkRequest.aidl → packages/Connectivity/framework/src/android/net/NetworkRequest.aidl

0

core/java/android/net/NetworkRequest.java → packages/Connectivity/framework/src/android/net/NetworkRequest.java

0

core/java/android/net/NetworkUtils.java → packages/Connectivity/framework/src/android/net/NetworkUtils.java

0

core/java/android/net/PacProxySelector.java → packages/Connectivity/framework/src/android/net/PacProxySelector.java

0

core/java/android/net/Proxy.java → packages/Connectivity/framework/src/android/net/Proxy.java

0

core/java/android/net/ProxyInfo.aidl → packages/Connectivity/framework/src/android/net/ProxyInfo.aidl

0

core/java/android/net/ProxyInfo.java → packages/Connectivity/framework/src/android/net/ProxyInfo.java

0

core/java/android/net/RouteInfo.aidl → packages/Connectivity/framework/src/android/net/RouteInfo.aidl

0

core/java/android/net/RouteInfo.java → packages/Connectivity/framework/src/android/net/RouteInfo.java

0

core/java/android/net/SocketKeepalive.java → packages/Connectivity/framework/src/android/net/SocketKeepalive.java

0

core/java/android/net/StaticIpConfiguration.aidl → packages/Connectivity/framework/src/android/net/StaticIpConfiguration.aidl

0

core/java/android/net/StaticIpConfiguration.java → packages/Connectivity/framework/src/android/net/StaticIpConfiguration.java

0

core/java/android/net/TcpKeepalivePacketData.java → packages/Connectivity/framework/src/android/net/TcpKeepalivePacketData.java

0

core/java/android/net/TcpRepairWindow.java → packages/Connectivity/framework/src/android/net/TcpRepairWindow.java

0

core/java/android/net/TcpSocketKeepalive.java → packages/Connectivity/framework/src/android/net/TcpSocketKeepalive.java

0

core/java/android/net/TestNetworkInterface.aidl → packages/Connectivity/framework/src/android/net/TestNetworkInterface.aidl

0

core/java/android/net/TestNetworkInterface.java → packages/Connectivity/framework/src/android/net/TestNetworkInterface.java

0

core/java/android/net/TestNetworkManager.java → packages/Connectivity/framework/src/android/net/TestNetworkManager.java

0

core/java/android/net/TransportInfo.java → packages/Connectivity/framework/src/android/net/TransportInfo.java

0

core/java/android/net/UidRange.aidl → packages/Connectivity/framework/src/android/net/UidRange.aidl

0

core/java/android/net/VpnManager.java → packages/Connectivity/framework/src/android/net/VpnManager.java

0

core/java/android/net/VpnService.java → packages/Connectivity/framework/src/android/net/VpnService.java

0

core/java/android/net/apf/ApfCapabilities.aidl → packages/Connectivity/framework/src/android/net/apf/ApfCapabilities.aidl

0

core/java/android/net/apf/ApfCapabilities.java → packages/Connectivity/framework/src/android/net/apf/ApfCapabilities.java

0

core/java/android/net/util/DnsUtils.java → packages/Connectivity/framework/src/android/net/util/DnsUtils.java

0

core/java/android/net/util/KeepaliveUtils.java → packages/Connectivity/framework/src/android/net/util/KeepaliveUtils.java

0

core/java/android/net/util/MultinetworkPolicyTracker.java → packages/Connectivity/framework/src/android/net/util/MultinetworkPolicyTracker.java

0

core/java/android/net/util/SocketUtils.java → packages/Connectivity/framework/src/android/net/util/SocketUtils.java