Robert Greenwalt 5df69fad6e resolved conflicts for merge of 8de47a2f to honeycomb-LTE ...

Change-Id: I8193235a4c7e574635e17b2eb05bb5420a3c6749

2011-06-07 12:45:41 -07:00

..

dhcp

Place the DHCP server address in the "next server IP address"

2011-02-03 17:32:39 -08:00

http

Deprecate non-X509Certificate SslCertificate constructors

2011-02-16 12:50:56 -08:00

ConnectivityManager.java

resolved conflicts for merge of 8de47a2f to honeycomb-LTE

2011-06-07 12:45:41 -07:00

Credentials.java

…

DhcpInfo.aidl

…

DhcpInfo.java

Get rid of manual int->ipv4 string generation

2011-01-26 13:57:24 -08:00

DhcpInfoInternal.java

Add RouteInfo objects for tracking routes.

2011-05-02 11:17:30 -07:00

DhcpStateMachine.java

DO NOT MERGE Add DhcpStateMachine

2011-05-12 14:10:11 -07:00

Downloads.java

fix a long-standing 'typo' bug

2011-01-06 18:46:39 -08:00

DummyDataStateTracker.java

Add external dependency API.

2011-04-07 12:28:37 -07:00

EthernetDataTracker.java

EthernetDataTracker: implement setDependencyMet

2011-04-11 20:13:10 -07:00

IConnectivityManager.aidl

Add external dependency API.

2011-04-07 12:28:37 -07:00

INetworkManagementEventObserver.aidl

Revert "Propagate new link-status-change message to any NetworkManagementService"

2011-01-09 12:16:38 -08:00

InterfaceConfiguration.aidl

…

InterfaceConfiguration.java

Bind addr and prefixLength together in LinkAddress

2011-01-28 15:34:55 -08:00

IThrottleManager.aidl

…

LinkAddress.aidl

Add LinkAddress

2010-10-06 11:04:05 -07:00

LinkAddress.java

Make LinkProperties comparable.

2011-04-07 12:36:56 -07:00

LinkCapabilities.aidl

Cleanup copyright dates add missing method.

2010-09-21 09:16:38 -07:00

LinkCapabilities.java

Cleanup copyright dates add missing method.

2010-09-21 09:16:38 -07:00

LinkProperties.aidl

Cleanup copyright dates add missing method.

2010-09-21 09:16:38 -07:00

LinkProperties.java

Reset connection while data state changed.

2011-05-18 15:59:04 -07:00

LinkSocket.java

Cleanup copyright dates add missing method.

2010-09-21 09:16:38 -07:00

LinkSocketNotifier.java

Cleanup copyright dates add missing method.

2010-09-21 09:16:38 -07:00

LocalServerSocket.java

…

LocalSocket.java

Fix double-checked locking bug in LocalSocket.

2010-09-21 10:26:57 -07:00

LocalSocketAddress.java

…

LocalSocketImpl.java

…

MailTo.java

…

MobileDataStateTracker.java

Linkproperties update via unsol data call state change.

2011-05-17 20:53:40 -07:00

NetworkConfig.java

Add auto-restore timeout for secondary networks.

2011-05-03 19:10:26 -07:00

NetworkInfo.aidl

…

NetworkInfo.java

…

NetworkStateTracker.java

Add external dependency API.

2011-04-07 12:28:37 -07:00

NetworkUtils.java

Switch to use netd to add/remove routes.

2011-05-18 15:25:43 -07:00

package.html

…

ParseException.java

…

Proxy.java

Start using NetworkUtils.numericToInetAddress.

2011-03-02 11:37:32 -08:00

ProxyProperties.aidl

Notify all VMs when proxy changes.

2010-11-19 10:24:30 -08:00

ProxyProperties.java

Make LinkProperties comparable.

2011-04-07 12:36:56 -07:00

RouteInfo.aidl

Add RouteInfo objects for tracking routes.

2011-05-02 11:17:30 -07:00

RouteInfo.java

Merge "Reset connection while data state changed." into honeycomb-LTE

2011-05-19 11:25:45 -07:00

SntpClient.java

Avoid leaking sockets.

2010-12-13 14:32:17 -08:00

SSLCertificateSocketFactory.java

am 2d2f10fa: am 28c74257: Add @Deprecated to match @deprecated where it\'s missing.

2010-11-09 10:26:39 -08:00

SSLSessionCache.java

…

ThrottleManager.java

…

TrafficStats.java

data activity reporting on wifi

2011-02-17 13:57:55 -08:00

Uri.aidl

…

Uri.java

…

UrlQuerySanitizer.java

…

WebAddress.java

Make fields in WebAddress private, add getters/setters

2010-10-13 16:21:01 +01:00