Wink Saville 9f6a7f424f Merge commit '3b5d686e' into fix-merge-conflict ...

* commit '3b5d686e':
  Add checkMobileProvisioning to ConnectivityService.

Conflicts:
	services/java/com/android/server/ConnectivityService.java

Change-Id: Ieceb9c8f4aa4fa99258e56a720b4c74512369458

2013-07-01 16:12:31 -07:00

..

arp

am c584a24b: am 2140d1de: Merge "Avoid system_server crashing due to mac address is null"

2012-08-22 11:03:13 -07:00

dhcp

Switch frameworks/base over from @hidden Charsets to public StandardCharsets.

2013-06-28 16:24:48 -07:00

http

am 6706ca96: Merge "Update HttpResponseCache to use the new cache API."

2013-06-13 02:29:11 -07:00

nsd

Fix sync problem in NsdManager

2013-05-02 15:45:32 -07:00

wimax

…

BaseNetworkStateTracker.java

Add BT - DataTracker connection

2013-03-27 15:45:12 -07:00

CaptivePortalTracker.java

Adjust captive portal test for setup wizard

2013-02-14 11:02:10 -08:00

ConnectivityManager.java

Merge commit '3b5d686e' into fix-merge-conflict

2013-07-01 16:12:31 -07:00

Credentials.java

…

DhcpInfo.aidl

…

DhcpInfo.java

Remove STOPSHIP and defer removal.

2013-04-19 09:31:24 -07:00

DhcpResults.aidl

Remove DhcpInfoInternal

2012-11-09 09:46:32 -08:00

DhcpResults.java

Up our DNS server support from 2 > 4

2013-01-11 09:47:46 -08:00

DhcpStateMachine.java

Revert of Ifd0c4081a. Turning off logging.

2013-03-15 20:20:11 +00:00

DnsPinger.java

Migrate more Secure settings to Global.

2012-09-27 16:22:53 -07:00

DummyDataStateTracker.java

Add BT - DataTracker connection

2013-03-27 15:45:12 -07:00

EthernetDataTracker.java

am a34b531b: Merge "EthernetDataTracker: Set network available on connected"

2013-05-15 10:41:54 -07:00

IConnectivityManager.aidl

Add checkMobileProvisioning to ConnectivityService.

2013-06-29 21:10:57 -07:00

INetworkManagementEventObserver.aidl

Network data activity change intent for network interfaces.

2012-07-17 17:13:03 -07:00

INetworkPolicyListener.aidl

…

INetworkPolicyManager.aidl

Move NetworkPolicy from apps to UID.

2012-09-14 23:00:27 -07:00

INetworkStatsService.aidl

Revert "API to adjust network stats."

2012-07-31 17:11:07 -07:00

INetworkStatsSession.aidl

…

InterfaceConfiguration.aidl

…

InterfaceConfiguration.java

…

LinkAddress.aidl

…

LinkAddress.java

…

LinkCapabilities.aidl

…

LinkCapabilities.java

Cleanup some debug in LinkCapabilities and Properties.

2013-03-27 16:21:43 -07:00

LinkProperties.aidl

…

LinkProperties.java

Fix LinkProperties's equals() method.

2013-04-02 10:08:59 +09:00

LinkSocket.java

…

LinkSocketNotifier.java

…

LocalServerSocket.java

…

LocalSocket.java

Make LocalSocket Closeable.

2012-08-05 14:21:07 -07:00

LocalSocketAddress.java

…

LocalSocketImpl.java

Use the right fd for flush call

2013-05-13 18:35:27 -07:00

MailTo.java

…

MobileDataStateTracker.java

Add checkMobileProvisioning to ConnectivityService.

2013-06-29 21:10:57 -07:00

NetworkConfig.java

…

NetworkIdentity.java

…

NetworkInfo.aidl

…

NetworkInfo.java

Expose roaming flag for testing.

2013-01-03 14:07:46 -08:00

NetworkPolicy.aidl

…

NetworkPolicy.java

…

NetworkPolicyManager.java

Move NetworkPolicy from apps to UID.

2012-09-14 23:00:27 -07:00

NetworkQuotaInfo.aidl

…

NetworkQuotaInfo.java

…

NetworkState.aidl

…

NetworkState.java

…

NetworkStateTracker.java

Add BT - DataTracker connection

2013-03-27 15:45:12 -07:00

NetworkStats.aidl

…

NetworkStats.java

Parse network stats using native code.

2013-02-13 17:40:49 -08:00

NetworkStatsHistory.aidl

…

NetworkStatsHistory.java

Sanity check network stats coming from disk.

2012-11-02 15:38:15 -07:00

NetworkTemplate.aidl

…

NetworkTemplate.java

Fix metered SSID matching regression.

2012-12-18 17:07:01 -08:00

NetworkUtils.java

Explicit locale when formatting machine strings.

2013-06-11 14:36:41 -07:00

package.html

Correct executable bit for source files

2012-11-07 10:27:31 -08:00

ParseException.java

Public JavaDoc for ParseException should not mention WebAddress, as this is not public

2012-07-09 16:57:32 +01:00

Proxy.java

…

ProxyProperties.aidl

…

ProxyProperties.java

…

RouteInfo.aidl

…

RouteInfo.java

Add new route.hasGateway() api

2013-04-12 11:22:52 -07:00

SntpClient.java

…

SSLCertificateSocketFactory.java

Add ALPN support to SSL socket factory

2013-06-26 10:35:39 -07:00

SSLSessionCache.java

Track change to JSSE provider

2013-04-29 15:15:27 -07:00

TrafficStats.java

Update TrafficStats docs to reflect behavior.

2013-03-26 13:46:09 -07:00

Uri.aidl

Correct executable bit for source files

2012-11-07 10:27:31 -08:00

Uri.java

am b8292830: resolved conflicts for merge of a920f25f to jb-mr2-dev-plus-aosp

2013-06-28 16:53:27 -07:00

UrlQuerySanitizer.java

…

VpnService.java

Explicit locale when formatting machine strings.

2013-06-11 14:36:41 -07:00

WebAddress.java

…