Robert Greenwalt ca4306c976 resolved conflicts for merge of ec52c98d to master ...

Change-Id: I31297232c9d918a967b93c3ae977f81b6a94f2ed

2010-09-09 13:15:32 -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 ec52c98d to master

2010-09-09 13:15:32 -07:00

Credentials.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

DhcpInfo.aidl

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

DhcpInfo.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

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 ec52c98d to master

2010-09-09 13:15:32 -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

LinkProperties.aidl

Rename NetworkProperties to LinkProperties

2010-08-30 15:54:37 -07:00

LinkProperties.java

Fix reboot loop due to NPE

2010-08-30 20:40:19 -07:00

LocalServerSocket.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

LocalSocket.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

LocalSocketAddress.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

LocalSocketImpl.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

MailTo.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

MobileDataStateTracker.java

Remove unused intent from filter and unused method.

2010-09-03 10:28:57 -07:00

NetworkInfo.aidl

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

NetworkInfo.java

Refactor WifiStateTracker

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

NetworkStateTracker.java

resolved conflicts for merge of ec52c98d to master

2010-09-09 13:15:32 -07:00

NetworkUtils.java

resolved conflicts for merge of 4ea54f44 to master

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

package.html

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ParseException.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

Proxy.java

Some cleanup of Proxy class.

2010-09-03 16:18:41 -07:00

ProxyProperties.java

Some cleanup of Proxy class.

2010-09-03 16:18: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

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

Uri.java

Added methods for managing uri query parameters

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

UrlQuerySanitizer.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

WebAddress.java

Fixes a problem with URL parsing when the host ends with a dot

2010-09-07 13:22:23 +01:00