Commit Graph

279626 Commits

Author SHA1 Message Date
Erik Kline
d0867fb876 Merge "More concisely export whether we have a "tetherable configuration"" am: 1b2a1b911d
am: 72c17a7234

Change-Id: Ic67b2d4589f586c67109216330f68cb1fc08c55a
2017-01-23 07:20:32 +00:00
Erik Kline
72c17a7234 Merge "More concisely export whether we have a "tetherable configuration""
am: 1b2a1b911d

Change-Id: I5f9717c9dab6b39f1fbf2186107b2a1f3f2d4f8f
2017-01-23 07:13:56 +00:00
Treehugger Robot
1b2a1b911d Merge "More concisely export whether we have a "tetherable configuration"" 2017-01-23 07:04:22 +00:00
Erik Kline
d781fbad3f More concisely export whether we have a "tetherable configuration"
Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
    - vanilla WiFi-to-mobile tethering works
Bug: 32163131
Change-Id: I20dd36b5bf7fc55a639c76ea4bdb55b650654881
2017-01-23 13:04:28 +09:00
Amin Shaikh
835db7f6b6 Merge "Add Setting for curating saved open networks." am: b3b665de22
am: 2aec2f7a9c

Change-Id: If61be9f8e71bb89a8714c3f4a5eb10b04982cdf7
2017-01-21 05:34:12 +00:00
Amin Shaikh
2aec2f7a9c Merge "Add Setting for curating saved open networks."
am: b3b665de22

Change-Id: I3c65f39dc4f38f1c6c00a240f519cb0b0cf1a916
2017-01-21 05:27:06 +00:00
Treehugger Robot
b3b665de22 Merge "Add Setting for curating saved open networks." 2017-01-21 05:17:41 +00:00
Erik Kline
46f036c6da Merge "Move several config elements into TetheringConfiguration class" am: 8d35276910
am: 81499754bc

Change-Id: I6a0dc7192aeca1ecccbf8223516bf3f5f4a9bfb8
2017-01-21 05:06:06 +00:00
Erik Kline
befb6a1702 Move several config elements into TetheringConfiguration class am: 3e7566572e
am: ec45953fd7

Change-Id: If9cffb4d63cdfdf075b6c8991e763f4237d0d5a8
2017-01-21 05:05:04 +00:00
Erik Kline
81499754bc Merge "Move several config elements into TetheringConfiguration class"
am: 8d35276910

Change-Id: I0eb196a4b61e460db24271d6805177641ad3fc9b
2017-01-21 04:57:34 +00:00
Erik Kline
ec45953fd7 Move several config elements into TetheringConfiguration class
am: 3e7566572e

Change-Id: Ic053965b54eed0afc9a4785ce80ef1fab281493a
2017-01-21 04:57:29 +00:00
Erik Kline
8de6457414 Merge "Address a few unittest comments." am: 9c3a298748
am: d4d464ae2c

Change-Id: Iacb543c081a89327c66ce849b764866f12bc60d0
2017-01-21 04:50:36 +00:00
Erik Kline
8d35276910 Merge "Move several config elements into TetheringConfiguration class" 2017-01-21 04:49:11 +00:00
Erik Kline
d4d464ae2c Merge "Address a few unittest comments."
am: 9c3a298748

Change-Id: I2d41cdbe05653bcbed9d3b38b440c06b98006809
2017-01-21 04:43:27 +00:00
Erik Kline
9c3a298748 Merge "Address a few unittest comments." 2017-01-21 04:36:28 +00:00
Amin Shaikh
8533622ae7 Add Setting for curating saved open networks.
Bug: 34392914
Test: make
Change-Id: Icd17753af6b0efdb35d1060b16029a53fdf4e605
Merged-In: Icd17753af6b0efdb35d1060b16029a53fdf4e605
2017-01-20 18:31:56 -08:00
Amin Shaikh
b7b9c6f889 Merge "Add additional fields to RecommendationRequest." am: b8f0e69ef0
am: ac05acad45

Change-Id: I1062446bbd085b794bfe61843e670dc5af689d32
2017-01-20 23:23:39 +00:00
Amin Shaikh
ac05acad45 Merge "Add additional fields to RecommendationRequest."
am: b8f0e69ef0

Change-Id: I9a50c8aca36cf740abbc62af6879b4e6ea736855
2017-01-20 23:18:02 +00:00
Rebecca Silberstein
5c00ee28b2 Merge "SystemServer: reorder wifi services start" am: 10c514d9de
am: eae39fd1ec

Change-Id: I723d8b96f5d5406e8f948885a845993e755ab0d8
2017-01-20 23:07:10 +00:00
Treehugger Robot
b8f0e69ef0 Merge "Add additional fields to RecommendationRequest." 2017-01-20 23:04:55 +00:00
Rebecca Silberstein
eae39fd1ec Merge "SystemServer: reorder wifi services start"
am: 10c514d9de

Change-Id: I3a918b707932084759701103c683fffed0e16cee
2017-01-20 23:00:13 +00:00
Jeff Sharkey
4a0a4664b9 Merge "Add Binder support for Parcelable exceptions." am: a2ef6b5741
am: c3fbf32011

Change-Id: Ibd977a017ce48f0791520af3500969aec0c132e5
2017-01-20 22:56:45 +00:00
Rebecca Silberstein
10c514d9de Merge "SystemServer: reorder wifi services start" 2017-01-20 22:51:36 +00:00
Jeff Sharkey
c3fbf32011 Merge "Add Binder support for Parcelable exceptions."
am: a2ef6b5741

Change-Id: Ide766c0220e86b7661af83551354b3a498297ed8
2017-01-20 22:50:49 +00:00
Jeff Sharkey
a2ef6b5741 Merge "Add Binder support for Parcelable exceptions." 2017-01-20 22:45:04 +00:00
Amin Shaikh
b50ade8bb0 Add additional fields to RecommendationRequest.
- Add networkId and timestamp for the last user selected network

Bug: 34467596
Test: runtest --path core/tests/coretests/src/android/net/RecommendationRequestTest.java
Change-Id: Ic81c1beede1a643cd428b6e5c57ed430a6b1ccc0
Merged-In: Ic81c1beede1a643cd428b6e5c57ed430a6b1ccc0
2017-01-20 09:37:59 -08:00
Erik Kline
6dacd5ecf2 Merge "Refactor to SimChangeListener class" am: a12217012e
am: 74247b4ee8

Change-Id: I59dc854bd74eb8ba6addae90a4a87453868b5368
2017-01-20 10:16:56 +00:00
Erik Kline
35eee13df4 Address a few unittest comments.
Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 32163131
Change-Id: I8f6002243031dceff60b3d6d377b9e25f239eb23
2017-01-20 19:13:20 +09:00
Erik Kline
74247b4ee8 Merge "Refactor to SimChangeListener class"
am: a12217012e

Change-Id: I863f0b23251a0ebd18a76cf08e1ff0f2cee9cda3
2017-01-20 10:13:08 +00:00
Erik Kline
3e7566572e Move several config elements into TetheringConfiguration class
Encapsulate the following config elements:
    - all interface name regular expressions
    - specification of preferred upstreams
    - downstream DHCPv4 ranges
    - default IPv4 (and IPv6) DNS servers

Test: as follows
    - builds
    - flashed (bullhead)
    - runtest frameworks-net passes
Bug: 32163131
Change-Id: Ife4871c0b89d2d52e2cc9238e0606b428287521c
2017-01-20 19:12:38 +09:00
Erik Kline
454a408717 Merge "Address comments from previous change (320592)" am: e7cb6c3761
am: b6f606b59f

Change-Id: Icc5aa3d6cafd9829e65a0e82523727a9aba4ade5
2017-01-20 10:10:52 +00:00
Treehugger Robot
a12217012e Merge "Refactor to SimChangeListener class" 2017-01-20 10:05:51 +00:00
Erik Kline
b6f606b59f Merge "Address comments from previous change (320592)"
am: e7cb6c3761

Change-Id: I3266a02a4a2fd76c4bb2f1a744103add63307e26
2017-01-20 10:04:51 +00:00
Treehugger Robot
e7cb6c3761 Merge "Address comments from previous change (320592)" 2017-01-20 09:57:27 +00:00
Lorenzo Colitti
6bcbb16630 Merge "Don't loop forever on zero-length ICMPv6 ND options." am: e7128b10a8
am: 113d5f8f40

Change-Id: Ic2d6596d14f6176a823fd66b400af8515617c66d
2017-01-20 08:58:47 +00:00
Lorenzo Colitti
113d5f8f40 Merge "Don't loop forever on zero-length ICMPv6 ND options."
am: e7128b10a8

Change-Id: If2260dd2b1bdaf2619cee668f8c2ef81e9dcfdce
2017-01-20 08:54:42 +00:00
Treehugger Robot
e7128b10a8 Merge "Don't loop forever on zero-length ICMPv6 ND options." 2017-01-20 08:47:17 +00:00
Erik Kline
54cb4c5800 Refactor to SimChangeListener class
Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameswork-net passes
    - tested wifi-to-mobile tethering, including SIM remove/insert
Bug: 32163131
Change-Id: I6aac9a8f34cfd0079a4433471ec08b9b1ec0d754
2017-01-20 17:10:00 +09:00
Hugo Benichi
4c2371db6b Merge "DO NOT MERGE Unit tests for NetworkNotificationManager" am: 216a4e7655 -s ours
am: feca77b884  -s ours

Change-Id: I847fe5f04ebf8b5634c3ae0974e69d50cef9df76
2017-01-20 07:55:35 +00:00
Hugo Benichi
feca77b884 Merge "DO NOT MERGE Unit tests for NetworkNotificationManager"
am: 216a4e7655  -s ours

Change-Id: I05fe9095395df00b96df3cbe3a6e4f31a160e0b5
2017-01-20 07:51:31 +00:00
Hugo Benichi
216a4e7655 Merge "DO NOT MERGE Unit tests for NetworkNotificationManager" 2017-01-20 07:44:30 +00:00
Erik Kline
efdd3f4ce0 Address comments from previous change (320592)
Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
    - vanilla wifi-to-mobile tethering works
Bug: 32163131

Change-Id: I8788cb0d93606a2893c3dbc4f22e72f450f319b8
2017-01-20 16:31:29 +09:00
Lorenzo Colitti
1eda5b25ce Don't loop forever on zero-length ICMPv6 ND options.
Bug: 33828433

(cherry picked from commit 2f157c421a)

Change-Id: Icc03f0fcbf40d87e0b9c69e1172802ffcc85531b
2017-01-20 15:48:21 +09:00
Erik Kline
2d49de42b8 Merge "BroadcastReceiver refactoring" am: 73a57bb9da
am: bcdd7475e5

Change-Id: I213f5af2393d3fc353114f30205b3378d3f169a5
2017-01-20 06:33:39 +00:00
Erik Kline
bcdd7475e5 Merge "BroadcastReceiver refactoring"
am: 73a57bb9da

Change-Id: Iafb0aa75c564aeb4c0181ef0dbacc6de4527480a
2017-01-20 06:29:36 +00:00
Erik Kline
73a57bb9da Merge "BroadcastReceiver refactoring" 2017-01-20 06:23:36 +00:00
Hugo Benichi
55b5f0f9eb DO NOT MERGE Unit tests for NetworkNotificationManager
Test: new unit test, no functional changes.
Bug: 32198726

(cherry picked from commit 74264329da)

Change-Id: I123de68de9ae353b95edce89eb570cfbb5f8d9a3
2017-01-20 15:08:38 +09:00
Erik Kline
2e88b5e674 BroadcastReceiver refactoring
All registerReceiver() calls now specify to be run on the tethering
master state machine's handler. Eventually, some of the locking might
be removed (requires careful review, later).

Also: slightly refactor StateReceiver for readability

Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
    - vanilla tethering from WiFi to mobile works
Bug: 32163131
Change-Id: I39844f6e1608179ebeb41668a6db8a4e44d30ecf
2017-01-20 13:06:03 +09:00
Chen Xu
923046251b Merge "Initial change on carrier signal filtering" am: bfdce89f36
am: 1507930691

Change-Id: I2edbdbd65fd90215b39e1b5f4a888c9df119b841
2017-01-20 03:54:22 +00:00
Chen Xu
1507930691 Merge "Initial change on carrier signal filtering"
am: bfdce89f36

Change-Id: I8746998d2554d6161766ca29779dc7efabc5b802
2017-01-20 03:39:15 +00:00