Commit graph

13,045 commits

Message SHA1
merge in master-release history after reset to 7894185dc074b00bf4f475d0aaf4506f43129dfc
The Android Automerger   commited 2014-06-14 05:50:39 -07:00
2c280d2f07
Assert that RT_SCOPE_* and IFA_F_* are not zero.
If these constants are zero (or, rather, if they're not all
different), the test will fail with more cryptic error messages
whose cause is not obvious. Clearly check for that here.

Bug: 15602893
Change-Id: I7ca4a9c5e3d592fd93fbfa1b50666a1861a0031d

Lorenzo Colitti   commited 2014-06-13 17:20:20 +09:00
f3e0e306e9
merge in master-release history after reset to deccc2c40cd70252372a8e01b9321576d81c719f
The Android Automerger   commited 2014-06-12 05:50:29 -07:00
77f2285599
Merge "Fix build"
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2014-06-12 05:34:42 +00:00
bd9859f10f
Fix build
Re-finalizing some classes.  The api/current.txt was updated separately but the change
that made them final got skipped.  Also had same issue for some @hide's that were removed.

Change-Id: I423bb7b3029ee03425a3c446bda51ab8191887c1

Robert Greenwalt   commited 2014-06-12 16:24:38 -07:00
cccf73a23c
am 2d0ab42b: Merge "Apply API Council comments to ConnectivityManager" into lmp-preview-dev
* commit '2d0ab42b1420db884d26fd2ef22710b5a887e9a6':
  Apply API Council comments to ConnectivityManager

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-06-12 22:31:07 +00:00
5c6dd08386
Apply API Council comments to ConnectivityManager
rename isNetworkActive -> isDefaultNetworkActive
rename registerNetworkActiveListener -> registerDefaultNetworkActiveListener
make listenForNetwork/requestNetwork take a NetworkRequest
rename NetworkCallbackListener -> NetworkCallback
rename listenForNetwork -> registerNetworkCallback
rename releaseNetworkRequest -> unregisterNetworkCallback
remove NetworkRequest param from NetworkCallback functions
rename onNetworkCapabilitiesChagned to onCapabilitiesChanged
remove onReleased
change time units in onLosing from Sec -> ms

bug: 15142362
Change-Id: Ibc96e3f461706efe1eafa0d85605249cfd6e9fdd

Robert Greenwalt   commited 2014-06-11 23:17:46 -07:00
09e5cff484
Fix Build
Change-Id: Iebbce8eaf21b3d2ba01ec720812d38018b13529e

Robert Greenwalt   commited 2014-06-11 18:36:36 -07:00
a4c6a8502e
Fix build breakage.
Change-Id: Ideb32704ce5dc37ef36b05609f88da2aa55b3a00

Robert Greenwalt   commited 2014-06-11 18:06:55 -07:00
4caa88119c
Fix wifi connectivity issues.
http://ag/480881 changed RouteInfo.getDestination() to return an IpPrefix
instead of a LinkAddress. This makes the equals() comparison always fail.

So, when ConnectivityService.updateRoutes() is given identical routes, instead
of realizing that there's no diff, it would consider them different, and thus
add and remove the same route. The add would fail, since the route already
existed in netd, but the remove would succeed, leaving the system with no routes
and thus no connectivity.

Bug: 15564210
Change-Id: I2003b0fcb809cc20837dc489c58af37891ca4556

Sreeram Ramachandran   authored and   The Android Automerger   commited 2014-06-11 17:08:14 -07:00
a33537aba0
Fix wifi connectivity issues.
http://ag/480881 changed RouteInfo.getDestination() to return an IpPrefix
instead of a LinkAddress. This makes the equals() comparison always fail.

So, when ConnectivityService.updateRoutes() is given identical routes, instead
of realizing that there's no diff, it would consider them different, and thus
add and remove the same route. The add would fail, since the route already
existed in netd, but the remove would succeed, leaving the system with no routes
and thus no connectivity.

Bug: 15564210
Change-Id: I2003b0fcb809cc20837dc489c58af37891ca4556

Sreeram Ramachandran   commited 2014-06-11 15:56:51 -07:00
78ed25af23
Merge "Make IpPrefix final."
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2014-06-11 21:23:31 +00:00
5f6393253c
am f7c964fa: Merge "Fix Build" into lmp-preview-dev
* commit 'f7c964fa06257d6db1b894bfbe905ca125c755c8':
  Fix Build

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-06-12 19:57:23 +00:00
974fbd73ba
Make IpPrefix final.
Couldn't resolve a merge conflict, so skipped and make the change this way.

Change-Id: Ib043f660fca2090f0d12a5a707e5e1ad28f76adb

Robert Greenwalt   commited 2014-06-12 12:57:19 -07:00
60ab3657af
am 9c6d406e: Fix build breakage.
* commit '9c6d406eb7ab0fce40fb7cd1257714a29d06774c':
  Fix build breakage.

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-06-12 19:57:11 +00:00
6f373a008b
am c7d65d75: Merge "Fix wifi connectivity issues." into lmp-preview-dev
* commit 'c7d65d759be6cd48a7bbaa4f061b4c4f85424b11':
  Fix wifi connectivity issues.

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-06-12 19:56:55 +00:00
e11adb7464
am e1f5b5e0: Merge "Minor changes to the LinkAddress API docs." into lmp-preview-dev
* commit 'e1f5b5e0cd5206e01e1c0e2bd282d421d9951960':
  Minor changes to the LinkAddress API docs.

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-06-12 19:56:45 +00:00
cf9fce817d
am 4ad1f0d3: (-s ours) Merge "Add a new IpPrefix class and use it in RouteInfo." into lmp-preview-dev
* commit '4ad1f0d31e4c998aa65344ccb8abb51cf96dd909':
  Add a new IpPrefix class and use it in RouteInfo.

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-06-12 19:56:39 +00:00
76386ba02e
am 558aeb90: Merge "Make NetworkCapabilities publicly immutable." into lmp-preview-dev
* commit '558aeb901144fac460575402e38fc8baa2da83eb':
  Make NetworkCapabilities publicly immutable.

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-06-12 18:49:07 +00:00
5c716c26d6
am fe5ca964: (-s ours) Merge "Fix public API of LinkProperties." into lmp-preview-dev
* commit 'fe5ca9646f86e041ed7729ecd0a006428806acf2':
  Fix public API of LinkProperties.

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-06-12 16:53:43 +00:00
ce639b70ab
Make NetworkCapabilities publicly immutable.
Applying API council comments.

bug: 15142362

(cherry picked from commit Ie0bde68b72656a676d90c0343b9756fe9268d8d6)
Change-Id: Ie0bde68b72656a676d90c0343b9756fe9268d8d6

Robert Greenwalt   commited 2014-06-11 23:29:39 +00:00
c34f83b969
Merge "Add a new IpPrefix class and use it in RouteInfo." into lmp-preview-dev
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2014-06-11 23:10:23 +00:00
f9cc46c65c
Add a new IpPrefix class and use it in RouteInfo.
This change uses IpPrefix only in the public API and continues
to use LinkAddress for everything else. It does not change the
callers to use the new APIs, with the exception of changing
all current uses of getDestination to getDestinationLinkAddress
to make room for the new getDestination method that returns an
IpPrefix.

Based on Sreeram's earlier change:
https://googleplex-android-review.git.corp.google.com/#/c/477874/
but a bit simplified and with a bit more documentation.

Bug: 15142362
Bug: 13885501
Change-Id: Ib4cd96b22cbff4ea31bb26a7853989f50da8de4e
(cherry picked from commit 7d3b4b9a3d4de9673119632da0ebd583e50126f7)

Sreeram Ramachandran   authored and   Robert Greenwalt   commited 2014-06-11 16:32:21 -07:00
e25318b66d
Merge "Fix wifi connectivity issues." into lmp-preview-dev
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2014-06-11 21:23:31 +00:00
9b780b84ee
Fix wifi connectivity issues.
http://ag/480881 changed RouteInfo.getDestination() to return an IpPrefix
instead of a LinkAddress. This makes the equals() comparison always fail.

So, when ConnectivityService.updateRoutes() is given identical routes, instead
of realizing that there's no diff, it would consider them different, and thus
add and remove the same route. The add would fail, since the route already
existed in netd, but the remove would succeed, leaving the system with no routes
and thus no connectivity.

Bug: 15564210
Change-Id: I2003b0fcb809cc20837dc489c58af37891ca4556

Sreeram Ramachandran   authored and   Robert Greenwalt   commited 2014-06-11 23:02:59 +00:00
ef041cf5e3
am bcf103d0: Merge "Apply API review to android.net.Network:" into lmp-preview-dev
* commit 'bcf103d0ef929669268a76aa72bd90ed9af4d63d':
  Apply API review to android.net.Network:

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-06-11 17:03:04 +00:00
0134277a2e
merge in master-release history after reset to ad76fbc908b5f8f77ed3c80ce03f382f41f70bc6
The Android Automerger   commited 2014-06-11 05:50:14 -07:00
14e25ee809
Apply API review to android.net.Network:
- socketFactory() renamed to getSocketFactory()
- Make sure bindProcess() documentation points developers to getSocketFactory() as the preferred approach
- Move bindProcess() and unbindProcess() to ConnectivityManager.setProcessBoundNetwork() -- passing null clears it.
- Move getProcessBoundNetwork() to ConnectivityManager.getProcessBoundNetwork().

Bug:15142362
Bug:13885501

Change-Id: Ia55c59d52e1ec8bf10dd0d9d037bd04c0998bc71
(cherry picked from commit 5ca1e6675bf4182b6e9ca76a7696bf2e38e96c4f)

Paul Jensen   authored and   Robert Greenwalt   commited 2014-06-10 22:26:11 +00:00
68bb06d966
Merge "Fix public API of LinkProperties." into lmp-preview-dev
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2014-06-10 22:18:15 +00:00
2318dc49cd
Fix public API of LinkProperties.
bug:15142362
(cherry picked from commit 51d898fd0223a4b7c728980ab987dd985c02df5f)
Change-Id: I1457111da7d3bd09998f7e010febb8bb4c45c8bc

Robert Greenwalt   commited 2014-06-10 15:42:19 -07:00
d23b496282
Merge "Minor changes to the LinkAddress API docs." into lmp-preview-dev
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2014-06-10 22:12:51 +00:00
1b9edb4498
Minor changes to the LinkAddress API docs.
1. Rename getNetworkPrefixLength to getPrefixLength. Update all
   callers in frameworks/base and add a shim method and a TODO
   for the rest.
2. @hide isSameAddressAs. It doesn't add much, and it's just
   one-liner that callers can implement if they want.
3. Fix the alignment of the initial paragraph (<ul> should have
   been </ul>).
4. Remove the documentation that talks about creating
   LinkAddresses, since there's no public API for creating them.

With these changes I think LinkAddress is fine as a public API.

Bug: 15142362
Change-Id: Iaf3b1db577745bb68a9e1dd7f96d666dd3f3ec7c
(cherry picked from commit 9ab53650cfcd91a2a151b44b3fd1381841f76269)

Lorenzo Colitti   authored and   Robert Greenwalt   commited 2014-06-11 18:52:19 +00:00
12d3200cbb
Minor changes to the LinkAddress API docs.
1. Rename getNetworkPrefixLength to getPrefixLength. Update all
   callers in frameworks/base and add a shim method and a TODO
   for the rest.
2. @hide isSameAddressAs. It doesn't add much, and it's just
   one-liner that callers can implement if they want.
3. Fix the alignment of the initial paragraph (<ul> should have
   been </ul>).
4. Remove the documentation that talks about creating
   LinkAddresses, since there's no public API for creating them.

With these changes I think LinkAddress is fine as a public API.

Bug: 15142362
Change-Id: Iaf3b1db577745bb68a9e1dd7f96d666dd3f3ec7c

Lorenzo Colitti   authored and   Robert Greenwalt   commited 2014-06-10 14:46:39 -07:00
48a7da0258
Add a new IpPrefix class and use it in RouteInfo.
This change uses IpPrefix only in the public API and continues
to use LinkAddress for everything else. It does not change the
callers to use the new APIs, with the exception of changing
all current uses of getDestination to getDestinationLinkAddress
to make room for the new getDestination method that returns an
IpPrefix.

Based on Sreeram's earlier change:
https://googleplex-android-review.git.corp.google.com/#/c/477874/
but a bit simplified and with a bit more documentation.

Bug: 15142362
Bug: 13885501
Change-Id: Ib4cd96b22cbff4ea31bb26a7853989f50da8de4e

Sreeram Ramachandran   authored and   Robert Greenwalt   commited 2014-06-10 14:30:15 -07:00
8162a5ef8b
resolved conflicts for merge of 253b06e6 to master
Change-Id: I65585939a57c561064d370be131c0197de0f08c3

Amit Mahajan   commited 2014-06-10 10:47:26 -07:00
d032de432e
merge in master-release history after reset to 2a87865c5c40d50d229971c0ac845dcbaad54514
The Android Automerger   commited 2014-06-10 06:03:23 -07:00
87bef3b0f4
Merge "remember and report network score"
vandwalle   authored and   Android (Google) Code Review   commited 2014-06-09 22:30:26 +00:00
e472bf0970
remember and report network score
Change-Id: Iccb2ec603bc9c0d3cf1976d0cc3f343cb1096494

vandwalle   commited 2014-06-09 14:50:47 -07:00
170e6d10e5
am c5a19650: am e5a28d34: am 01d0e324: Handle provisioning APN by turning off/on radio.
* commit 'c5a1965052':
  Handle provisioning APN by turning off/on radio.

Amit Mahajan   authored and   Android Git Automerger   commited 2014-06-09 21:12:43 +00:00
253b06e6d1
am e5a28d34: am 01d0e324: Handle provisioning APN by turning off/on radio.
* commit 'e5a28d34f662c469f85590dda28fc02eca12204b':
  Handle provisioning APN by turning off/on radio.

Amit Mahajan   authored and   Android Git Automerger   commited 2014-06-09 19:50:09 +00:00
c5a1965052
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

Amit Mahajan   authored and   John Huang   commited 2014-06-09 17:55:27 +00:00
01d0e324fb
merge in master-release history after reset to 9bb0886590789fb87c6ddc841016b185eee597a0
The Android Automerger   commited 2014-06-09 05:49:46 -07:00
ebce265b36
Merge "Apply API review to android.net.Network:"
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2014-06-08 23:41:27 +00:00
c9104d4795
Fix public API of LinkProperties.
bug:15142362
Change-Id: I1457111da7d3bd09998f7e010febb8bb4c45c8bc

Robert Greenwalt   commited 2014-06-08 12:54:23 -07:00
bbcebb79ae
Apply API review to android.net.Network:
- socketFactory() renamed to getSocketFactory()
- Make sure bindProcess() documentation points developers to getSocketFactory() as the preferred approach
- Move bindProcess() and unbindProcess() to ConnectivityManager.setProcessBoundNetwork() -- passing null clears it.
- Move getProcessBoundNetwork() to ConnectivityManager.getProcessBoundNetwork().

Bug:15142362
Bug:13885501

Change-Id: Ia55c59d52e1ec8bf10dd0d9d037bd04c0998bc71

Paul Jensen   authored and   Robert Greenwalt   commited 2014-06-08 12:09:18 -07:00
e98c6e0a33
Fix the marking of restricted network requests
Need to realized that the NOT_RESTRICTED bit is set by
default, so if looking at what bits are set to decide if
we want NOT_RESTRICTED cleared, we need to ignore the
bit itself.

bug:15456019

Change-Id: Iecae598f47ec7306d475e2262bb1c452ddf0fc75

Robert Greenwalt   commited 2014-06-05 23:59:48 +00:00
505660a316
merge in master-release history after reset to bd9384f0ab73344b180ecff6e19be780938c9856
The Android Automerger   commited 2014-06-05 05:50:51 -07:00
647d49de87
am d060ac14: (-s ours) Merge "DO NOT MERGE Report new network scores back to factories." into lmp-preview-dev
* commit 'd060ac1433cec943e915b026cb5c76bd6615538e':
  DO NOT MERGE Report new network scores back to factories.

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-06-04 21:32:34 +00:00
625a4a4fb7
am 02006632: Merge "Call a network restricted only if all capabilities are restricted" into lmp-preview-dev
* commit '02006632ef34d70e196a47a3b11ff344005acbb1':
  Call a network restricted only if all capabilities are restricted

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-06-04 20:52:50 +00:00
726f87a89e
DO NOT MERGE 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
(cherry picked from commit 94a5c61cb82401dd777d0a7ac43183d92d955323)

Robert Greenwalt   commited 2014-06-04 19:15:17 +00:00
6f2d1fbc95