Lorenzo Colitti 1142b2654a resolve merge conflicts of 51e4acb29d to nyc-dev ...

Also add the appropriate changes to api/test-current.txt, which
is not present on mm-wireless-dev from which this change came.

Change-Id: Ic4df6d0f89add73b7e5252ef662de07a4e8fce31

2016-02-24 15:19:15 +09:00

..

http

Use HexDump instead of java.lang.IntegralToString

2015-12-22 13:10:55 +00:00

nsd

…

wimax

…

CaptivePortal.java

Add android.net.CaptivePortal class for captive-portal-handling-app callbacks

2015-07-09 10:47:34 -04:00

ConnectivityManager.java

Merge "Created a ACTION_RESTRICT_BACKGROUND_CHANGED intent."

2016-02-02 23:59:30 +00:00

ConnectivityMetricsEvent.aidl

Add Connectivity Metrics Logger service

2016-02-23 17:32:53 +09:00

ConnectivityMetricsEvent.java

Add Connectivity Metrics Logger service

2016-02-23 17:32:53 +09:00

ConnectivityMetricsLogger.java

Add Connectivity Metrics Logger service

2016-02-23 17:32:53 +09:00

Credentials.java

…

DataUsageRequest.aidl

Adding a callback to notify data usage.

2016-02-02 15:18:41 -08:00

DataUsageRequest.java

Implementation of data usage callbacks.

2016-02-17 18:43:53 -08:00

DhcpInfo.aidl

…

DhcpInfo.java

…

DhcpResults.aidl

…

DhcpResults.java

Connect the DHCP UDP socket to the server.

2015-10-11 16:06:11 +09:00

DnsPinger.java

…

EthernetManager.java

Add an API to check availability of Ethernet interface.

2014-11-20 11:12:17 +09:00

ICaptivePortal.aidl

Add android.net.CaptivePortal class for captive-portal-handling-app callbacks

2015-07-09 10:47:34 -04:00

IConnectivityManager.aidl

Expose a simple tethering API which includes provision checks.

2016-01-25 16:37:09 -08:00

IConnectivityMetricsLogger.aidl

Add Connectivity Metrics Logger service

2016-02-23 17:32:53 +09:00

IConnectivityMetricsLoggerSubscriber.aidl

Add Connectivity Metrics Logger service

2016-02-23 17:32:53 +09:00

IEthernetManager.aidl

Add an API to check availability of Ethernet interface.

2014-11-20 11:12:17 +09:00

IEthernetServiceListener.aidl

Add an API to check availability of Ethernet interface.

2014-11-20 11:12:17 +09:00

INetworkManagementEventObserver.aidl

…

INetworkPolicyListener.aidl

…

INetworkPolicyManager.aidl

Created new public API so applications can customize its metered network

2016-01-22 10:50:11 -08:00

INetworkScoreCache.aidl

…

INetworkScoreService.aidl

…

INetworkStatsService.aidl

Implementation of data usage callbacks.

2016-02-17 18:43:53 -08:00

INetworkStatsSession.aidl

Expose time-interval detail query on INetworkStatsSession

2015-07-07 17:36:54 +01:00

InterfaceConfiguration.aidl

…

InterfaceConfiguration.java

…

IpConfiguration.aidl

…

IpConfiguration.java

…

IpPrefix.aidl

…

IpPrefix.java

Add android.net.IpPrefix#contains()

2015-04-14 16:19:11 +09:00

LinkAddress.aidl

…

LinkAddress.java

Treat optimistic addresses as global preferred.

2014-10-29 19:11:58 +09:00

LinkProperties.aidl

…

LinkProperties.java

Also treat loss of IPv6 as a loss of provisioning.

2015-10-27 17:11:27 +09:00

LinkQualityInfo.aidl

…

LinkQualityInfo.java

…

LocalServerSocket.java

Fix typo.

2014-12-09 10:31:37 -08:00

LocalSocket.java

Add thread safety documentation

2015-11-26 13:33:48 +00:00

LocalSocketAddress.java

…

LocalSocketImpl.java

Switch shutdownInput / shutdownOutput to using Os.shutdown.

2015-07-10 12:30:07 +01:00

MailTo.java

…

MobileLinkQualityInfo.java

…

Network.aidl

…

Network.java

Add a test that Network#getNetworkHandle() behaves sanely.

2015-06-15 15:18:38 +09:00

NetworkAgent.java

resolved conflicts for merge of 30813942 to mnc-dr-dev

2015-07-29 11:31:53 -04:00

NetworkCapabilities.aidl

…

NetworkCapabilities.java

Allow NetworkFactories to match any network specifier on a request

2015-12-15 08:06:54 -08:00

NetworkConfig.java

…

NetworkFactory.java

Use a CountDownLatch instead of sleep() in NetworkFactory tests.

2015-09-08 16:41:47 +09:00

NetworkIdentity.java

Direct notification of network interface changes.

2014-12-08 14:50:14 -08:00

NetworkInfo.aidl

…

NetworkInfo.java

Remove dead hidden ConnectivityManager and NetworkInfo APIs.

2015-06-16 02:07:36 +00:00

NetworkKey.aidl

…

NetworkKey.java

…

NetworkMisc.aidl

…

NetworkMisc.java

Prompt if a network without an Internet connection is selected

2015-04-15 13:38:22 +09:00

NetworkPolicy.aidl

…

NetworkPolicy.java

Enabled Network Policy Backup/Restore.

2016-02-08 10:41:21 +00:00

NetworkPolicyManager.java

resolved conflicts for f20a5700 to master

2015-10-12 17:51:45 -07:00

NetworkQuotaInfo.aidl

…

NetworkQuotaInfo.java

…

NetworkRequest.aidl

…

NetworkRequest.java

Allow NetworkFactories to match any network specifier on a request

2015-12-15 08:06:54 -08:00

NetworkScoreManager.java

Send explicit broadcasts when the scorer changes.

2016-02-11 07:15:44 -08:00

NetworkScorerAppManager.java

Use UserHandle.USER_SYSTEM in place of 0.

2016-01-08 09:30:44 -08:00

NetworkState.aidl

…

NetworkState.java

Offer to "merge" subscribers for data usage.

2014-12-08 08:42:59 -08:00

NetworkStats.aidl

…

NetworkStats.java

Retuning tag information through NetworkStatsManager.

2016-02-01 14:13:20 -08:00

NetworkStatsHistory.aidl

…

NetworkStatsHistory.java

Lightweight checkin output for network stats.

2014-11-21 10:11:10 -08:00

NetworkTemplate.aidl

…

NetworkTemplate.java

Enabled Network Policy Backup/Restore.

2016-02-08 10:41:21 +00:00

NetworkUtils.java

Delete all NetworkUtils DHCP-related code.

2016-02-22 15:14:31 +09:00

package.html

…

PacProxySelector.java

Do not throw NullPointerException from PacService

2015-01-16 15:57:55 -05:00

ParseException.java

…

Proxy.java

Merge commit 'e593d0a' into merge_work

2015-04-10 15:58:10 -07:00

ProxyInfo.aidl

…

ProxyInfo.java

Undeprecate android.net.ProxyInfo as it's still used.

2015-05-19 15:09:17 -04:00

PskKeyManager.java

Fix @code escapes

2015-12-02 14:24:11 +00:00

RouteInfo.aidl

…

RouteInfo.java

Add android.net.IpPrefix#contains()

2015-04-14 16:19:11 +09:00

RssiCurve.java

Let scorers fine-tune scoring heuristics.

2014-11-06 11:49:56 -08:00

ScoredNetwork.aidl

…

ScoredNetwork.java

…

SntpClient.java

Incorrect time used in some NTP server responses

2015-10-17 03:36:32 +09:00

SSLCertificateSocketFactory.java

Remove apache specific socket factory API.

2015-02-04 09:50:46 +00:00

SSLSessionCache.java

…

StaticIpConfiguration.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

TrafficStats.java

Add tagging variants for DatagramSocket.

2015-12-04 15:32:07 -07:00

UidRange.aidl

…

UidRange.java

…

Uri.aidl

…

Uri.java

File paths to system partition are okay-ish.

2016-02-01 10:44:45 -07:00

UrlQuerySanitizer.java

…

VpnService.java

Fix funky javadoc

2015-07-29 17:25:06 +01:00

WebAddress.java

[WebView] Allow the WebView to be compiled against the system SDK.

2014-11-25 17:03:49 +00:00

WifiKey.java

Actually allow all valid characters in a Wi-Fi SSID.

2015-03-31 19:48:18 +00:00

WifiLinkQualityInfo.java

…