Commit graph

13,045 commits

Message SHA1
Merge "Push firewall rules up to ConnectivityService." into mnc-dr-dev
Jeff Sharkey   authored and   Android (Google) Code Review   commited 2015-10-12 16:34:19 +00:00
22d9b51ce0
Merge "Log UID and PID of legacy route requests."
Lorenzo Colitti   authored and   Android (Google) Code Review   commited 2015-10-09 06:35:51 +00:00
cc97c425a5
Log UID and PID of legacy route requests.
Bug: 23801105
Change-Id: I1722af0424f5b9bbd7276b77ce1571842fa541b3

Lorenzo Colitti   commited 2015-10-09 13:08:34 +09:00
ce3a70be65
Add a null check to hasIPv4AddressOnInterface.
Change-Id: Ie38505ec0a93f4060348d92db341c536b7d60ed0

Lorenzo Colitti   commited 2015-10-09 12:36:30 +09:00
319789dbf4
Fixed VPN support for restricted profiles in split system user model
In a new split system user model, owner of a restricted profile is not limited
to just user0. restrictedProfileParentId field should be used to get an owner.

Bug: 22950929
Change-Id: I928319a9450e543972237a42267eb2404e117c83

Fyodor Kupolov   commited 2015-09-28 16:44:04 -07:00
188d3bda6e
am 26c330a4: am ccffea7a: resolved conflicts for a884d81e to stage-aosp-master
* commit '26c330a424':
  constify JNINativeMethod function pointer tables

Elliott Hughes   authored and   Android Git Automerger   commited 2015-09-24 17:23:00 +00:00
998a1baa9c
am ccffea7a: resolved conflicts for a884d81e to stage-aosp-master
* commit 'ccffea7a3d':
  constify JNINativeMethod function pointer tables

Elliott Hughes   authored and   Android Git Automerger   commited 2015-09-24 17:14:10 +00:00
26c330a424
resolved conflicts for a884d81e to stage-aosp-master
Change-Id: Ice485967fa96f13786024b6939b826638e906ff0

Elliott Hughes   commited 2015-09-24 10:01:32 -07:00
ccffea7a3d
am 6ae227e2: am a2e47e2f: am d737f715: am 7724cffc: am 06cf7c44: am 4e0d6dbd: am 4cbfe331: am 46a36218: am 5eff98f8: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev
* commit '6ae227e27fcab0a454ac45b897843bfceaa09c69':
  Don't mark NetworkRequests restricted when they don't have restricted caps

Paul Jensen   authored and   Android Git Automerger   commited 2015-09-23 19:52:00 +00:00
0467b8e637
am f86347f5: am 88674941: am 6a728e17: am 477302fe: am d2af51fa: am bfff9435: (-s ours) am 10a7d744: am 21087892: am 334c6e9a: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
* commit 'f86347f54d0da443172713db0f6fc145ca5b19ff':
  Fix NOT_RESTRICTED network capability and enforce it.

Paul Jensen   authored and   Android Git Automerger   commited 2015-09-23 19:51:53 +00:00
2c0264e5c5
am 7724cffc: am 06cf7c44: am 4e0d6dbd: am 4cbfe331: am 46a36218: am 5eff98f8: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev
* commit '7724cffc30':
  Don't mark NetworkRequests restricted when they don't have restricted caps

Paul Jensen   authored and   Android Git Automerger   commited 2015-09-23 14:57:59 +00:00
78266a6d4a
am 477302fe: am d2af51fa: am bfff9435: (-s ours) am 10a7d744: am 21087892: am 334c6e9a: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
* commit '477302fede':
  Fix NOT_RESTRICTED network capability and enforce it.

Paul Jensen   authored and   Android Git Automerger   commited 2015-09-23 14:57:53 +00:00
34ab693fb0
am 06cf7c44: am 4e0d6dbd: am 4cbfe331: am 46a36218: am 5eff98f8: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev
* commit '06cf7c44af':
  Don't mark NetworkRequests restricted when they don't have restricted caps

Paul Jensen   authored and   Android Git Automerger   commited 2015-09-23 14:50:45 +00:00
7724cffc30
am d2af51fa: am bfff9435: (-s ours) am 10a7d744: am 21087892: am 334c6e9a: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
* commit 'd2af51fabf':
  Fix NOT_RESTRICTED network capability and enforce it.

Paul Jensen   authored and   Android Git Automerger   commited 2015-09-23 14:50:40 +00:00
477302fede
am 4e0d6dbd: am 4cbfe331: am 46a36218: am 5eff98f8: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev
* commit '4e0d6dbdb4':
  Don't mark NetworkRequests restricted when they don't have restricted caps

Paul Jensen   authored and   Android Git Automerger   commited 2015-09-23 14:42:02 +00:00
06cf7c44af
am bfff9435: (-s ours) am 10a7d744: am 21087892: am 334c6e9a: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
* commit 'bfff94358e':
  Fix NOT_RESTRICTED network capability and enforce it.

Paul Jensen   authored and   Android Git Automerger   commited 2015-09-23 14:41:57 +00:00
d2af51fabf
am 4cbfe331: am 46a36218: am 5eff98f8: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev
* commit '4cbfe3316fd1105b697a9838ef7bafaebf5080a2':
  Don't mark NetworkRequests restricted when they don't have restricted caps

Paul Jensen   authored and   Android Git Automerger   commited 2015-09-23 11:33:18 +00:00
4e0d6dbdb4
am 10a7d744: am 21087892: am 334c6e9a: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
* commit '10a7d7449dae2aabf4f22f980e7efabf274a939a':
  Fix NOT_RESTRICTED network capability and enforce it.

Paul Jensen   authored and   Android Git Automerger   commited 2015-09-23 11:33:13 +00:00
bfff94358e
am 5eff98f8: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev
* commit '5eff98f8f6':
  Don't mark NetworkRequests restricted when they don't have restricted caps

Paul Jensen   authored and   Android Git Automerger   commited 2015-09-23 11:13:48 +00:00
46a3621883
am 334c6e9a: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
* commit '334c6e9a5d':
  Fix NOT_RESTRICTED network capability and enforce it.

Paul Jensen   authored and   Android Git Automerger   commited 2015-09-23 11:13:40 +00:00
21087892f8
am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev
* commit 'ece4ac2105d18d8d7b6296d6de3fdd5641c35258':
  Don't mark NetworkRequests restricted when they don't have restricted caps

Paul Jensen   authored and   Android Git Automerger   commited 2015-09-23 11:06:32 +00:00
5eff98f8f6
am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
* commit 'a9e98343146244b71e236d82c95a8d0fa30a41c1':
  Fix NOT_RESTRICTED network capability and enforce it.

Paul Jensen   authored and   Android Git Automerger   commited 2015-09-23 11:06:27 +00:00
334c6e9a5d
Hotspot 2.0 relase 2 first cut.
CP mods to take a URL as a parameter, and new ScanInfo object.

Change-Id: Idbb2d4751c575ba07a56942771e2b2955b624635

Jan Nordqvist   commited 2015-09-22 17:24:22 -07:00
0f3b4449b0
constify JNINativeMethod function pointer tables
Change-Id: I4036c924958221cbc644724f8eb01c5de3cd7954

Daniel Micay   commited 2015-09-22 17:10:35 -04:00
6d5e7fa0c5
Unbreak build, bring ConnectivityService in sync with mnc-dr-dev
The version of ConnectivityService.java in mnc-vt-dev doesn't
compile due to the presence of two similar-but-not-identical code
blocks in handleRegisterNetworkAgent. The history here is a
a little convoluted - this code was originally merged into
mnc-vt-dev, then cherry-picked into dr-dev, and from there
automerged into mnc-vt-dev, causing conflicts. This latest
breakage is likely due to the automerged not detecting a conflict
because the code block was subtly different.

Attempt to fix this once and for all by making the mnc-vt-dev
version of the file identical to the mnc-dr-dev version.

Change-Id: I270739b0be6f6358045700494a1b0f25f0b365a3

Lorenzo Colitti   commited 2015-09-16 11:00:47 +09:00
6288ea38c8
am ff6f0769: am 5bc891c8: am 774adb03: am 7198c0aa: Merge "Framework fixes for RSSI offload." into mnc-dr-dev
* commit 'ff6f0769790d85b352d72e10e12ec51fba5892dc':
  Framework fixes for RSSI offload.

Lorenzo Colitti   authored and   Android Git Automerger   commited 2015-09-16 01:24:12 +00:00
f102ddedcb
am 7198c0aa: Merge "Framework fixes for RSSI offload." into mnc-dr-dev
* commit '7198c0aa4ccbeaecf2606006d3a6ace684f805fe':
  Framework fixes for RSSI offload.

Lorenzo Colitti   authored and   Android Git Automerger   commited 2015-09-16 01:01:12 +00:00
2e8f85c466
Framework fixes for RSSI offload.
1. When registering a NetworkCallback, only update RSSI
   thresholds if the request specifies a signal strength.
2. When releasing a NetworkCallback, only update RSSI
   thresholds if the request specified a signal strength.
3. Add logging.

Add logging.
Bug: 21405941
Bug: 23679346
Bug: 23815756
Change-Id: I4bc42d0ab02285a7a9d14e09f8a1cd868f4d9d7f

Lorenzo Colitti   commited 2015-09-15 16:00:39 +09:00
71ec67ddf7
am 7abed540: am 3bb69fac: am 1d121b78: am e1e97377: Merge "NetworkDiagnostics: ping default router from all global addreses." into mnc-dr-dev
* commit '7abed5409632d54d973acb7b170c456289141cb9':
  NetworkDiagnostics: ping default router from all global addreses.

Lorenzo Colitti   authored and   Android Git Automerger   commited 2015-09-15 03:14:56 +00:00
173514f832
am e1e97377: Merge "NetworkDiagnostics: ping default router from all global addreses." into mnc-dr-dev
* commit 'e1e97377d04ab6e5d069c85aba4226f47371e7c6':
  NetworkDiagnostics: ping default router from all global addreses.

Lorenzo Colitti   authored and   Android Git Automerger   commited 2015-09-15 02:46:51 +00:00
f114a91d16
Push firewall rules up to ConnectivityService.
getActiveNetworkInfo() and friends already know how to augment their
results to help apps detect when network access is blocked.  This
change wires up the new app-idle and device-idle firewall rules to
be reported through these APIs.

This also causes other platform tools like DownloadManager and
SyncManager to respect these new policies.

Bug: 24050462
Change-Id: Id9517b0b70be7e3ca2ab27bed8049db916e4d829

Jeff Sharkey   commited 2015-09-14 15:49:36 -07:00
baefe062f7
NetworkDiagnostics: ping default router from all global addreses.
This will hopefully allow us to determine if the router does not
have our global addresses in its neighbour cache.

Bug: 23661687
Change-Id: I46734c3c719003939cfccf038457ec309a9ff967

Lorenzo Colitti   commited 2015-09-10 15:49:54 +09:00
db30ceba87
am fd183706: am 22262f31: am 0bc35668: am 017223ac: Merge changes from topic \'packet-keepalive-fixes\' into mnc-dr-dev
* commit 'fd18370675f8794807747a18276dd7385e25f06e':
  Require the new PACKET_KEEPALIVE_OFFLOAD permission.
  Add an error code for generic hardware error.
  Fix bugs and crashes in PacketKeepalive API.
  Add tests for the PacketKeepalive API.
  Add a PACKET_KEEPALIVE_OFFLOAD permission.
  Use a CountDownLatch instead of sleep() in NetworkFactory tests.
  Get rid of shortSleep() in ConnectivityServiceTest.
  Make ConnectivityServiceTest a bit more readable.

Lorenzo Colitti   authored and   Android Git Automerger   commited 2015-09-09 01:04:38 +00:00
2a575ae5cc
am 017223ac: Merge changes from topic \'packet-keepalive-fixes\' into mnc-dr-dev
* commit '017223acda5bfe16cb87d0a33d72dd28d2fccd3b':
  Require the new PACKET_KEEPALIVE_OFFLOAD permission.
  Add an error code for generic hardware error.
  Fix bugs and crashes in PacketKeepalive API.
  Add tests for the PacketKeepalive API.
  Add a PACKET_KEEPALIVE_OFFLOAD permission.
  Use a CountDownLatch instead of sleep() in NetworkFactory tests.
  Get rid of shortSleep() in ConnectivityServiceTest.
  Make ConnectivityServiceTest a bit more readable.

Lorenzo Colitti   authored and   Android Git Automerger   commited 2015-09-09 00:26:59 +00:00
22225900f2
Require the new PACKET_KEEPALIVE_OFFLOAD permission.
Bug: 23884210
Change-Id: I50a1a647a69deaba92e73021ee7d6cc0f3eb1eee

Lorenzo Colitti   commited 2015-09-09 00:16:57 +09:00
520287e881
Add an error code for generic hardware error.
This is necessary because currently the wifi code just returns
whatever hardware-specific integer it gets back from the HAL,
which is bad because that will be interpreted by the caller as
one of the error codes defined in this class.

In parallel we'll also modify the wifi code to return this new
error code if the hardware returns an error.

Bug: 21405946
Change-Id: Ic9fa1193ced69a4e7ff543e397221c89b10a5a13

Lorenzo Colitti   commited 2015-09-09 00:16:57 +09:00
2aab71871c
Fix bugs and crashes in PacketKeepalive API.
Bug: 22606153
Bug: 23820819
Bug: 23884210
Change-Id: I1bf82094ec664baed345e9fb137fada0cbf4b7a0

Lorenzo Colitti   commited 2015-09-09 00:16:56 +09:00
f99389f155
Add tests for the PacketKeepalive API.
This currently fails in many different ways, but it tells us what
to fix.

Bug: 22606153
Bug: 23884210
Change-Id: If2e5ee0a8d7b26cad67d3d566ed5b1383e0db096

Lorenzo Colitti   commited 2015-09-09 00:16:56 +09:00
b793d607a5
Use a CountDownLatch instead of sleep() in NetworkFactory tests.
This makes testNetworkFactoryRequests 2-3 times faster.

Bug: 22606153
Change-Id: I9657b6929e77f23ec811d0ab57b2ba974f0b6a69

Lorenzo Colitti   commited 2015-09-08 16:41:47 +09:00
221dace9cc
Get rid of shortSleep() in ConnectivityServiceTest.
Instead, use IdleHandler to wait for things to become idle.

Bug: 22606153
Change-Id: Ic6ab93ad4d336b40962f9be1096629a44b63ee2f

Lorenzo Colitti   commited 2015-09-08 16:41:47 +09:00
1b8b5cdfad
Make ConnectivityServiceTest a bit more readable.
1. Make TestNetworkCallback a bit smarter and rename it to
   SingleUseNetworkCallback. This allows us to get rid of all the
   calls to TestNetworkCallback#getConditionVariable.
2. Delete the commented out code that used to test a
   ConnectivityService model that has not been used since KK.
3. Remove unused imports, etc.

Bug: 22606153
Change-Id: I81a2d0b970d19e5f4515490d8c2f88d416445fa1

Lorenzo Colitti   commited 2015-09-07 20:41:51 +09:00
5629741caa
am a59ee3ac: am 597c55b5: am e686d9b3: am 8e285f2f: Merge "Cut down some logs." into mnc-dr-dev
* commit 'a59ee3ac094d9d2a1c38852bc824d20f8166e28a':
  Cut down some logs.

Robert Greenwalt   authored and   Android Git Automerger   commited 2015-09-06 23:08:25 +00:00
5676ac99fe
am 8e285f2f: Merge "Cut down some logs." into mnc-dr-dev
* commit '8e285f2f74460b1b4bc9ba0faa3c94540f5ab92c':
  Cut down some logs.

Robert Greenwalt   authored and   Android Git Automerger   commited 2015-09-04 22:06:21 +00:00
668aadd73b
Cut down some logs.
bug:23623327
Change-Id: I737d4e6c384bf4da62c65ad2abe0c9b5dca0067a

Robert Greenwalt   commited 2015-09-03 17:53:42 -07:00
9b33077561
am 429b020e: am 280b4495: am 967c8816: am cfd45ae4: Merge "Add SUPL-specific network bcast" into mnc-dr-dev
* commit '429b020e615eebd244208373c2a3e81c59da36ec':
  Add SUPL-specific network bcast

Daniel Estrada Alva   authored and   Android Git Automerger   commited 2015-09-03 06:40:03 +00:00
9da67ad3da
am cfd45ae4: Merge "Add SUPL-specific network bcast" into mnc-dr-dev
* commit 'cfd45ae4718934d403a17410ab6a7c722bdd01fc':
  Add SUPL-specific network bcast

Daniel Estrada Alva   authored and   Android Git Automerger   commited 2015-09-02 21:12:13 +00:00
b2930ccb1c
Add SUPL-specific network bcast
Move SUPL CONNECTIVITY_ACTION bcasts to a different, hidden intent
to reduce the churn of apps when SUPL comes/goes.

Short term hack until SUPL moves to use the new APIs and there's
no bcast.

bug:23350688
Change-Id: I3dc14b42afa72465260aa41ccedfe1df27baabd9

Robert Greenwalt   commited 2015-09-01 15:06:04 -07:00
e577c8181d
am 76ba16e7: am e3bcde94: Merge "Reduce CONNECTIVITY_CHANGE bcasts" into mnc-dev
* commit '76ba16e7aa':
  Reduce CONNECTIVITY_CHANGE bcasts

Robert Greenwalt   authored and   Android Git Automerger   commited 2015-08-28 22:34:16 +00:00
3cd5396b24
am 8096be27: am fbb28f55: am 77d02900: am 76ba16e7: am e3bcde94: Merge "Reduce CONNECTIVITY_CHANGE bcasts" into mnc-dev
* commit '8096be27323b26ae177255381366823c8448e3c5':
  Reduce CONNECTIVITY_CHANGE bcasts

Robert Greenwalt   authored and   Android Git Automerger   commited 2015-08-28 22:16:02 +00:00
f4b0a6c938
am e3bcde94: Merge "Reduce CONNECTIVITY_CHANGE bcasts" into mnc-dev
* commit 'e3bcde94caf8440d5e3958a340b3d276d03f7691':
  Reduce CONNECTIVITY_CHANGE bcasts

Robert Greenwalt   authored and   Android Git Automerger   commited 2015-08-28 21:36:39 +00:00
76ba16e7aa