Wink Saville f35f3201db Merge commit '81132d51' into fix-merge-conflict ...

* commit '81132d51':
  In CaptiviePortalTracker a socket timeout is probably a captive portal.

Change-Id: I624732a5c29427bc22a156ccd46e6ff727af09c5

2013-08-08 16:51:46 -07:00

..

arp

am c584a24b: am 2140d1de: Merge "Avoid system_server crashing due to mac address is null"

2012-08-22 11:03:13 -07:00

dhcp

Switch frameworks/base over from @hidden Charsets to public StandardCharsets.

2013-06-28 16:24:48 -07:00

http

If frameworks wants ASCII casing, it should explicity ask for it.

2013-08-02 15:12:32 -07:00

nsd

Fix sync problem in NsdManager

2013-05-02 15:45:32 -07:00

wimax

…

BaseNetworkStateTracker.java

Add BT - DataTracker connection

2013-03-27 15:45:12 -07:00

CaptivePortalTracker.java

Merge commit '81132d51' into fix-merge-conflict

2013-08-08 16:51:46 -07:00

ConnectivityManager.java

Add network type TYPE_MOBILE_IA.

2013-07-29 15:02:29 -07:00

Credentials.java

…

DhcpInfo.aidl

…

DhcpInfo.java

Remove STOPSHIP and defer removal.

2013-04-19 09:31:24 -07:00

DhcpResults.aidl

Remove DhcpInfoInternal

2012-11-09 09:46:32 -08:00

DhcpResults.java

Up our DNS server support from 2 > 4

2013-01-11 09:47:46 -08:00

DhcpStateMachine.java

Fix build & preserve DHCP scheduling as-is

2013-07-18 18:23:57 -07:00

DnsPinger.java

Migrate more Secure settings to Global.

2012-09-27 16:22:53 -07:00

DummyDataStateTracker.java

Add BT - DataTracker connection

2013-03-27 15:45:12 -07:00

EthernetDataTracker.java

am a34b531b: Merge "EthernetDataTracker: Set network available on connected"

2013-05-15 10:41:54 -07:00

IConnectivityManager.aidl

Merge "Support multiple Vpn ManageDialogs"

2013-07-23 17:55:45 +00:00

INetworkManagementEventObserver.aidl

Network data activity change intent for network interfaces.

2012-07-17 17:13:03 -07:00

INetworkPolicyListener.aidl

…

INetworkPolicyManager.aidl

Move NetworkPolicy from apps to UID.

2012-09-14 23:00:27 -07:00

INetworkStatsService.aidl

Revert "API to adjust network stats."

2012-07-31 17:11:07 -07:00

INetworkStatsSession.aidl

…

InterfaceConfiguration.aidl

…

InterfaceConfiguration.java

…

LinkAddress.aidl

…

LinkAddress.java

…

LinkCapabilities.aidl

…

LinkCapabilities.java

Cleanup some debug in LinkCapabilities and Properties.

2013-03-27 16:21:43 -07:00

LinkProperties.aidl

…

LinkProperties.java

Add accessors for all addresses and clarify compare* methods

2013-08-01 00:21:24 +09:00

LinkSocket.java

…

LinkSocketNotifier.java

…

LocalServerSocket.java

LocalSocket: Add support for SOCK_DGRAM and SOCK_SEQPACKET

2013-07-16 17:31:15 -07:00

LocalSocket.java

LocalSocket: Add support for SOCK_DGRAM and SOCK_SEQPACKET

2013-07-16 17:31:15 -07:00

LocalSocketAddress.java

…

LocalSocketImpl.java

Bluetooth stopped working in master - "bad file descriptor"

2013-07-25 13:44:50 -07:00

MailTo.java

If frameworks wants ASCII casing, it should explicity ask for it.

2013-08-02 15:12:32 -07:00

MobileDataStateTracker.java

Fix excessive log spew.

2013-07-31 15:49:04 -07:00

NetworkConfig.java

If frameworks wants ASCII casing, it should explicity ask for it.

2013-08-02 15:12:32 -07:00

NetworkIdentity.java

…

NetworkInfo.aidl

…

NetworkInfo.java

Expose roaming flag for testing.

2013-01-03 14:07:46 -08:00

NetworkPolicy.aidl

…

NetworkPolicy.java

…

NetworkPolicyManager.java

Move NetworkPolicy from apps to UID.

2012-09-14 23:00:27 -07:00

NetworkQuotaInfo.aidl

…

NetworkQuotaInfo.java

…

NetworkState.aidl

…

NetworkState.java

…

NetworkStateTracker.java

Add BT - DataTracker connection

2013-03-27 15:45:12 -07:00

NetworkStats.aidl

…

NetworkStats.java

Parse network stats using native code.

2013-02-13 17:40:49 -08:00

NetworkStatsHistory.aidl

…

NetworkStatsHistory.java

Recover from corrupt network stats.

2013-07-11 11:18:53 -07:00

NetworkTemplate.aidl

…

NetworkTemplate.java

Fix metered SSID matching regression.

2012-12-18 17:07:01 -08:00

NetworkUtils.java

Add NetworkUtil function for marking sockets

2013-07-12 19:48:32 +00:00

package.html

Correct executable bit for source files

2012-11-07 10:27:31 -08:00

PacProxySelector.java

Add PAC File support for proxy configuration

2013-08-07 21:01:39 -04:00

ParseException.java

Public JavaDoc for ParseException should not mention WebAddress, as this is not public

2012-07-09 16:57:32 +01:00

Proxy.java

Add PAC File support for proxy configuration

2013-08-07 21:01:39 -04:00

ProxyProperties.aidl

…

ProxyProperties.java

Add PAC File support for proxy configuration

2013-08-07 21:01:39 -04:00

RouteInfo.aidl

…

RouteInfo.java

Add new route.hasGateway() api

2013-04-12 11:22:52 -07:00

SntpClient.java

…

SSLCertificateSocketFactory.java

Use hostname verifier directly instead of instance

2013-07-23 20:46:24 -07:00

SSLSessionCache.java

Track change to JSSE provider

2013-04-29 15:15:27 -07:00

TrafficStats.java

Update TrafficStats docs to reflect behavior.

2013-03-26 13:46:09 -07:00

Uri.aidl

Correct executable bit for source files

2012-11-07 10:27:31 -08:00

Uri.java

am 710f3e2c: am 60ae2617: Merge "If frameworks wants ASCII casing, it should explicity ask for it."

2013-08-02 17:58:33 -07:00

UrlQuerySanitizer.java

If frameworks wants ASCII casing, it should explicity ask for it.

2013-08-02 15:12:32 -07:00

VpnService.java

Add per user VPN support

2013-07-12 20:51:03 -07:00

WebAddress.java

If frameworks wants ASCII casing, it should explicity ask for it.

2013-08-02 15:12:32 -07:00