Robert Greenwalt f333123d50 resolved conflicts for merge of 2d457a32 to master ...

Change-Id: I08fc7881010083407a102f471483cd6d5b9774b4

2010-09-24 14:47:06 -07:00

..

http

am e68f8b7e: am 405d4db5: Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters

2010-09-15 11:37:22 -07:00

ConnectivityManager.java

Enhance http proxy support

2010-09-17 16:14:10 -07:00

Credentials.java

…

DhcpInfo.aidl

…

DhcpInfo.java

Add per network static IP settings

2010-09-14 16:15:22 -07:00

DownloadManager.java

am 1fd11292: am bb0d23b5: Have DownloadManager pass file URIs for legacy external downloads

2010-09-23 13:11:19 -07:00

Downloads.java

Fix Gmail unit test

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

IConnectivityManager.aidl

Enhance http proxy support

2010-09-17 16:14:10 -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

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

Cleanup copyright dates add missing method.

2010-09-21 09:16:38 -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

Add LinkCapabilities

2010-09-16 21:26:59 -07:00

NetworkInfo.aidl

…

NetworkInfo.java

Refactor WifiStateTracker

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

NetworkStateTracker.java

resolved conflicts for merge of 2d457a32 to master

2010-09-24 14:47:06 -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

Enhance http proxy support

2010-09-17 16:14:10 -07:00

ProxyProperties.java

Cleanup copyright dates add missing method.

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

SntpClient.java

Trim throttle logs.

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

SSLCertificateSocketFactory.java

Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters

2010-09-14 11:24:13 -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

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

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