Commit Graph

235 Commits

Author SHA1 Message Date
Xin Li
7e00d1d04c Merge commit 'a1081715561b15daf2018c74e9aff434f602fcc9' into HEAD
Change-Id: I1da9335d26d418de026c25d59aa6ee43af6d602c
2017-11-13 14:35:38 -08:00
android-build-team Robot
2814ee2aa4 Snap for 4434599 from 3b58783f26 to pi-release
Change-Id: I06ba4030f79f7d46db471989a7712f672a56b602
2017-11-05 07:30:26 +00:00
Jeff Sharkey
3b58783f26 Define NOT_ROAMING network capability. am: 30b747ef95 am: 497505d690
am: e929c5fc0e

Change-Id: I868074a695230f017a346abb5b9866577a760c9e
2017-11-03 23:14:07 +00:00
Jeff Sharkey
e929c5fc0e Define NOT_ROAMING network capability. am: 30b747ef95
am: 497505d690

Change-Id: I51902dbfdfaa49a8318f70752919a206f384f633
2017-11-03 23:03:01 +00:00
Jeff Sharkey
497505d690 Define NOT_ROAMING network capability.
am: 30b747ef95

Change-Id: Iffb3dad690a7986c6842976cfe39b1fbf7e68057
2017-11-03 22:52:18 +00:00
Jeff Sharkey
30b747ef95 Define NOT_ROAMING network capability.
The "roaming" state of a network really belongs on NetworkCapabilities
instead of being published through NetworkInfo.isRoaming().  One major
reason is to support developers creating NetworkRequests for a
non-roaming network.

Test: bit FrameworksNetTests:android.net.,com.android.server.net.,com.android.server.connectivity.
Bug: 68397798, 16207332
Change-Id: I0722d7b38d0478de3834b869552f48403af9d553
2017-10-30 12:02:14 -06:00
android-build-team Robot
8240854101 Snap for 4407698 from 6691db85e7 to pi-release
Change-Id: I814ae532ea31d2662265cd582bda331b5035a3ff
2017-10-20 08:05:15 +00:00
Elvis Chien
6691db85e7 ethernet: Fix the connect fail issue when switch DHCP to Static config at Ethernet interface. am: 89ffed793f am: 726e301e7b am: 89401fd992
am: b3e0136ddb

Change-Id: I3250046652086f12c5003bed406bfb262d34949b
2017-10-19 07:53:13 +00:00
Elvis Chien
b3e0136ddb ethernet: Fix the connect fail issue when switch DHCP to Static config at Ethernet interface. am: 89ffed793f am: 726e301e7b
am: 89401fd992

Change-Id: I6fa229ad44909161adf6706d46a1e82a07f8528d
2017-10-19 07:50:43 +00:00
Elvis Chien
89401fd992 ethernet: Fix the connect fail issue when switch DHCP to Static config at Ethernet interface. am: 89ffed793f
am: 726e301e7b

Change-Id: I9b95bb562fd5779c7744f6332aa1bf3f8237dd32
2017-10-19 07:48:12 +00:00
Elvis Chien
726e301e7b ethernet: Fix the connect fail issue when switch DHCP to Static config at Ethernet interface.
am: 89ffed793f

Change-Id: Ieaade184b2a88f9eb6c8ceb821a54f3db006f261
2017-10-19 07:45:43 +00:00
Elvis Chien
89ffed793f ethernet: Fix the connect fail issue when switch DHCP to Static config at Ethernet interface.
add different logic to handle static ip configuration.

Bug: b/64914694 <http://b/issue?id=64914694&query=64914694>
Test: follow the following steps to switch ethernet config
1.Plug Ethernet cable ,Ethernet succeed to access internet with DHCP mode
2.Change Ethernet IP settings to Static
3.Input correct ip , gateway, prefix length, DNS
4.UI show Connected, but failed to access Internet.

Change-Id: I223bca85814e94745fbb8b50ca677eb7032e9bb3
(cherry picked from commit 44a107bc8f058c6ac1aab6fbfbf60bf8f3474711)
2017-10-19 14:50:00 +09:00
Lorenzo Colitti
a108171556 Don't crash if the interface disappears just after appearing. am: f851d0347e am: cbb7d86209
am: febd78ae31

Change-Id: I3d917339c80f0ff6a90813b598399f3cc415bbf4
2017-06-23 06:54:17 +00:00
Lorenzo Colitti
78e7dbe3f9 Don't crash if the interface disappears just after appearing. am: f851d0347e am: 74681472c8
am: 3b5a2422fc

Change-Id: I061c5f6e6c738035d57d999ae91c07d0d3ea0924
2017-06-23 06:54:04 +00:00
Lorenzo Colitti
febd78ae31 Don't crash if the interface disappears just after appearing. am: f851d0347e
am: cbb7d86209

Change-Id: I4957474a965553a03874f73dd1649d78646872ad
2017-06-23 06:50:48 +00:00
Lorenzo Colitti
3b5a2422fc Don't crash if the interface disappears just after appearing. am: f851d0347e
am: 74681472c8

Change-Id: I34a4314b5d2e2a9ea591a64ac5dcc3fd9ef677c6
2017-06-23 06:49:33 +00:00
Lorenzo Colitti
74681472c8 Don't crash if the interface disappears just after appearing.
am: f851d0347e

Change-Id: If202c458162b6b89d5bef07a5bdc31a7ffea2d17
2017-06-23 06:46:10 +00:00
Lorenzo Colitti
cbb7d86209 Don't crash if the interface disappears just after appearing.
am: f851d0347e

Change-Id: Icd22bf44b00acc2f94ee916c2e2a43c6b5962c6f
2017-06-23 06:45:04 +00:00
Lorenzo Colitti
1ccfb0b70c Don't crash if the interface disappears just after appearing. am: 17f4e4a027 am: b131ddc5fd am: 0f5a6a6bd2
am: c44ff6cd15

Change-Id: I832ce1a318425617aed7f684bf2d5ed8905b8960
2017-06-23 05:02:47 +00:00
Lorenzo Colitti
c44ff6cd15 Don't crash if the interface disappears just after appearing. am: 17f4e4a027 am: b131ddc5fd
am: 0f5a6a6bd2

Change-Id: I80d20a76367a03e4990a0b59bda81c2d21d90d20
2017-06-23 04:59:37 +00:00
Lorenzo Colitti
0f5a6a6bd2 Don't crash if the interface disappears just after appearing. am: 17f4e4a027
am: b131ddc5fd

Change-Id: Ib35b0a5c3e7bcd44c8033ae53ce0fbb5c7d86bec
2017-06-23 04:54:35 +00:00
Lorenzo Colitti
f851d0347e Don't crash if the interface disappears just after appearing.
If the interface disappears between interfaceAdded() and
setInterfaceUp, we'll crash with an IllegalStateException in
NetworkManagementService#setInterfaceConfig.

Ignore the error instead. This should be safe because we don't
modify any state unless our calls succeed.

(cherry picked from commit 17f4e4a027)

Bug: 62870779
Test: builds aosp_bullhead-eng
Test: builds marlin-eng
Test: exception is logged and device doesn't crash when unplugging USB ethernet adapter while it's being initialized
Change-Id: If8c2375f7fffe25a9fa79dc4f1981c745384a276
2017-06-23 13:54:27 +09:00
Lorenzo Colitti
b131ddc5fd Don't crash if the interface disappears just after appearing.
am: 17f4e4a027

Change-Id: I9f591c6d3136ebdab13051c30f02888320e2b309
2017-06-23 04:50:13 +00:00
Lorenzo Colitti
17f4e4a027 Don't crash if the interface disappears just after appearing.
If the interface disappears between interfaceAdded() and
setInterfaceUp, we'll crash with an IllegalStateException in
NetworkManagementService#setInterfaceConfig.

Ignore the error instead. This should be safe because we don't
modify any state unless our calls succeed.

Bug: 62870779
Test: builds aosp_bullhead-eng
Change-Id: If8c2375f7fffe25a9fa79dc4f1981c745384a276
2017-06-23 01:41:47 +09:00
Lorenzo Colitti
8555952a34 Make Ethernet more robust. am: 62d5e744c3 am: 042561637c am: 315c859e8a
am: e0d41d9626

Change-Id: I05e3f094afaa45e282b0433eba8190088ae198b0
2017-06-19 06:23:57 +00:00
Lorenzo Colitti
e0d41d9626 Make Ethernet more robust. am: 62d5e744c3 am: 042561637c
am: 315c859e8a

Change-Id: I5b41e68577950ba16557427e552e6d03d983dba0
2017-06-19 06:18:52 +00:00
Lorenzo Colitti
315c859e8a Make Ethernet more robust. am: 62d5e744c3
am: 042561637c

Change-Id: I134d6c7d9769eca8bb157d9833181df09e8e8e38
2017-06-19 06:13:47 +00:00
Lorenzo Colitti
042561637c Make Ethernet more robust.
am: 62d5e744c3

Change-Id: I290626b64fa6009b7365a2f7957ddb0776777683
2017-06-19 06:04:17 +00:00
Lorenzo Colitti
62d5e744c3 Make Ethernet more robust.
1. Remove the IP provisioning thread and just attempt
   provisioning indefinitely whenever we have an interface.
2. Make all methods run on the passed-in handler thread. This
   makes it easier to verify correctness by code inspection.
3. Remove the code that changes the factory score depending on
   whether we're tracking an interface and have link. This is
   unnecessary complexity, as there is no penalty to accepting a
   request even if we don't have an interface.
4. Remove code duplication and only have one codepath for
   stopping layer 3.

Tested the following are tested with this CL:
- Booting with an interface connected.
- Disconnecting/reconnecting the Ethernet cable repeatedly,
  particularly at inconvenient times (e.g., during provisioning).
- Similarly, disconnecting/reconnecting USB Ethernet interfaces.
- Falling back to another Ethernet interface if the currently
  tracked Ethernet interface is unplugged.
- Disconnecting and restarting provisioning when provisioning is
  lost (e.g., if the default route is deleted).
- Crashing the system server causes Ethernet to reconnect on
  restart.
- The above while running watch -n 0.1 adb shell dumpsys ethernet

(cherry picked from commit 9effed6f9e)

Bug: 62308954
Test: tested on marlin with USB ethernet adapters, as described
Test: smoketested on aosp_bullhead
Change-Id: Ie3041f1d453d15c81eee81adfc8593269c499d79
2017-06-19 12:31:42 +09:00
Lorenzo Colitti
26fd808c6b Merge "Make Ethernet more robust. am: 9effed6f9e am: 00f803738d" into oc-dr1-dev-plus-aosp
am: c9eddcde9c

Change-Id: I5e05dd306ae651aa75735d887c2a74e5f2fe4f6d
2017-06-09 07:38:38 +00:00
Lorenzo Colitti
e68d804b28 Make Ethernet more robust. am: 9effed6f9e am: 00f803738d
am: 11238e8984

Change-Id: I9cf638511ada7a0672d0b9a268d3ea082f162961
2017-06-09 07:38:29 +00:00
Android Build Merger (Role)
c9eddcde9c Merge "Make Ethernet more robust. am: 9effed6f9e am: 00f803738d" into oc-dr1-dev-plus-aosp 2017-06-09 07:34:37 +00:00
Lorenzo Colitti
92995a88e0 Make Ethernet more robust. am: 9effed6f9e
am: 00f803738d

Change-Id: I4dd010c8e49ac2d603f7ed617209bdc3759680fd
2017-06-09 07:34:32 +00:00
Lorenzo Colitti
11238e8984 Make Ethernet more robust. am: 9effed6f9e
am: 00f803738d

Change-Id: I03f9b28561e0fb1fd1c5e388820e02748c8580b3
2017-06-09 07:34:29 +00:00
Lorenzo Colitti
00f803738d Make Ethernet more robust.
am: 9effed6f9e

Change-Id: I1c531a142706d3cbe0da3adf810887cc221944ed
2017-06-09 07:32:59 +00:00
Lorenzo Colitti
9effed6f9e Make Ethernet more robust.
1. Remove the IP provisioning thread and just attempt
   provisioning indefinitely whenever we have an interface.
2. Make all methods run on the passed-in handler thread. This
   makes it easier to verify correctness by code inspection.
3. Remove the code that changes the factory score depending on
   whether we're tracking an interface and have link. This is
   unnecessary complexity, as there is no penalty to accepting a
   request even if we don't have an interface.
4. Remove code duplication and only have one codepath for
   stopping layer 3.

Tested the following are tested with this CL:
- Booting with an interface connected.
- Disconnecting/reconnecting the Ethernet cable repeatedly,
  particularly at inconvenient times (e.g., during provisioning).
- Similarly, disconnecting/reconnecting USB Ethernet interfaces.
- Falling back to another Ethernet interface if the currently
  tracked Ethernet interface is unplugged.
- Disconnecting and restarting provisioning when provisioning is
  lost (e.g., if the default route is deleted).
- Crashing the system server causes Ethernet to reconnect on
  restart.
- The above while running watch -n 0.1 adb shell dumpsys ethernet

Bug: 62308954
Test: tested on marlin with USB ethernet adapters, as described
Change-Id: Iad12a52a903bfaccf7e245dfe499652c752c31e9
2017-06-09 14:01:29 +09:00
Lorenzo Colitti
4c2a7142ff Merge "Disable the IpManager timeout on Ethernet. am: 0587321554 am: 8bb0952a05" into nyc-mr1-dev-plus-aosp
am: d40615e24e

* commit 'd40615e24ec0532a04ac76f45f2061f61a0e7ba1':

Change-Id: Ib7fbcd926f1a128d86e7710e7e1f7f800afa695a
2016-04-29 13:41:32 +00:00
Lorenzo Colitti
a7b9e2fdb5 Disable the IpManager timeout on Ethernet. am: 0587321554 am: 8facc75476
am: 5a1fe20b16

* commit '5a1fe20b16c0e7030b03c47136cccd9d62b1b966':
  Disable the IpManager timeout on Ethernet.

Change-Id: Idcc944d0edeedf648349e5268fddd724fe9d65bd
2016-04-29 13:41:32 +00:00
Android Build Merger (Role)
d40615e24e Merge "Disable the IpManager timeout on Ethernet. am: 0587321554 am: 8bb0952a05" into nyc-mr1-dev-plus-aosp 2016-04-29 13:39:14 +00:00
Lorenzo Colitti
5a1fe20b16 Disable the IpManager timeout on Ethernet. am: 0587321554
am: 8facc75476

* commit '8facc754767f09f15b7f99c82990c80df40d7014':
  Disable the IpManager timeout on Ethernet.

Change-Id: I46ab6959dce02c5f5da3324d7c4ed59303dcd1cb
2016-04-29 13:39:06 +00:00
Lorenzo Colitti
9b49b7f8b2 Disable the IpManager timeout on Ethernet. am: 0587321554
am: 8bb0952a05

* commit '8bb0952a059c20a47ea0747346f8afb896a6ab9d':
  Disable the IpManager timeout on Ethernet.

Change-Id: I698a59f0b897422b88c4f09f8116a6eab3c14701
2016-04-29 13:39:06 +00:00
Lorenzo Colitti
8facc75476 Disable the IpManager timeout on Ethernet.
am: 0587321554

* commit '0587321554850c1e9d0aab66116ec8a41b367647':
  Disable the IpManager timeout on Ethernet.

Change-Id: I33e0c1243534db348a0b6a8f8ce1a71b68d0ff91
2016-04-29 13:36:42 +00:00
Lorenzo Colitti
8bb0952a05 Disable the IpManager timeout on Ethernet.
am: 0587321554

* commit '0587321554850c1e9d0aab66116ec8a41b367647':
  Disable the IpManager timeout on Ethernet.

Change-Id: Ic578ba62b3900060e75da19c1dd29a0a69abfdbf
2016-04-29 13:36:41 +00:00
Lorenzo Colitti
0587321554 Disable the IpManager timeout on Ethernet.
This fixes a longstanding bug where after a DHCP timeout, we
would never restart the DHCP client and get an IP address until
the link bounced.

Also, two minor improvements:

1. Dump IpManager info when dump() is called.
2. When onLinkPropertiesChange is called, also update
   mLinkProperties. We were already sending the updated
   LinkProperties to the NetworkAgent, so this is really only
   useful for dump(), but it's just one line and safe because
   onLinkPropertiesChange already grabs the lock.

Bug: 17733693
Change-Id: I42c3319cb4bc151c547ed721baf5e83f97e23862
2016-04-29 19:57:43 +09:00
Erik Kline
5774ef5328 Use more IpManager features
- WaitForProvisioningCallback
    - setHttpProxy
    - setTcpBufferSizes

Bug: 26991160
Change-Id: I5e02039a35006f0466fb40c43805f0443cd758c2
2016-02-22 17:41:12 +09:00
Erik Kline
1cb0138ad3 Use IpManager on Ethernet
Bug: 17733693
Bug: 26991160
Change-Id: Idaee8c64bf452e58b93031d8d7ad666edb0c82ae
2016-02-17 22:19:22 +09:00
Lorenzo Colitti
189063ffb0 Stop requiring CHANGE_NETWORK_STATE to change Ethernet config.
Requiring CHANGE_NETWORK_STATE is pointless, since immediately
after doing that we require CONNECTIVITY_INTERNAL, which is
a system-only permission.

Bug: 23597341
Change-Id: If4c8ecbb319e547c2c81d2dcc3c7bbb63e0bc2af
2015-10-15 16:59:07 +09:00
Lorenzo Colitti
baabe41348 Don't crash on startup if we can't fetch the interface list.
The intent of the code was to catch exceptions, but it wasn't
actually doing that because when a netd command fails we get an
IllegalStateException, not a RemoteException.

Bug: 23581852
Change-Id: I66c7c33bdc7b0d0de4fa5cd92dff054797cf860f
2015-09-08 16:21:52 +09:00
Billy Lau
824a0a5050 Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
Replaced the method where we used to enforce static permission
CHANGE_NETWORK_STATE to method calls that also check for WRITE_SETTINGS.
This is due to the merging of CHANGE_NETWORK_STATE permission with
WRITE_SETTINGS in M.

Change-Id: I104ac41733663b4f6b5cd30e7314574ec4acdc07
2015-08-07 19:00:49 +01:00
Lorenzo Colitti
9830ae6d92 Stop DHCP if it times out.
This was not necessary in L, but it is necessary after
https://partner-android-review.googlesource.com/#/c/205415/ .

Bug: 22936203
Change-Id: I24a96c33e5bb375f36217a1c2cec2076eb5ac8b4
2015-08-04 14:54:10 +09:00