Commit Graph

1349 Commits

Author SHA1 Message Date
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
Dave Langemak
b5b3d88c3e am 4a6a8e5e: Merge "Move dis/enable of mobile data to Telephony" into lmp-preview-dev
* commit '4a6a8e5e3cce491064d6836b59c23fd076de56f2':
  Move dis/enable of mobile data to Telephony
2014-05-27 22:24:21 +00: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
Dianne Hackborn
f1f6fc8a09 am deca2a04: (-s ours) Merge "(DO NOT MERGE) Battery monitoring fixes:" into lmp-preview-dev
* commit 'deca2a041d13846158b0db92781b352ab473d9bc':
  (DO NOT MERGE) Battery monitoring fixes:
2014-05-23 00:11:11 +00:00
The Android Automerger
72027d9ad7 am 0c82c484: merge in master-release history after reset to 244e25ef817ddf48727845f14d08b2b787e1ff89
* commit '0c82c484c475422aedf17a8fee5ce3fb1b4290a8': (121 commits)
  am 82ec8c58: am ab3d85ab: am 838b1e22: Merge "Fix NPE in PackageManagerService."
  Fixing bugs due to the new custom accessibility action APIs.
  Should not be closing system dialogs when Recents is hidden. (Bug 15109551)
  Fix a runtime break caused by merge conflict
  Fix typo causing immersive mode transition flickering.
  Fix 64 bit long pointer size for media scanning
  fix argument order in call to SkBlurDrawLooper constructor
  Fix recording of wake_lock_in.
  Fix not being able to pull down status bar.
  Add net.dns system properties
  Battery stats more wake history, power save mode.
  Disable texture atlas
  Fix reboot loop due to NPE.
  Quick fix to ensure mipmap doesn't get stripped by AAPT
  Comment out some new netd calls to fix networking.
  Revert "If PackageUsage information is missing, treat as first boot and compile everything"
  Add api for getting the parent of a profile.
  If PackageUsage information is missing, treat as first boot and compile everything
  Allow setting password restrictions from a managed profile.
  Fix badness from proxy refactoring.
  ...
2014-05-23 00:11:04 +00: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
Paul Jensen
75387fc682 Merge "Implement bind-to-network functionality of android.net.Network." 2014-05-22 16:14:21 +00:00
The Android Automerger
754d94108c merge in master-release history after reset to 8b8f98b68792a4b5c1650d67d0aa953a7f10aab0 2014-05-22 05:50:24 -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
Paul Jensen
c18ad1b17d Implement bind-to-network functionality of android.net.Network.
This is implemented by calling through to netd_client.
Included are functions to bind-to-network-for-process strictly for DNS to
facilitate startUsingNetworkFeature() reimplementation.

Change-Id: Ib22c7d02ea81d251bdfeeb0f64a47ce32eefcb1b
2014-05-22 04:16:54 +00: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
The Android Automerger
cba5445e59 merge in master-release history after reset to 1e0d82fdb15231d881d94c51f5eb1b30abd4b045 2014-05-21 05:50:19 -07:00
Jaewan Kim
f351fbb607 Move IP config from WifiConfiguration to IpConfiguration.
This is so that Ethernet can use it in the future.

Bug: 7606609
Bug: 8687763

Change-Id: I5d1189682b13f1088848809604690648d8d9ecca
2014-05-20 15:24:10 -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
Jason Monk
4c4bd56e95 Merge "Fix reference to ProxyInfo extra" 2014-05-20 12:59:52 +00:00
The Android Automerger
e784db135c merge in master-release history after reset to cc428c8c35acb4920146b1a43d27f5994ee4a945 2014-05-20 05:50:08 -07:00
Robert Greenwalt
b5ff43f857 Fix the build
Change-Id: I18f78f6055f6f9c14571058d6834c8dec01aa732
2014-05-19 11:00:12 -07:00
Robert Greenwalt
d0ebdbb7b0 Add javadoc and unhide new API
Change-Id: I12e475bbf4000c7acec4ca27b1d3bf8f870cc2cf
2014-05-19 10:34:36 -07:00
Robert Greenwalt
778e9a38ff Add docs for Linkproperties and unhide it.
Preperation for ConnectivityManager API reveal.

Change-Id: Id2addf424213e796c6077def0b7f30cac9a0f75f
2014-05-19 09:43:36 -07:00
Robert Greenwalt
d48cb481a2 Merge "Apply Doc fixes to RouteInfo" 2014-05-19 15:53:15 +00:00
Robert Greenwalt
4abc7dfe61 Merge "Add docs to Network" 2014-05-19 15:52:05 +00: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
7caaf098fd Add docs to Network
Still must be hidden until we unhide the new API in ConnectivityManager.

Change-Id: I4749e56777199093cdba9223eb3d721c3174047d
2014-05-19 07:59:16 -07:00
Robert Greenwalt
791a40df80 Apply Doc fixes to RouteInfo
Change-Id: Ib76df135d5514f7b8baafbbe91fa3d1cdd632f00
2014-05-19 07:27:46 -07:00
The Android Automerger
26ca7dbe2e merge in master-release history after reset to edc7592fefbdbb6a6f7b430936a10b8b5745620d 2014-05-19 05:49:51 -07:00
Robert Greenwalt
37546d8177 Update the docs for NetworkCapabilities
Preparing for ConnectivityService API update

Change-Id: I397e375b9254d4271183cf34c4a689deea1e198e
2014-05-18 16:40:16 -07:00
Robert Greenwalt
8b57c411e4 Update RouteInfo docs and make public.
Change-Id: I1a8fe04022ea8291076af166f09112d19114ee16
2014-05-18 12:43:14 -07:00
Robert Greenwalt
602400263c Update comments for LinkAddress
In preparation for CS api review.

Change-Id: Ib933e905846ebd039d96a523946dd8fdb10f3ff1
2014-05-18 09:39:18 -07:00
Robert Greenwalt
a6c732ff4b Merge "Decouple network_sampling frequency from VDBG" 2014-05-18 14:43:12 +00:00
The Android Automerger
3dbd069ec0 merge in master-release history after reset to 7a9b688fe0bd9ac56ec5b60330ad50c6cb4dd3a8 2014-05-17 05:50:57 -07: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
4fad135a80 Add net.dns system properties
Some apps rely on them.

bug: 14992618
Change-Id: I5766f26b77004e9cfcc90fac657817eab67f9ac7
2014-05-15 19:10:09 -07:00
Robert Greenwalt
a81683e653 Merge "Add net.dns system properties" 2014-05-16 00:06:41 +00: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
Jason Monk
8247fd4951 Fix reference to ProxyInfo extra
Also remove unneeded null check.

Change-Id: Ic25d1087f93632a24755b284ede41d870492e25d
2014-05-15 12:07:29 -04:00
Robert Greenwalt
bdba468cb0 Remove unneed clear in constructor.
Keeps all constructors on equal footing.

Change-Id: I316d2b058cc2230ff6aa25a6c8785b42b460438d
2014-05-15 08:53:37 -07:00
The Android Automerger
3888f6a0e0 merge in master-release history after reset to 0be366f2fa7561558f6e6d40739f05533f4bbffe 2014-05-15 05:50:45 -07:00
Sreeram Ramachandran
bbfca99084 Fix reboot loop due to NPE.
All that's old is new again: http://ag/63748.

Change-Id: I83df48447dbcb7f6edf02bd07abf721b009afa49
2014-05-14 15:14:18 -07:00
Sreeram Ramachandran
6e24ec7ff6 Fix reboot loop due to NPE.
All that's old is new again: http://ag/63748.

Change-Id: I83df48447dbcb7f6edf02bd07abf721b009afa49
2014-05-14 14:45:00 -07:00
Robert Greenwalt
b5c5c2bbe3 Undeprecate funcs until we're ready for api-review
Fixing javadoc deprecated tags to fix a checkbuild error breaks the current/api.txt.
We're not ready for the api change yet, so back out the comments.

Change-Id: Ia95e394da7329c1b9e3876e589c3c2137ba18048
2014-05-14 08:55:13 -07:00
Robert Greenwalt
89566b61a9 Fix Javadoc
It's Deprecated for an annotation, but deprecated for
a javadoc and case is important.

Fix build

Change-Id: I355dc1660196c09530b58386f401a85a74d16476
2014-05-14 07:50:11 -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