Commit graph

13,045 commits

Message SHA1
Add accessors for all addresses and clarify compare* methods
1. Add a method to return all addresses and all LinkAddresses on
   all links (both base links and stacked links). We already had
   one for routes, but did not yet have any for addresses.
2. Rename compareRoutes to compareAllRoutes, because unlike the
   other compare* methods, it looks at all interfaces. Update
   what appears to be its only caller.
3. Update the documentation of the compare* methods to match
   reality (they don't return lists) and clarify whether they
   look at all links or only the base link.

Change-Id: Ie22e6c7f163d5de8e407248b45171dc28382d2d3

Lorenzo Colitti   commited 2013-08-01 00:21:24 +09:00
43553b6fad
merge in klp-release history after reset to master
The Android Automerger   commited 2013-07-31 06:01:34 -07:00
751479bc58
merge in klp-release history after reset to master
The Android Automerger   commited 2013-07-30 11:10:04 -07:00
593a58765f
am 178acfce: am 15884007: Merge "464xlat: use a gatewayed route, not point-to-point"
* commit '178acfced7':
  464xlat: use a gatewayed route, not point-to-point

Lorenzo Colitti   authored and   Android Git Automerger   commited 2013-07-30 10:28:32 -07:00
1f3e3bec7f
am 15884007: Merge "464xlat: use a gatewayed route, not point-to-point"
* commit '158840079a501784c76e9816b215b3a1839074ef':
  464xlat: use a gatewayed route, not point-to-point

Lorenzo Colitti   authored and   Android Git Automerger   commited 2013-07-30 09:57:18 -07:00
178acfced7
464xlat: use a gatewayed route, not point-to-point
Various applications such as Skype and our legacy VPN code
do not understand routes pointed directly at point-to-point
interfaces and require a default gateway IPv4 address in
order to function.

Grudgingly accept that routes without default gateways Are Hard
and use gatewayed routes instead. This causes routing to go from:

default dev clat4  scope link

to:

default via 192.0.0.4 dev clat4  scope link
192.0.0.4 dev clat4  scope link

and those apps now work.

Bug: 9597256
Bug: 9597516
Change-Id: I7b7890873802d3cb99affd6eb70b8ab75e7a2cf6

Lorenzo Colitti   commited 2013-07-31 01:09:53 +09:00
00f6629ed9
Add network type TYPE_MOBILE_IA.
Add a network type for establishing connections to the apn used for
the initial connection.

Enable some debug for now.

Bug: 8733613
Change-Id: Ia627ac0cf5715660b6d02bb13a83d46ec1727b87

Wink Saville   commited 2013-07-29 15:02:29 -07:00
70dbdcc418
Merge "Remove unused mDnsOverridden"
Geremy Condra   authored and   Android (Google) Code Review   commited 2013-07-26 17:48:54 +00:00
45a5bf908e
merge in klp-release history after reset to master
The Android Automerger   commited 2013-07-24 06:02:02 -07:00
9455e85fd3
Remove unused mDnsOverridden
mDnsOverridden is no longer used now that VPNs do not override the
default DNS settings.

Change-Id: I69495b9a6de7d60628813f357d3dbdf548695ada

Chad Brubaker   commited 2013-07-23 17:49:37 -07:00
a8e8112dab
Merge "Fix default DNS not being set on network changes"
Geremy Condra   authored and   Android (Google) Code Review   commited 2013-07-24 00:32:34 +00:00
3b8e7328bd
Fix default DNS not being set on network changes
Change-Id: I3c45404cab34c77b20dadc1d8aee127aa08fd0bd

Chad Brubaker   commited 2013-07-23 17:13:36 -07:00
45e721f586
Merge "Fix supplimentary network connections with VPNs"
Geremy Condra   authored and   Android (Google) Code Review   commited 2013-07-23 17:58:33 +00:00
2b07accdee
Merge "Support multiple Vpn ManageDialogs"
Geremy Condra   authored and   Android (Google) Code Review   commited 2013-07-23 17:55:45 +00:00
12e55c99af
merge in klp-release history after reset to master
The Android Automerger   commited 2013-07-22 06:01:44 -07:00
c6c5161c33
fix build
Change-Id: Ie4bd7c3fe9320d22b7da2962e5e5a4abca510bd2

Guang Zhu   commited 2013-07-21 02:01:34 -07:00
f466bf9e1d
am 7d0a85e2: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '7d0a85e213':
  Add gservices updater for carrier provisioning url
  Cleaner Tejat notification in Audio Package 11
  When a SIM is changed check mobile provisioning.
  Fix missing lock in power manager.
  Remove iterators (DO NOT MERGE)

The Android Open Source Project   authored and   Android Git Automerger   commited 2013-07-19 16:02:25 -07:00
b91b601f3e
Fix supplimentary network connections with VPNs
Enables the use of supplimentary mobile networks like MMS, and HIPRI
while VPNs are running.

Change-Id: I313f57a905b4e16bd4322c68687cbff1cfbe9d3e

Chad Brubaker   commited 2013-07-19 15:57:05 -07:00
78850f3081
resolved conflicts for merge of 64031ab2 to master
Change-Id: Ia9509ab6897e27da8bf4fc61a4140f2f93acb80f

Robert Greenwalt   commited 2013-07-19 14:30:49 -07:00
00eb17fb05
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I1d7f0e0f6a4cb8b9363c99a830dc1656424ad49d

The Android Open Source Project   commited 2013-07-19 14:20:43 -07:00
7d0a85e213
resolved conflicts for merge of 248d8d2c to master
Change-Id: Idd0ad9b1504fddf68c4c4cc04731de1eddd204b3

Robert Greenwalt   commited 2013-07-19 14:09:30 -07:00
1bf31d7571
am d7aeae15: am df43ba82: am e3badc10: Merge "When a SIM is changed check mobile provisioning." into jb-mr2-dev
* commit 'd7aeae15a1':
  When a SIM is changed check mobile provisioning.

Wink Saville   authored and   Android Git Automerger   commited 2013-07-19 13:42:36 -07:00
48f0c5a396
am ddf17b5b: am 8c87b297: Merge "Make CS.isTetheringSupported dynamic" into jb-mr2-dev
* commit 'ddf17b5b82f25965502377588483abbc328c4e6d':
  Make CS.isTetheringSupported dynamic

Robert Greenwalt   authored and   Android Git Automerger   commited 2013-07-19 13:37:58 -07:00
64031ab2a3
am b5bf655c: am 1f905ded: Merge "Add gservices updater for carrier provisioning url" into jb-mr2-dev
* commit 'b5bf655cc6cc9128aec99958cce3b054348c9273':
  Add gservices updater for carrier provisioning url

Robert Greenwalt   authored and   Android Git Automerger   commited 2013-07-19 13:37:41 -07:00
248d8d2c69
am df43ba82: am e3badc10: Merge "When a SIM is changed check mobile provisioning." into jb-mr2-dev
* commit 'df43ba82e6c232985a95c9827f7d71dd3194e0a8':
  When a SIM is changed check mobile provisioning.

Wink Saville   authored and   Android Git Automerger   commited 2013-07-19 13:37:35 -07:00
d7aeae15a1
Merge "checkMobileProvisioning is not using sendNotification."
Wink Saville   authored and   Android (Google) Code Review   commited 2013-07-19 17:14:41 +00:00
feb4923c50
checkMobileProvisioning is not using sendNotification.
Change-Id: Ie5b98b462b29fe9339fcb8207d2d33e3028a155c

Wink Saville   commited 2013-07-19 09:27:56 -07:00
b56c4fd054
Fix build & preserve DHCP scheduling as-is
Change-Id: I4063b18532c476280f343658bf3641495e526ed4

Christopher Tate   commited 2013-07-18 18:23:57 -07:00
53d68e16d8
Make CS.isTetheringSupported dynamic
It used to be set at boot, but that was too quick to pick up carrier
specific resources.  With this change even if you switch sims subequent
checks get the new values.

bug:9865616
Change-Id: I8c270c6b02fc6bdd3c3d76ceea58172df25e058d

Robert Greenwalt   commited 2013-07-18 14:24:42 -07:00
81b0274875
Add gservices updater for carrier provisioning url
bug:9623159
Change-Id: I36697ed341353b7a3dbec5afe20241102e76f6f1

Robert Greenwalt   authored and   The Android Automerger   commited 2013-07-18 11:24:56 -07:00
cbf3ebe8d6
merge in klp-release history after reset to master
The Android Automerger   commited 2013-07-18 06:01:57 -07:00
fd23238ed3
Merge "Add gservices updater for carrier provisioning url" into jb-mr2-dev
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2013-07-17 23:46:25 +00:00
1f905dede5
When a SIM is changed check mobile provisioning.
A simple mechanism for doing this is to take advantage of the fact
that we require the device to reboot after a sim has been changed.
Thus when connectivity service is started we wait to get a connection
then call checkMobileProvisioning once. We also add a check that
the DEVICE_PROVISIONED is true, i.e. SetupWizard has been run.

Bug: 9784024
Change-Id: I5c1936744f6fc55a447ae44cd36eec3849d27e21

Wink Saville   authored and   The Android Automerger   commited 2013-07-17 14:59:20 -07:00
c6b52728f1
Add gservices updater for carrier provisioning url
bug:9623159
Change-Id: I36697ed341353b7a3dbec5afe20241102e76f6f1

Robert Greenwalt   commited 2013-07-17 14:05:33 -07:00
7ddc6c985d
Support multiple Vpn ManageDialogs
Move away from storing the configs in the Intent to prevent issues with
PendingIntents and multiple configs.

The Dialog now queries ConnectivityService for the configuration to
display in the management dialog.

Change-Id: I0e0ef52db840152914d117a24f776d8106e836ff

Chad Brubaker   commited 2013-07-16 18:59:12 -07:00
7dcfa2a06b
When a SIM is changed check mobile provisioning.
A simple mechanism for doing this is to take advantage of the fact
that we require the device to reboot after a sim has been changed.
Thus when connectivity service is started we wait to get a connection
then call checkMobileProvisioning once. We also add a check that
the DEVICE_PROVISIONED is true, i.e. SetupWizard has been run.

Bug: 9784024
Change-Id: I5c1936744f6fc55a447ae44cd36eec3849d27e21

Wink Saville   commited 2013-07-16 17:16:37 -07:00
9564f2b34f
Move markSocketAsUser to the top of IConnectivityManager.aidl
Move markSocketAsUser to the top of IConnectivityManager.aidl to make
calls from
framework/native/services/connectivitymanager less fragile

Change-Id: Iba92c21dfef175b570521f34e7ee2732e5a0a9c9

Chad Brubaker   commited 2013-07-16 11:29:11 -07:00
b24810e7f7
merge in klp-release history after reset to master
The Android Automerger   commited 2013-07-16 06:01:24 -07:00
8e4bc07d95
Merge "Support routing sockets as another user"
Geremy Condra   authored and   Android (Google) Code Review   commited 2013-07-15 21:57:18 +00:00
cd7b82033d
Merge changes Ia6646363,I94389b64
* changes:
  Add per user VPN support
  Add NetworkUtil function for marking sockets

Geremy Condra   authored and   Android (Google) Code Review   commited 2013-07-15 21:56:30 +00:00
c4f78f6100
Support routing sockets as another user
Add support for routing sockets as if they were another user's.
This is for services that handle delegated network tasks like MediaServer and DownloadManager.

Change-Id: Id20efc1f5c2cce6f8838d777762f6c0a703a9437

Chad Brubaker   commited 2013-07-15 12:14:10 -07:00
31de0b69b0
am 9bd03ece: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '9bd03ece3c':

The Android Open Source Project   authored and   Android Git Automerger   commited 2013-07-15 09:37:54 -07:00
6fc25cfd15
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Ib08f5c3c72f9d6eee571e7f9dff130abadffbbec

The Android Open Source Project   commited 2013-07-15 09:32:49 -07:00
9bd03ece3c
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Automerger   commited 2013-07-15 08:19:11 -07:00
3ad46b8636
merge in klp-release history after reset to master
The Android Automerger   commited 2013-07-15 06:01:32 -07:00
16998180e9
Add per user VPN support
VPNs are now per user instead of global. A VPN set by user A routes only
user A's traffic and no other user can access it.

Change-Id: Ia66463637b6bd088b05768076a1db897fe95c46c

Chad Brubaker   commited 2013-07-12 20:51:03 -07:00
ccae0d365b
Add NetworkUtil function for marking sockets
Add NetworkUtil function for setting the SO_MARK field of sockets

Change-Id: I94389b64296d87ee928293f24a26f8dd08c3bf37

Chad Brubaker   authored and   Geremy Condra   commited 2013-07-12 19:48:32 +00:00
fa15058755
am 7d8ad734: am 42a85412: am 925ec03f: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev
* commit '7d8ad734af':
  VZW wants the phoneNumber to be 10 zero's if there isn't one.

Wink Saville   authored and   Android Git Automerger   commited 2013-07-12 12:14:01 -07:00
c137d87017
am 42a85412: am 925ec03f: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev
* commit '42a85412d12078f36c3fdeda1211bdc3800bab0c':
  VZW wants the phoneNumber to be 10 zero's if there isn't one.

Wink Saville   authored and   Android Git Automerger   commited 2013-07-12 12:03:53 -07:00
7d8ad734af
VZW wants the phoneNumber to be 10 zero's if there isn't one.
Bug: 9784059
Change-Id: I41bba908855648d2560440655d8a75a7cb2e0859

Wink Saville   commited 2013-07-10 23:00:07 -07:00
dfabd993a7