Kenny Root e9ae6822a8 resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aosp ...

Change-Id: I06c05d637613215b6d83df3e29cd495f6a5a0176

2013-04-29 23:09:03 -07:00

..

arp

…

dhcp

…

http

resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aosp

2013-04-29 23:09:03 -07:00

nsd

…

wimax

…

BaseNetworkStateTracker.java

Add BT - DataTracker connection

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

CaptivePortalTracker.java

Adjust captive portal test for setup wizard

2013-02-14 11:02:10 -08:00

ConnectivityManager.java

Use CONNECTIVITY_INTERNAL for global proxy

2013-04-10 15:32:18 -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

Revert of Ifd0c4081a. Turning off logging.

2013-03-15 20:20:11 +00: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

Add BT - DataTracker connection

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

IConnectivityManager.aidl

Listen for network disconnect.

2013-04-22 14:13:51 -07:00

INetworkManagementEventObserver.aidl

…

INetworkPolicyListener.aidl

…

INetworkPolicyManager.aidl

Move NetworkPolicy from apps to UID.

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

INetworkStatsService.aidl

…

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

Fix LinkProperties's equals() method.

2013-04-02 10:08:59 +09:00

LinkSocket.java

…

LinkSocketNotifier.java

…

LocalServerSocket.java

…

LocalSocket.java

…

LocalSocketAddress.java

…

LocalSocketImpl.java

Added flush() for bluetooth output stream

2013-04-24 00:24:34 -07:00

MailTo.java

…

MobileDataStateTracker.java

Add BT - DataTracker connection

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

NetworkConfig.java

…

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

Sanity check network stats coming from disk.

2012-11-02 15:38:15 -07:00

NetworkTemplate.aidl

…

NetworkTemplate.java

Fix metered SSID matching regression.

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

NetworkUtils.java

Remove DhcpInfoInternal

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

package.html

Correct executable bit for source files

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

ParseException.java

…

Proxy.java

…

ProxyProperties.aidl

…

ProxyProperties.java

…

RouteInfo.aidl

…

RouteInfo.java

Add new route.hasGateway() api

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

SntpClient.java

…

SSLCertificateSocketFactory.java

Track change to JSSE provider

2013-04-29 15:15:27 -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

Warn when exposing file:// Uris beyond a process.

2013-04-03 11:45:44 -07:00

UrlQuerySanitizer.java

…

VpnService.java

…

WebAddress.java

…