Robert Greenwalt fc40701c8b Merge "resolved conflicts for merge of 4ea54f44 to master"

2010-08-27 17:27:02 -07:00

..

http

am 4ae1e382: Merge "Tracking merge of dalvik-dev to gingerbread" into gingerbread

2010-08-05 10:40:45 -07:00

ConnectivityManager.java

resolved conflicts for merge of 4ea54f44 to master

2010-08-27 11:05:11 -07:00

Credentials.java

…

DhcpInfo.aidl

…

DhcpInfo.java

…

DownloadManager.java

Fix up handling of null fields in DownloadManager.

2010-08-17 14:10:25 -07:00

Downloads.java

…

IConnectivityManager.aidl

resolved conflicts for merge of 4ea54f44 to master

2010-08-27 11:05:11 -07:00

INetworkManagementEventObserver.aidl

…

InterfaceConfiguration.aidl

…

InterfaceConfiguration.java

…

IThrottleManager.aidl

…

LocalServerSocket.java

…

LocalSocket.java

…

LocalSocketAddress.java

…

LocalSocketImpl.java

…

MailTo.java

…

MobileDataStateTracker.java

resolved conflicts for merge of 4ea54f44 to master

2010-08-27 11:05:11 -07:00

NetworkInfo.aidl

…

NetworkInfo.java

Refactor WifiStateTracker

2010-07-27 11:59:29 -07:00

NetworkProperties.aidl

…

NetworkProperties.java

Add NetworkProperties to DataConnection.

2010-08-27 11:15:18 -07:00

NetworkStateTracker.java

Add documentation to NetworkStateTracker and a small change to the API.

2010-08-13 16:11:42 -07:00

NetworkUtils.java

resolved conflicts for merge of 4ea54f44 to master

2010-08-27 11:05:11 -07:00

package.html

…

ParseException.java

…

Proxy.java

Fix for bug 2890320 Browser crashes, after adding bookmark.

2010-08-05 14:49:28 -07:00

ProxyProperties.java

Add NetworkProperties to DataConnection.

2010-08-27 11:15:18 -07:00

SntpClient.java

…

SSLCertificateSocketFactory.java

Tracking merge of dalvik-dev to gingerbread

2010-08-04 23:47:38 -07:00

SSLSessionCache.java

…

ThrottleManager.java

…

TrafficStats.java

…

Uri.aidl

…

Uri.java

Added methods for managing uri query parameters

2010-08-26 17:15:01 -07:00

UrlQuerySanitizer.java

…

WebAddress.java

…