Robert Greenwalt 585ac0fc8d resolved conflicts for merge of 4ea54f44 to master ...

Change-Id: Ia77bb59a6e1950648c8ebf7db307e204f93a9f56

2010-08-27 11:05:11 -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

Fix Gmail unit test

2010-05-03 15:36:45 -07:00

IConnectivityManager.aidl

resolved conflicts for merge of 4ea54f44 to master

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

INetworkManagementEventObserver.aidl

NetworkManagementService: Introduce INetworkManagementEventObserver

2010-01-22 16:10:29 -08:00

InterfaceConfiguration.aidl

android.net: Introduce @hidden parcelable InterfaceConfiguration class

2010-01-22 12:22:54 -08:00

InterfaceConfiguration.java

Add USB RNDIS enable/disable control

2010-02-23 16:04:41 -08:00

IThrottleManager.aidl

Throttling framework addins

2010-04-08 16:53:32 -07:00

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

Pass network properties to ConnectivityService.

2010-07-13 18:07:41 -07:00

NetworkProperties.java

Avoid hostname lookup in NetworkProperties

2010-08-04 15:15:49 -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

Pass network properties to ConnectivityService.

2010-07-13 18:07:41 -07:00

SntpClient.java

Trim throttle logs.

2010-04-22 09:04:27 -07:00

SSLCertificateSocketFactory.java

Tracking merge of dalvik-dev to gingerbread

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

SSLSessionCache.java

API CHANGE: Add SSLSessionCache public API to allow unbundled SSL session caching.

2010-02-10 14:43:21 -08:00

ThrottleManager.java

Make ThrottleService notice policy changes.

2010-04-09 12:42:45 -07:00

TrafficStats.java

Change TrafficStats to a new JNI implementation.

2010-04-07 19:06:29 -07:00

Uri.aidl

…

Uri.java

Added methods for managing uri query parameters

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

UrlQuerySanitizer.java

…

WebAddress.java

Use case insensitive matching.

2010-03-31 13:36:47 -04:00