Commit Graph

647 Commits

Author SHA1 Message Date
Amit Mahajan
d032de432e resolved conflicts for merge of 253b06e6 to master
Change-Id: I65585939a57c561064d370be131c0197de0f08c3
2014-06-10 10:47:26 -07:00
Amit Mahajan
c5a1965052 am e5a28d34: am 01d0e324: Handle provisioning APN by turning off/on radio.
* commit 'e5a28d34f662c469f85590dda28fc02eca12204b':
  Handle provisioning APN by turning off/on radio.
2014-06-09 19:50:09 +00:00
Amit Mahajan
01d0e324fb Handle provisioning APN by turning off/on radio.
The change is specific to AT&T as they want no signaling from device during provisioning.
I've tested following cases:
- expired AT&T SIM to make sure provisioning flow works as expected.
- airplane mode on/off with both active and expired AT&T SIM.
- wifi <-> mobile transitions work okay.
- LTE with Verizon SIM (basic sanity).

bug: 13190133

Change-Id: I215963174ae6000ae71d1dda693f95413f3d6e81
2014-06-09 17:55:27 +00:00
Robert Greenwalt
bbcebb79ae Fix public API of LinkProperties.
bug:15142362
Change-Id: I1457111da7d3bd09998f7e010febb8bb4c45c8bc
2014-06-08 12:54:23 -07:00
Robert Greenwalt
515dc898e4 Merge "Report new network scores back to factories." 2014-06-04 18:48:44 +00:00
Robert Greenwalt
5ccc1c5eb6 Report new network scores back to factories.
This is a first order approx of what we want - should probably be good enough in most cases.

bug:15277751

Change-Id: I10e3b25f6ad5c7e022ba966ed514d4e6a999180d
2014-06-04 18:38:01 +00:00
Robert Greenwalt
7d19a36be1 Fix legacy APIs.
Two fixes.  First make sure we mark the request as handled by the network handling it.
Second, convert ensureRouteToHostForAddress to use the new legacyNetworkForType.

bug:14993207
Change-Id: I230968938ca0ed91f834b36a2af60caff2eab682
2014-06-03 17:22:11 -07:00
Robert Greenwalt
5a367872ce Fix Legacy NetworkInfo API
Make the connectivity changed broadcasts send correct NetworkInfos.
Also update the results of getNetwork.

bug:15290306
bug:15191336
bug:14993207
Change-Id: Ie99ad25f3ebb90d18348e7013761b139e7481866
(cherry picked from commit 16fe1c18289de200d2249e51db8c0986619f487b)
2014-06-03 14:00:56 +00:00
Robert Greenwalt
ce20973ca0 Fix Legacy NetworkInfo API
Make the connectivity changed broadcasts send correct NetworkInfos.
Also update the results of getNetwork.

bug:15290306
bug:15191336
bug:14993207
Change-Id: Ie99ad25f3ebb90d18348e7013761b139e7481866
2014-06-03 19:58:54 +09:00
Robert Greenwalt
cf82b83c79 Refactor NetworkFactory.
Make NetworkFactory a concrete class and divide responsibilites between it and NetworkAgent.
Factory will track requests and by default give a single connect/disconnect api for ease
of use.  Then NetworkAgent is created and destroyed as needed with very simple logic.

Change-Id: I401c14a6e5466f2fc63b04219b97ff85bb9af291
(cherry picked from commit 9a17b9c5a256cb4bb14821c5ee89b03b99c045e8)
2014-06-03 01:26:48 +00:00
Robert Greenwalt
b59a91be9f Rewrite startUsingNetworkFeature for new API
bug:14993207
Change-Id: I041a80faa07bf3094af13a6c606f3b15aa03f789
(cherry picked from commit 09fe5e618b09965183cf53fba87c39025a19e8d1)
2014-06-02 23:29:20 +00:00
Robert Greenwalt
82b9d2ad42 Refactor NetworkFactory.
Make NetworkFactory a concrete class and divide responsibilites between it and NetworkAgent.
Factory will track requests and by default give a single connect/disconnect api for ease
of use.  Then NetworkAgent is created and destroyed as needed with very simple logic.

Change-Id: I401c14a6e5466f2fc63b04219b97ff85bb9af291
2014-06-02 16:19:08 -07:00
Robert Greenwalt
3c271afcb4 Merge "Rewrite startUsingNetworkFeature for new API" 2014-06-02 23:12:29 +00:00
Sreeram Ramachandran
45a8630b13 Support legacy routes added by apps via ensureRouteToHost().
Change-Id: I0ee1ca89fdc859d75a89021ca8c1902811b1e4a9
(cherry picked from commit fb17b32550de624b7f476b70b7a2fc77f31dde7d)
2014-05-30 18:21:34 +00:00
Sreeram Ramachandran
8c60a1db64 Support legacy routes added by apps via ensureRouteToHost().
Change-Id: I0ee1ca89fdc859d75a89021ca8c1902811b1e4a9
2014-05-29 19:00:37 -07:00
Lorenzo Colitti
86f5cd9767 Don't break things if a network goes back to CONNECTED.
Currently, if a network goes from CONNECTED to some other "live"
state (e.g., CONNECTING, because it's VERIFYING_POOR_LINK) and
back, ConnectivityService treats it as if a new network had
connected.  This causes it to attempt to create the network
(which fails, since a network with that netid already exists), to
trigger verification, and if the verification succeeds, to tear
down the network because the request it's satisfying is already
satisfied by the network itself.

Instead, if creating the network fails, assume it's because the
network had already been created, and bail out.

Also, when validation completes, ignore NetworkRequests that were
being served by the same NetworkAgent as before.

Bug: 15244052

(cherry picked from commit cfff026ec47afc7e31f60f80e3deea7f4e2f9be5)

Change-Id: I52c2220e8f1d98fca765880be3040593e92722ed
2014-05-29 21:36:07 +09:00
Lorenzo Colitti
fad22fe934 Don't break things if a network goes back to CONNECTED.
Currently, if a network goes from CONNECTED to some other "live"
state (e.g., CONNECTING, because it's VERIFYING_POOR_LINK) and
back, ConnectivityService treats it as if a new network had
connected.  This causes it to attempt to create the network
(which fails, since a network with that netid already exists), to
trigger verification, and if the verification succeeds, to tear
down the network because the request it's satisfying is already
satisfied by the network itself.

Instead, if creating the network fails, assume it's because the
network had already been created, and bail out.

Also, when validation completes, ignore NetworkRequests that were
being served by the same NetworkAgent as before.

Bug: 15244052
Change-Id: Ifd73558e5be452d9ef88c64cca429d5f302bf354
2014-05-29 19:19:54 +09:00
Robert Greenwalt
3d6c958af4 Move dis/enable of mobile data to Telephony
ConnectivityService doesn't do this anymore.

bug:15077247
Change-Id: I3208c91b2c0369b594987f39ca29da7478435513
(cherry picked from commit 53013c87496980b534e447e717a32698fbd4bca0)
2014-05-27 20:28:50 +00:00
Robert Greenwalt
2000cddea0 Rewrite startUsingNetworkFeature for new API
bug:14993207
Change-Id: I041a80faa07bf3094af13a6c606f3b15aa03f789
2014-05-27 13:24:14 -07:00
Dianne Hackborn
e3526efe02 (DO NOT MERGE) Battery monitoring fixes:
- Improve monitoring of level changes to not be confused
  when it goes up while draining or down while charging.
- Put back in connectivity service code to tell battery
  stats about the interfaces.
- Turn back on reporting of mobile radio active state
  from the RIL.
- Fix bug in marshalling/unmarshalling that would cause
  the UI to show bad data.

Change-Id: I733ef52702894cca81a0813eccdfc1023e546fce
2014-05-22 16:43:17 -07:00
Dianne Hackborn
511d573149 Merge "Battery monitoring fixes:" 2014-05-22 17:22:15 +00:00
Dianne Hackborn
8d6d6336c9 Battery monitoring fixes:
- Improve monitoring of level changes to not be confused
  when it goes up while draining or down while charging.
- Put back in connectivity service code to tell battery
  stats about the interfaces.
- Turn back on reporting of mobile radio active state
  from the RIL.
- Fix bug in marshalling/unmarshalling that would cause
  the UI to show bad data.

Change-Id: I733ef52702894cca81a0813eccdfc1023e546fce
2014-05-22 09:43:18 -07:00
Robert Greenwalt
cc0c60d960 Move dis/enable of mobile data to Telephony
ConnectivityService doesn't do this anymore.

bug:15077247
Change-Id: I3208c91b2c0369b594987f39ca29da7478435513
2014-05-21 21:34:05 -07:00
Lorenzo Colitti
aaa2131694 Delete the EthernetDataTracker.
Code search says these are the only two files that use it. The
tracker will be resurrected in a slightly different form in
frameworks/opt/net/ethernet.

Bug: 14993642
Bug: 14981801
Change-Id: I2477668ca78dfe46661dda1d97c7f786fd7eba35
2014-05-21 16:40:46 -07:00
Robert Greenwalt
e20d3ec4a7 Add NetworkFactory names and unregistration.
Some Factories come and go (Telephony) and so they need to be able to unregister.
Also, debugging is tough when the factories are anonymous, so add names for logging.

Lastly, only send single set of NetworkRequests to a newly registered NetworkFactory
and only send the requests.

Change-Id: I717d63363f25c446f8ecf38d933b1a35d744af6e
2014-05-20 09:03:57 -07:00
Robert Greenwalt
b5ff43f857 Fix the build
Change-Id: I18f78f6055f6f9c14571058d6834c8dec01aa732
2014-05-19 11:00:12 -07:00
Robert Greenwalt
469fa2a36d Add javadoc for NetworkRequest.
Also moved the requestId serial number out of this public class into CS.

Had to leave NetworkRequest hidden for now because the docs refer to things still hidden
in ConnectivityManager.

Change-Id: I14d1fe52d992adf5e4dc197b8f5433e40b0adfe6
2014-05-19 08:17:05 -07:00
Robert Greenwalt
a6c732ff4b Merge "Decouple network_sampling frequency from VDBG" 2014-05-18 14:43:12 +00:00
Robert Greenwalt
bf4328dcb2 Decouple network_sampling frequency from VDBG
Add a special debug flag for testing network sampling.

Change-Id: Ibe572c3b5648ca25f1e5be2c61e5c5ad2979b2cb
2014-05-16 17:19:24 -07:00
Lorenzo Colitti
c61f27b91d Merge "Stop clatd when starting the Nat464Xlat service." 2014-05-16 23:52:52 +00:00
Lorenzo Colitti
5548999174 Stop clatd when starting the Nat464Xlat service.
If a runtime restart happens while clatd was running, we try to
start clatd, which causes a fatal exception because netd returns
a 400 error (clatd already started.

Bug: 13450716
Bug: 15012035
Change-Id: I102a06d6193fb5f4a1ebe5ad52e5647ff72ca0da
2014-05-16 14:02:13 -07:00
Robert Greenwalt
eda0ac038b Merge "Clean up when we switch networks." 2014-05-16 17:16:19 +00:00
Robert Greenwalt
5fe706b595 Clean up when we switch networks.
Need to unhitch mNetworkForRequestId when a network is no longer
satisfying a request.

Change-Id: I3b3cde7dd92ec87a76ae7a0825ad22e892fa8fd5
2014-05-16 08:54:07 -07:00
Robert Greenwalt
a1aa9cf108 Add net.dns system properties
Some apps rely on them.

bug: 14992618
Change-Id: I5766f26b77004e9cfcc90fac657817eab67f9ac7
2014-05-15 16:29:40 -07:00
Robert Greenwalt
c9558f6f04 Merge "Add networks and requests to CS.dump" 2014-05-14 13:44:26 +00:00
Robert Greenwalt
31a4052e71 Add networks and requests to CS.dump
Adds debugging.

Change-Id: I352dfe970c990fd210f3d1598519e321bbdd6ed5
(cherry picked from commit 2a202f0341801ffdebae19bff867e49e4d82b114)
2014-05-14 13:12:23 +00:00
Robert Greenwalt
2bebbfb357 Add Multinetwork API
Change-Id: I3a9cef0d416db96d05098dd989ee3fef3b1e9274
(cherry picked from commit d2a1edf5369707b53f63778a029bf70c25551bb6)
2014-05-14 13:06:56 +00:00
Robert Greenwalt
54d534f96c Handle legacy synchronous inspectors
getNetworkInfo, getActiveNetworkInfo, etc

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

Change-Id: I4611d6481b1a76fe4a4ce22232a2a329de2a6e0c
2014-05-14 03:56:35 -07:00
Paul Jensen
7d854049c8 Get clatd/Nat464Xlat working with new NetworkAgents.
Change-Id: I65dfb59ce519a42bdb872940d229039b5403fd92
2014-05-14 03:56:35 -07:00
Lorenzo Colitti
0980701a6b Fix compile errors after merge.
These are due to changes to ConnectivityService that were made
after master-multinetwork-dev branched off. They mostly didn't
cause merge conflicts because they were in different parts of
the file from the multinetwork changes, but they cause compile
errors now. These particular changes should be fine - they are
all in dead code anyway, and their functionality had already
been re-implemented in the new code.

Change-Id: I0ac9e39c3c975c8e8dc04ad11b6b85366693865c
2014-05-14 03:56:34 -07:00
Paul Jensen
c72bce7591 Disable calls to MobileDataStateTracker.isProvisioning() as there is no more
MobileDataStateTracker so these just crash.

Change-Id: Ib45a85db505c0a99fb65d9a6d0c39b860f9d019d
2014-05-14 03:56:34 -07:00
Paul Jensen
3842b5276e Add NetworkMonitor.
At present the network evaluation / captive portal detection
is disabled pending addition of API to bind socket to network.

Change-Id: I5d1f5dc86d4dd9481d52dd45d6da0732054c8315
2014-05-14 03:56:34 -07:00
Paul Jensen
6b19753e89 Separate network and interface addition/removal netd APIs.
This should facilitate stacked interfaces (i.e. clatd).

Change-Id: Ib3e7a4d3847ef6ec4449451f6da42e75959baa4f
2014-05-14 03:56:34 -07:00
Robert Greenwalt
db6fac5aad Enabling internal msg apis
NetworkFactory and NetworkAgent.  First trying with wifi and
getting rid of WifiStateTracker.

Conflicts:
	api/current.txt
	services/core/java/com/android/server/ConnectivityService.java

Change-Id: I7f0ec13d7d8988b32f3c6dc71f72012f3349fe02
2014-05-14 03:56:34 -07:00
Sreeram Ramachandran
9ccfb02776 Fix build.
Change-Id: I5dab09d2d8a9cff56fa17bb4e8c14b365449399b
2014-05-14 03:56:33 -07:00
Sreeram Ramachandran
a5b0928e5a Specify netId when adding/removing routes.
Change-Id: I07fd950aee726e9721153f75c3e4c10d8e19d8e9
2014-05-14 03:56:33 -07:00
Sreeram Ramachandran
a5c33ff4f2 Set and clear the default network.
Change-Id: I305951e0c4735d708804baa597cc2d9b10f501c0
2014-05-14 03:56:33 -07:00
Paul Jensen
e54dc09048 Get ConnectivityServiceTest building again after 307dd58.
Change-Id: I4520011ba2076d8fac1ca234cb9a79c774992671
2014-05-14 03:56:33 -07:00
Paul Jensen
5996033e08 Use NetId instead of interface name when communicating DNS changes to netd.
Change-Id: Ic82b73de6f50d39d56c5e1a32f5b1f3ebb80bb7d
2014-05-14 03:56:33 -07:00
Robert Greenwalt
f80067d790 Stop adding host routes for dns
bug:13550136
Change-Id: I748e13b96dab111f8f6a4b11d9beaf2a72d0742b
2014-05-14 03:56:32 -07:00