Commit graph

1,376 commits

Message SHA1
am e8f910c6: Fix Legacy NetworkInfo API
* commit 'e8f910c635710e4b2d7f299ba33f6205cc4371e3':
  Fix Legacy NetworkInfo API

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-06-04 17:03:25 +00:00
b3d4e07986
am ead9aa35: Merge "Refactor NetworkFactory." into lmp-preview-dev
* commit 'ead9aa35d4f5b94d9d602247826ba97afe2b6791':
  Refactor NetworkFactory.

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-06-04 17:01:56 +00:00
240a1d36a7
am 5fc756c3: (-s ours) Merge "Rewrite startUsingNetworkFeature for new API" into lmp-preview-dev
* commit '5fc756c3f4b7203d53834b9750332325ebf4e92d':
  Rewrite startUsingNetworkFeature for new API

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-06-04 16:45:02 +00:00
ce66fda8ff
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)

Robert Greenwalt   commited 2014-06-03 14:00:56 +00:00
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

Robert Greenwalt   authored and   Lorenzo Colitti   commited 2014-06-03 19:58:54 +09:00
ce20973ca0
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)

Robert Greenwalt   commited 2014-06-03 01:26:48 +00:00
cf82b83c79
Rewrite startUsingNetworkFeature for new API
bug:14993207
Change-Id: I041a80faa07bf3094af13a6c606f3b15aa03f789
(cherry picked from commit 09fe5e618b09965183cf53fba87c39025a19e8d1)

Robert Greenwalt   commited 2014-06-02 23:29:20 +00:00
b59a91be9f
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

Robert Greenwalt   commited 2014-06-02 16:19:08 -07:00
82b9d2ad42
Merge "Rewrite startUsingNetworkFeature for new API"
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2014-06-02 23:12:29 +00:00
3c271afcb4
am 5a734bd7: Merge "Support legacy routes added by apps via ensureRouteToHost()." into lmp-preview-dev
* commit '5a734bd78e83afeee5833b56f04ac99113b97542':
  Support legacy routes added by apps via ensureRouteToHost().

Sreeram Ramachandran   authored and   Android Git Automerger   commited 2014-05-30 21:39:09 +00:00
ef1df196e5
Support legacy routes added by apps via ensureRouteToHost().
Change-Id: I0ee1ca89fdc859d75a89021ca8c1902811b1e4a9
(cherry picked from commit fb17b32550de624b7f476b70b7a2fc77f31dde7d)

Sreeram Ramachandran   commited 2014-05-30 18:21:34 +00:00
45a8630b13
Merge "Support legacy routes added by apps via ensureRouteToHost()."
Sreeram Ramachandran   authored and   Android (Google) Code Review   commited 2014-05-30 03:29:39 +00:00
536817e165
Support legacy routes added by apps via ensureRouteToHost().
Change-Id: I0ee1ca89fdc859d75a89021ca8c1902811b1e4a9

Sreeram Ramachandran   commited 2014-05-29 19:00:37 -07:00
8c60a1db64
am 4477d6aa: Merge "Adjust Network\'s SocketFactory to restrict host name resolution to that Network" into lmp-preview-dev
* commit '4477d6aaadcdf583420b706065cc0753fb91cf3c':
  Adjust Network's SocketFactory to restrict host name resolution to that Network

Paul Jensen   authored and   Android Git Automerger   commited 2014-05-30 01:49:49 +00:00
5d17f6c126
am 7df1decc: (-s ours) Merge "Implement bind-to-network functionality of android.net.Network." into lmp-preview-dev
* commit '7df1deccfee0a98234960fa76bd0357f84a614c4':
  Implement bind-to-network functionality of android.net.Network.

Paul Jensen   authored and   Android Git Automerger   commited 2014-05-29 19:23:20 +00:00
18265aa92d
Adjust Network's SocketFactory to restrict host name resolution to that Network
bug: 13885501

Change-Id: Iab9a5a2e060fe261f4be9ba974c1a55fb6b9c98b
(cherry picked from commit 92064edf55ee11967d9cc7529125236ee8e469b2)

Paul Jensen   commited 2014-05-29 19:17:06 +00:00
0179f8830a
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.

bug: 13885501

Change-Id: Ib22c7d02ea81d251bdfeeb0f64a47ce32eefcb1b
(cherry picked from commit dbf76f898f1f57eb74722358087c926d2f529bda)

Paul Jensen   authored and   Robert Greenwalt   commited 2014-05-29 18:53:57 +00:00
94d37923b9
am 67cf4bad: Merge "Don\'t break things if a network goes back to CONNECTED." into lmp-preview-dev
* commit '67cf4bad7bad05ff0a3a0704305c9eed4c92a338':
  Don't break things if a network goes back to CONNECTED.

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-05-29 15:20:50 +00:00
fe485fcd53
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

Lorenzo Colitti   commited 2014-05-29 21:36:07 +09:00
86f5cd9767
Merge "Don't break things if a network goes back to CONNECTED."
Lorenzo Colitti   authored and   Android (Google) Code Review   commited 2014-05-29 12:25:46 +00:00
1b14f762c7
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

Lorenzo Colitti   commited 2014-05-29 19:19:54 +09:00
fad22fe934
am d925573a: (-s ours) Merge "DO NOT MERGE - Support disconnecting while trying to connect." into lmp-preview-dev
* commit 'd925573af1ceab0d4a447e738f1d8830e552edd1':
  DO NOT MERGE - Support disconnecting while trying to connect.

Lorenzo Colitti   authored and   Android Git Automerger   commited 2014-05-28 21:44:50 +00:00
f052469c7b
Merge "Adjust Network's SocketFactory to restrict host name resolution to that Network"
Paul Jensen   authored and   Android (Google) Code Review   commited 2014-05-28 18:26:29 +00:00
1ff0fad207
DO NOT MERGE - Support disconnecting while trying to connect.
Currently, once a NetworkAgent has decided to connect, there's
no way to disconnect without first connecting and having
ConnectivityService tear down the connection. This is suboptimal
because it causes the transport to keep retrying even if it knows
that it will not be able to connect.

Instead, allow the transport to abort a connection request that's
in progress, as long as the agent is not yet registered with
ConnectivityService.

Also add locking to evalScores. evalScores should already have
been taking a lock, because it accesses member variables that are
also accessed by the send*methods.

Bug: 15295359
Change-Id: I913c341bdfc50be9c23b632399f53168e754c1c0
(cherry picked from commit 081e99c3ac341734467b65458f94adc160f50d6c)

Lorenzo Colitti   commited 2014-05-28 09:29:07 +00:00
a2db7676f3
Merge "Support disconnecting while trying to connect."
Lorenzo Colitti   authored and   Android (Google) Code Review   commited 2014-05-28 07:40:50 +00:00
0741b352db
Support disconnecting while trying to connect.
Currently, once a NetworkAgent has decided to connect, there's
no way to disconnect without first connecting and having
ConnectivityService tear down the connection. This is suboptimal
because it causes the transport to keep retrying even if it knows
that it will not be able to connect.

Instead, allow the transport to abort a connection request that's
in progress, as long as the agent is not yet registered with
ConnectivityService.

Also add locking to evalScores. evalScores should already have
been taking a lock, because it accesses member variables that are
also accessed by the send*methods.

Bug: 15295359
Change-Id: I913c341bdfc50be9c23b632399f53168e754c1c0

Lorenzo Colitti   commited 2014-05-28 07:35:24 +00:00
007e2c2453
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

Dave Langemak   authored and   Android Git Automerger   commited 2014-05-27 22:24:21 +00:00
b5b3d88c3e
Move dis/enable of mobile data to Telephony
ConnectivityService doesn't do this anymore.

bug:15077247
Change-Id: I3208c91b2c0369b594987f39ca29da7478435513
(cherry picked from commit 53013c87496980b534e447e717a32698fbd4bca0)

Robert Greenwalt   authored and   Dave Langemak   commited 2014-05-27 20:28:50 +00:00
3d6c958af4
Rewrite startUsingNetworkFeature for new API
bug:14993207
Change-Id: I041a80faa07bf3094af13a6c606f3b15aa03f789

Robert Greenwalt   commited 2014-05-27 13:24:14 -07:00
2000cddea0
Adjust Network's SocketFactory to restrict host name resolution to that Network
Change-Id: Iab9a5a2e060fe261f4be9ba974c1a55fb6b9c98b

Paul Jensen   commited 2014-05-27 10:49:34 -04:00
486d6ac868
am deca2a04: (-s ours) Merge "(DO NOT MERGE) Battery monitoring fixes:" into lmp-preview-dev
* commit 'deca2a041d13846158b0db92781b352ab473d9bc':
  (DO NOT MERGE) Battery monitoring fixes:

Dianne Hackborn   authored and   Android Git Automerger   commited 2014-05-23 00:11:11 +00:00
f1f6fc8a09
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.
  ...

The Android Automerger   authored and   Android Git Automerger   commited 2014-05-23 00:11:04 +00:00
72027d9ad7
(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
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