Robert Greenwalt a8e0dfae06 resolved conflicts for merge of db46fa25 to master ...

Change-Id: I8df9d5d07588fbd70e417dae567be26f645b74b6

2011-05-02 14:41:57 -07:00

..

dhcp

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

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

http

Remove the deprecated things from Config.java. These haven't been working since before 1.0.

2011-04-07 19:23:05 -07:00

ConnectivityManager.java

Expose more net types to the public.

2011-04-22 18:09:03 -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

Add DhcpStateMachine for interation with dhcpcd

2011-04-30 12:58:51 -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

…

LinkAddress.java

Make LinkProperties comparable.

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

LinkCapabilities.aidl

…

LinkCapabilities.java

…

LinkProperties.aidl

…

LinkProperties.java

Add RouteInfo objects for tracking routes.

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

LinkSocket.java

…

LinkSocketNotifier.java

…

LocalServerSocket.java

…

LocalSocket.java

…

LocalSocketAddress.java

…

LocalSocketImpl.java

…

MailTo.java

…

MobileDataStateTracker.java

Add external dependency API.

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

NetworkConfig.java

Make new networkAttribute parameter non-optional.

2011-04-25 16:04:45 -07:00

NetworkInfo.aidl

…

NetworkInfo.java

…

NetworkStateTracker.java

Add external dependency API.

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

NetworkUtils.java

Add DhcpStateMachine for interation with dhcpcd

2011-04-30 12:58:51 -07:00

package.html

…

ParseException.java

…

Proxy.java

Start using NetworkUtils.numericToInetAddress.

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

ProxyProperties.aidl

…

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

Add RouteInfo objects for tracking routes.

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

SntpClient.java

Remove the deprecated things from Config.java. These haven't been working since before 1.0.

2011-04-07 19:23:05 -07:00

SSLCertificateSocketFactory.java

Don't link to Harmony implementation details in public APIs.

2011-03-24 10:36:52 -07: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

…