Dianne Hackborn dc71b9e4d6 resolved conflicts for merge of 6a3eddb4 to master ...

Change-Id: I1ca1d100274d4a733ef2bf58b0d5d7217b4f858e

2010-09-30 20:34:34 -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

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

…

InterfaceConfiguration.aidl

…

InterfaceConfiguration.java

…

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

resolved conflicts for merge of 6a3eddb4 to master

2010-09-30 20:34:34 -07:00

NetworkInfo.aidl

…

NetworkInfo.java

Refactor WifiStateTracker

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

NetworkStateTracker.java

am 0a69f597: Merge "Rub in a little \'ol log-b-gone." into gingerbread

2010-09-30 19:12:11 -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

use hostname when address null ProxyProperties parcelling

2010-09-27 12:16:11 -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

…

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