Commit graph

13,045 commits

Message SHA1
(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

Dianne Hackborn   commited 2014-05-22 16:43:17 -07:00
e3526efe02
Move dis/enable of mobile data to Telephony
ConnectivityService doesn't do this anymore.

bug:15077247
Change-Id: I3208c91b2c0369b594987f39ca29da7478435513

Robert Greenwalt   authored and   The Android Automerger   commited 2014-05-22 14:34:26 -07:00
48c5086e96
Merge "Battery monitoring fixes:"
Dianne Hackborn   authored and   Android (Google) Code Review   commited 2014-05-22 17:22:15 +00:00
511d573149
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

Dianne Hackborn   commited 2014-05-22 09:43:18 -07:00
8d6d6336c9
Merge "Implement bind-to-network functionality of android.net.Network."
Paul Jensen   authored and   Android (Google) Code Review   commited 2014-05-22 16:14:21 +00:00
75387fc682
merge in master-release history after reset to 8b8f98b68792a4b5c1650d67d0aa953a7f10aab0
The Android Automerger   commited 2014-05-22 05:50:24 -07:00
754d94108c
Move dis/enable of mobile data to Telephony
ConnectivityService doesn't do this anymore.

bug:15077247
Change-Id: I3208c91b2c0369b594987f39ca29da7478435513

Robert Greenwalt   commited 2014-05-21 21:34:05 -07:00
cc0c60d960
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

Paul Jensen   commited 2014-05-22 04:16:54 +00:00
c18ad1b17d
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

Lorenzo Colitti   commited 2014-05-21 16:40:46 -07:00
aaa2131694
merge in master-release history after reset to 1e0d82fdb15231d881d94c51f5eb1b30abd4b045
The Android Automerger   commited 2014-05-21 05:50:19 -07:00
cba5445e59
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

Jaewan Kim   authored and   Lorenzo Colitti   commited 2014-05-20 15:24:10 -07:00
f351fbb607
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

Robert Greenwalt   commited 2014-05-20 09:03:57 -07:00
e20d3ec4a7
Merge "Fix reference to ProxyInfo extra"
Jason Monk   authored and   Android (Google) Code Review   commited 2014-05-20 12:59:52 +00:00
4c4bd56e95
merge in master-release history after reset to cc428c8c35acb4920146b1a43d27f5994ee4a945
The Android Automerger   commited 2014-05-20 05:50:08 -07:00
e784db135c
Fix the build
Change-Id: I18f78f6055f6f9c14571058d6834c8dec01aa732

Robert Greenwalt   commited 2014-05-19 11:00:12 -07:00
b5ff43f857
Add javadoc and unhide new API
Change-Id: I12e475bbf4000c7acec4ca27b1d3bf8f870cc2cf

Robert Greenwalt   commited 2014-05-19 10:34:36 -07:00
d0ebdbb7b0
Add docs for Linkproperties and unhide it.
Preperation for ConnectivityManager API reveal.

Change-Id: Id2addf424213e796c6077def0b7f30cac9a0f75f

Robert Greenwalt   commited 2014-05-19 09:43:36 -07:00
778e9a38ff
Merge "Apply Doc fixes to RouteInfo"
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2014-05-19 15:53:15 +00:00
d48cb481a2
Merge "Add docs to Network"
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2014-05-19 15:52:05 +00:00
4abc7dfe61
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

Robert Greenwalt   commited 2014-05-19 08:17:05 -07:00
469fa2a36d
Add docs to Network
Still must be hidden until we unhide the new API in ConnectivityManager.

Change-Id: I4749e56777199093cdba9223eb3d721c3174047d

Robert Greenwalt   commited 2014-05-19 07:59:16 -07:00
7caaf098fd
Apply Doc fixes to RouteInfo
Change-Id: Ib76df135d5514f7b8baafbbe91fa3d1cdd632f00

Robert Greenwalt   commited 2014-05-19 07:27:46 -07:00
791a40df80
merge in master-release history after reset to edc7592fefbdbb6a6f7b430936a10b8b5745620d
The Android Automerger   commited 2014-05-19 05:49:51 -07:00
26ca7dbe2e
Update the docs for NetworkCapabilities
Preparing for ConnectivityService API update

Change-Id: I397e375b9254d4271183cf34c4a689deea1e198e

Robert Greenwalt   commited 2014-05-18 16:40:16 -07:00
37546d8177
Update RouteInfo docs and make public.
Change-Id: I1a8fe04022ea8291076af166f09112d19114ee16

Robert Greenwalt   commited 2014-05-18 12:43:14 -07:00
8b57c411e4
Update comments for LinkAddress
In preparation for CS api review.

Change-Id: Ib933e905846ebd039d96a523946dd8fdb10f3ff1

Robert Greenwalt   commited 2014-05-18 09:39:18 -07:00
602400263c
Merge "Decouple network_sampling frequency from VDBG"
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2014-05-18 14:43:12 +00:00
a6c732ff4b
merge in master-release history after reset to 7a9b688fe0bd9ac56ec5b60330ad50c6cb4dd3a8
The Android Automerger   commited 2014-05-17 05:50:57 -07:00
3dbd069ec0
Decouple network_sampling frequency from VDBG
Add a special debug flag for testing network sampling.

Change-Id: Ibe572c3b5648ca25f1e5be2c61e5c5ad2979b2cb

Robert Greenwalt   commited 2014-05-16 17:19:24 -07:00
bf4328dcb2
Merge "Stop clatd when starting the Nat464Xlat service."
Lorenzo Colitti   authored and   Android (Google) Code Review   commited 2014-05-16 23:52:52 +00:00
c61f27b91d
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

Lorenzo Colitti   commited 2014-05-16 14:02:13 -07:00
5548999174
Merge "Clean up when we switch networks."
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2014-05-16 17:16:19 +00:00
eda0ac038b
Clean up when we switch networks.
Need to unhitch mNetworkForRequestId when a network is no longer
satisfying a request.

Change-Id: I3b3cde7dd92ec87a76ae7a0825ad22e892fa8fd5

Robert Greenwalt   commited 2014-05-16 08:54:07 -07:00
5fe706b595
Add net.dns system properties
Some apps rely on them.

bug: 14992618
Change-Id: I5766f26b77004e9cfcc90fac657817eab67f9ac7

Robert Greenwalt   authored and   The Android Automerger   commited 2014-05-15 19:10:09 -07:00
4fad135a80
Merge "Add net.dns system properties"
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2014-05-16 00:06:41 +00:00
a81683e653
Add net.dns system properties
Some apps rely on them.

bug: 14992618
Change-Id: I5766f26b77004e9cfcc90fac657817eab67f9ac7

Robert Greenwalt   commited 2014-05-15 16:29:40 -07:00
a1aa9cf108
Fix reference to ProxyInfo extra
Also remove unneeded null check.

Change-Id: Ic25d1087f93632a24755b284ede41d870492e25d

Jason Monk   commited 2014-05-15 12:07:29 -04:00
8247fd4951
Remove unneed clear in constructor.
Keeps all constructors on equal footing.

Change-Id: I316d2b058cc2230ff6aa25a6c8785b42b460438d

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

Change-Id: I83df48447dbcb7f6edf02bd07abf721b009afa49

Sreeram Ramachandran   authored and   The Android Automerger   commited 2014-05-14 15:14:18 -07:00
bbfca99084
Fix reboot loop due to NPE.
All that's old is new again: http://ag/63748.

Change-Id: I83df48447dbcb7f6edf02bd07abf721b009afa49

Sreeram Ramachandran   commited 2014-05-14 14:45:00 -07:00
6e24ec7ff6
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

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

Fix build

Change-Id: I355dc1660196c09530b58386f401a85a74d16476

Robert Greenwalt   commited 2014-05-14 07:50:11 -07:00
89566b61a9
Merge "Add networks and requests to CS.dump"
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2014-05-14 13:44:26 +00:00
c9558f6f04
Add networks and requests to CS.dump
Adds debugging.

Change-Id: I352dfe970c990fd210f3d1598519e321bbdd6ed5
(cherry picked from commit 2a202f0341801ffdebae19bff867e49e4d82b114)

Robert Greenwalt   commited 2014-05-14 13:12:23 +00:00
31a4052e71
Add Multinetwork API
Change-Id: I3a9cef0d416db96d05098dd989ee3fef3b1e9274
(cherry picked from commit d2a1edf5369707b53f63778a029bf70c25551bb6)

Robert Greenwalt   commited 2014-05-14 13:06:56 +00:00
2bebbfb357
merge in master-release history after reset to 7c1ba440e40a2195c4e9316b818942907ff33371
The Android Automerger   commited 2014-05-14 05:50:45 -07:00
4483e2891b
Handle legacy synchronous inspectors
getNetworkInfo, getActiveNetworkInfo, etc

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

Change-Id: I4611d6481b1a76fe4a4ce22232a2a329de2a6e0c

Robert Greenwalt   authored and   Lorenzo Colitti   commited 2014-05-14 03:56:35 -07:00
54d534f96c
Get clatd/Nat464Xlat working with new NetworkAgents.
Change-Id: I65dfb59ce519a42bdb872940d229039b5403fd92

Paul Jensen   authored and   Lorenzo Colitti   commited 2014-05-14 03:56:35 -07:00
7d854049c8
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

Lorenzo Colitti   commited 2014-05-14 03:56:34 -07:00
0980701a6b