Commit Graph

4009 Commits

Author SHA1 Message Date
Hugo Benichi
a01fec3bae Merge "Add convenience methods to IpPrefix and LinkAddress" into oc-mr1-dev
am: 62b1b7f944  -s ours

Change-Id: I5daa3f79df2a6f70e2f2867f255ddcf4770f00f0
2017-08-17 22:38:34 +00:00
Hugo Benichi
62b1b7f944 Merge "Add convenience methods to IpPrefix and LinkAddress" into oc-mr1-dev 2017-08-17 22:31:59 +00:00
Charles He
e0009f9145 Merge "Opt-out for always-on VPN: rename API." into oc-mr1-dev
am: 8b2513e439

Change-Id: Ie511c6f1034b75b4e797dbc0ca31c7c5c30f336e
2017-08-17 08:01:53 +00:00
Hugo Benichi
7db2c4771c Add convenience methods to IpPrefix and LinkAddress
Also moving relevant test files into tests/net as part of runtest
framworks-net.

Also removes testHashCode in LinkAddress() because this test relies on
the assumption that hashCode() is stable across releases or jdk
versions, which is absolutely not true.

This creates maintenance work for little benefit since hashCode is
already tested as part of the equality test.

For instance this test is now broken because hashing for InetAddress
changed.

Bug: 62988545
Bug: 62918393
Test: runtest frameworks-net, added coverage in tests
Merged-In: I695bc3f0e801bf13bc4fc0706565758f12b775b4
Merged-In: I6d3f3c50eaec44e3a0787e849ab28e89f6f4a72d
Merged-In: Iddfec82a08f845e728adadfa6ec58a60a078d6af
Merged-In: I8d6dd5efd226a8b1c4b05d1e1102362b58e094a1
Merged-In: Ied0cc53ac34c7c5f5539507b1979cbf9c215262e
Merged-In: I3b2b7dcb1a9a194fc08643b27bbb5a0e84e01412

(cherry picked from commit 3054e10286)

Change-Id: I9a17094bfdc54b9dec671306618e132a4beb59fc
2017-08-17 11:03:24 +09:00
Hugo Benichi
1c12add10e Merge "Add convenience methods to IpPrefix and LinkAddress" am: 813f81f2f3 am: 27bdc7373a am: ac352b0eb0
am: 54ffa99f5b

Change-Id: Ied0cc53ac34c7c5f5539507b1979cbf9c215262e
2017-08-16 15:20:59 +00:00
Hugo Benichi
54ffa99f5b Merge "Add convenience methods to IpPrefix and LinkAddress" am: 813f81f2f3 am: 27bdc7373a
am: ac352b0eb0

Change-Id: I8d6dd5efd226a8b1c4b05d1e1102362b58e094a1
2017-08-16 15:09:12 +00:00
Hugo Benichi
ac352b0eb0 Merge "Add convenience methods to IpPrefix and LinkAddress" am: 813f81f2f3
am: 27bdc7373a

Change-Id: Iddfec82a08f845e728adadfa6ec58a60a078d6af
2017-08-16 14:56:51 +00:00
Hugo Benichi
27bdc7373a Merge "Add convenience methods to IpPrefix and LinkAddress"
am: 813f81f2f3

Change-Id: I6d3f3c50eaec44e3a0787e849ab28e89f6f4a72d
2017-08-16 14:49:27 +00:00
Treehugger Robot
813f81f2f3 Merge "Add convenience methods to IpPrefix and LinkAddress" 2017-08-16 14:38:29 +00:00
Hugo Benichi
3054e10286 Add convenience methods to IpPrefix and LinkAddress
Also moving relevant test files into tests/net as part of runtest
framworks-net.

Also removes testHashCode in LinkAddress() because this test relies on
the assumption that hashCode() is stable across releases or jdk
versions, which is absolutely not true.

This creates maintenance work for little benefit since hashCode is
already tested as part of the equality test.

For instance this test is now broken because hashing for InetAddress
changed.

Bug: 62988545
Bug: 62918393
Test: runtest frameworks-net, added coverage in tests
Change-Id: I695bc3f0e801bf13bc4fc0706565758f12b775b4
2017-08-16 21:42:21 +09:00
Hugo Benichi
6703a93808 Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities" am: b35719a057 am: c11d6eafe9 am: e3d15057af
am: 69853a322c

Change-Id: I7ee60daa9c4266e9b9179032815dd7267e06377f
2017-08-16 12:23:25 +00:00
Hugo Benichi
69853a322c Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities" am: b35719a057 am: c11d6eafe9
am: e3d15057af

Change-Id: I01e287b4df82a53a522566d33b3166f7801badca
2017-08-16 12:14:09 +00:00
Hugo Benichi
e3d15057af Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities" am: b35719a057
am: c11d6eafe9

Change-Id: Ied592bf6112574399a1e808da337004e1c35f244
2017-08-16 12:04:38 +00:00
Hugo Benichi
c11d6eafe9 Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities"
am: b35719a057

Change-Id: I0ab76de59e87c46a6961229399ff7200bce49838
2017-08-16 11:50:55 +00:00
Hugo Benichi
56a1054ab4 Allow NetworkAgent "immutable updates" to NetworkCapabilities
This patch loosens the validation checks when a NetworkAgent updates it
NetworkCapabilities: instead of checking that capabilities labeled as
"immutable" stay identical across updates, it is now accepted to change
immutable capabilities in a way that the new NetworkCapabilities
satisfies the old NetworkCapabilities.

This allows a NetworkAgent to update itself in order to match more
requests, but will still catch NetworkAgents that sends degradation
updates causing potentially requests to not match anymore.

Bug: 64125969
Test: runtest frameworks-net
Change-Id: I2a1b3f9c0be6415e40edc989d0c1b03b5631f7b1
2017-08-16 18:30:30 +09:00
Charles He
4bfaefeb95 Opt-out for always-on VPN: rename API.
Rename the opt-out flag in AndroidManifest to
SERVICE_META_DATA_SUPPORTS_ALWAYS_ON
as directed by the API Council.

Bug: 64331776
Bug: 36650087
Test: runtest --path java/com/android/server/connectivity/VpnTest.java
Change-Id: I24326fad7a89083a2409134640bda81ee0359d08
2017-08-15 15:52:39 +01:00
Hugo Benichi
638504f152 Merge "Fix flaky IpPrefixTest." am: 47ce6588f3 -s ours am: 44033e347d -s ours am: eace017214 -s ours
am: 0bb20bd56a  -s ours

Change-Id: I0d7ce75411072adb90c449d71c48b163c06ee290
2017-08-08 07:47:07 +00:00
Hugo Benichi
0bb20bd56a Merge "Fix flaky IpPrefixTest." am: 47ce6588f3 -s ours am: 44033e347d -s ours
am: eace017214  -s ours

Change-Id: I64b9214694132f874d5546b4ade1917524db50d7
2017-08-08 07:40:11 +00:00
Hugo Benichi
eace017214 Merge "Fix flaky IpPrefixTest." am: 47ce6588f3 -s ours
am: 44033e347d  -s ours

Change-Id: I216b50a8d0f51f2f731b17598b205a7b0ad65324
2017-08-08 07:34:42 +00:00
Hugo Benichi
44033e347d Merge "Fix flaky IpPrefixTest."
am: 47ce6588f3  -s ours

Change-Id: Iabc8a365a6c18c19754da7ddfcc0385eb5b0f768
2017-08-08 07:28:32 +00:00
Treehugger Robot
47ce6588f3 Merge "Fix flaky IpPrefixTest." 2017-08-08 07:16:48 +00:00
Hugo Benichi
207b757194 Fix flaky IpPrefixTest.
Test: IpPrefixTest passes
Bug: 32561414
Merged-In: Ib4bffe9d33a6d4f5c2bd97798073de0f66d77645

(cherry pick from commit b3ac7ab583)

Change-Id: Ibaf11aae9b13af868bebff820c9e7615b63c8eb2
2017-08-08 14:54:08 +09:00
Hugo Benichi
9072f43f0e Merge "Merge "NetworkCapabilities: fix describeImmutableDifferences" into oc-dr1-dev am: 1b3877a965 -s ours" into oc-dr1-dev-plus-aosp
am: 8047f7acad  -s ours

Change-Id: I5d3fe083ccbec5baa7f53beca4cb938312877a9e
2017-08-07 06:07:13 +00:00
Hugo Benichi
83267b1ec9 Merge "NetworkCapabilities: fix describeImmutableDifferences" into oc-dr1-dev am: 1b3877a965
am: da05c2351f  -s ours

Change-Id: I082ad1d8426245e26a1301c9b82d7e62cd3e4b33
2017-08-07 05:57:27 +00:00
Hugo Benichi
da05c2351f Merge "NetworkCapabilities: fix describeImmutableDifferences" into oc-dr1-dev
am: 1b3877a965

Change-Id: I50748aa0c9332787797f91265afccf82ceabf332
2017-08-07 05:49:25 +00:00
Hugo Benichi
fc34768542 Merge "NetworkCapabilities: fix describeImmutableDifferences" into oc-dr1-dev
am: 1b3877a965  -s ours

Change-Id: I42723162b29e8a8c966201e1b4da811e2d266f00
2017-08-07 05:49:17 +00:00
Hugo Benichi
9f1128a81a NetworkCapabilities: fix describeImmutableDifferences
This patch fixes the mask used in describeImmutableDifferences which did
not correctly turn NET_CAPABILITY_NOT_METERED into bit flag.

Bug: 63326103
Test: added unit tests, runtest frameworks-net
Merged-In: Ib6b390b1daef5912859302692af7dcd6cfd3e39a
Merged-In: If38efacdeec8476880835657938e435f9b598525
Merged-In: Ieccad46fcffcaf748f5644b04617e9a82527000e
Merged-In: I533ef8fe369cec19d283ff2950314fce6e28cffd
Merged-In: I12636c6699ff60487a28570208e819ea0b66fa2e
Merged-In: Ie5df14e0ea1c12e0cfabe87978ac6c9b744353b2

(cherry picked from commit 66bdf0aa16)

Change-Id: I74ecf34a2c079c74152d00caea2c220e9c6d1fa5
2017-08-05 11:37:10 +09:00
Hugo Benichi
d8284017db Merge "NetworkCapabilities: fix describeImmutableDifferences" am: 7575ec2240 am: ec11d07dc0 am: ad0a1b3c2b
am: ae6ff2ba0f

Change-Id: I12636c6699ff60487a28570208e819ea0b66fa2e
2017-08-05 01:28:01 +00:00
Hugo Benichi
ae6ff2ba0f Merge "NetworkCapabilities: fix describeImmutableDifferences" am: 7575ec2240 am: ec11d07dc0
am: ad0a1b3c2b

Change-Id: I533ef8fe369cec19d283ff2950314fce6e28cffd
2017-08-05 01:14:30 +00:00
Hugo Benichi
ad0a1b3c2b Merge "NetworkCapabilities: fix describeImmutableDifferences" am: 7575ec2240
am: ec11d07dc0

Change-Id: Ieccad46fcffcaf748f5644b04617e9a82527000e
2017-08-05 01:01:04 +00:00
Hugo Benichi
ec11d07dc0 Merge "NetworkCapabilities: fix describeImmutableDifferences"
am: 7575ec2240

Change-Id: If38efacdeec8476880835657938e435f9b598525
2017-08-05 00:54:43 +00:00
Hugo Benichi
66bdf0aa16 NetworkCapabilities: fix describeImmutableDifferences
This patch fixes the mask used in describeImmutableDifferences which did
not correctly turn NET_CAPABILITY_NOT_METERED into bit flag.

Bug: 63326103
Test: added unit tests, runtest frameworks-net
Change-Id: Ib6b390b1daef5912859302692af7dcd6cfd3e39a
2017-08-04 15:17:40 +09:00
Android Build Merger (Role)
24ea63f05a Merge changes from topic 'am-94906183e52945938953177851714b42' into oc-mr1-dev-plus-aosp
* changes:
  Merge changes I49a76582,Iac4b75bc into cw-f-dev am: f18599a15b am: 9295f58d26 am: 502986f72a am: 5223106231 am: 995d020232
  DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am: fb8db88bd4  -s ours am: c51fd37f55  -s ours am: 310a4c0cf8  -s ours am: 9c5fe9b188  -s ours am: 6c8dd34abb  -s ours
2017-08-01 15:29:55 +00:00
Hugo Benichi
ad38e4cd82 DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am: fb8db88bd4 -s ours am: c51fd37f55 -s ours am: 310a4c0cf8 -s ours am: 9c5fe9b188 -s ours
am: c8578b804b  -s ours

Change-Id: I9554a163f16bfb5030128d7184c06b6dae23dce5
2017-08-01 15:24:37 +00:00
Hugo Benichi
2db69e1789 DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am: fb8db88bd4 -s ours am: c51fd37f55 -s ours am: 310a4c0cf8 -s ours am: 9c5fe9b188 -s ours
am: 6c8dd34abb  -s ours

Change-Id: I95fed2b7514f5d27b1091fc2176ec3d7413b2747
2017-08-01 15:24:00 +00:00
Hugo Benichi
6d4da24a53 DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am: fb8db88bd4 -s ours am: c51fd37f55 -s ours am: 310a4c0cf8 -s ours am: a9fead7c8f -s ours
am: 9e5f004c8b  -s ours

Change-Id: Iecd2b076021a844f688f8221e204c22300ed1c93
2017-08-01 15:14:02 +00:00
Hugo Benichi
c8578b804b DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am: fb8db88bd4 -s ours am: c51fd37f55 -s ours am: 310a4c0cf8 -s ours
am: 9c5fe9b188  -s ours

Change-Id: Ie1a18b001d85450f6458f33b75b0f2f3965a81a9
2017-08-01 15:12:15 +00:00
Hugo Benichi
6c8dd34abb DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am: fb8db88bd4 -s ours am: c51fd37f55 -s ours am: 310a4c0cf8 -s ours
am: 9c5fe9b188  -s ours

Change-Id: I5b252535638054e87fb3cc6069d51a6c4da7dce0
2017-08-01 15:10:35 +00:00
Hugo Benichi
9e5f004c8b DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am: fb8db88bd4 -s ours am: c51fd37f55 -s ours am: 310a4c0cf8 -s ours
am: a9fead7c8f  -s ours

Change-Id: Idf2184eb808068366384031694c7fa89fe49c8bb
2017-08-01 15:03:31 +00:00
Hugo Benichi
9c5fe9b188 DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am: fb8db88bd4 -s ours am: c51fd37f55 -s ours
am: 310a4c0cf8  -s ours

Change-Id: Ia38655a26410e9ea78e394e5c59e052739f041a6
2017-08-01 14:55:26 +00:00
Hugo Benichi
a9fead7c8f DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am: fb8db88bd4 -s ours am: c51fd37f55 -s ours
am: 310a4c0cf8  -s ours

Change-Id: Idc2217a66f60caa783957fd6caeaafa1ff1615bc
2017-08-01 14:50:36 +00:00
Hugo Benichi
310a4c0cf8 DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am: fb8db88bd4 -s ours
am: c51fd37f55  -s ours

Change-Id: I6d788c5b7cd5c6877799e5a3e0ad865996147b70
2017-08-01 14:37:06 +00:00
Hugo Benichi
c51fd37f55 DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler
am: fb8db88bd4  -s ours

Change-Id: Ie54e0712dc83514ff3ddcd6cee1b0bd2e80c73ad
2017-08-01 14:30:02 +00:00
Hugo Benichi
a1111fdfa1 Merge "Logging improvements when NetworkCapabilities change" am: 935759cfff am: dc2b32d9a0 am: 88a572da7d -s ours
am: de31804d45  -s ours

Change-Id: Ia69626f61d00be9a6da3655111999f70423325c9
2017-07-31 02:13:17 +00:00
Hugo Benichi
de31804d45 Merge "Logging improvements when NetworkCapabilities change" am: 935759cfff am: dc2b32d9a0
am: 88a572da7d  -s ours

Change-Id: I5f6e3a2109236f30d0e09bde8a2c63b32e62f772
2017-07-31 02:07:12 +00:00
Hugo Benichi
dc2b32d9a0 Merge "Logging improvements when NetworkCapabilities change"
am: 935759cfff

Change-Id: I886e39db8969eb1ac1dfe06c6f448e53a90fd92c
2017-07-31 01:50:38 +00:00
Treehugger Robot
935759cfff Merge "Logging improvements when NetworkCapabilities change" 2017-07-31 01:38:29 +00:00
Hugo Benichi
1b62b12a72 Logging improvements when NetworkCapabilities change
This patch improves the wtf() logging in updateCapabilities to
better distinguish between the cases of a changed specifiers, changed
transports, or changed capabilities. The case of NOT_METERED being added
or removed is ignored.

Bug: 63326103
Test: runtest frameworks-net, runtest frameworks-wifi
Merged-In: I05c6e78891e1eac658f1cf883223af520a9a4f8f
Merged-In: I4f6cbc0adb461cef6610460daeba72ca38b8f10c
Merged-In: I165a8bbe8362100f1e2bb909459fb45b1c68d5ae
Merged-In: Iec6d92e9a3a12bab87c5adfaf17f776465077060
Merged-In: I633d6347a7f852c27c03fc96b36ca2a60f70c73c
Merged-In: I38739184fc0db105bfd3b4c02cce01e803739e5d
Merged-In: Ia58b877056e2442136cc8b145ac8f4e6560cfc2c

(cherry pick from commit 8c92888a2d)

Change-Id: Id32ca66068c8ff549627e8e8c0e50897ef928c58
2017-07-31 09:25:37 +09:00
Android Build Merger (Role)
48167c2661 Merge "Merge "Logging improvements when NetworkCapabilities change" into oc-dr1-dev am: 5c55f974bf am: 170cc51f45" into oc-mr1-dev-plus-aosp 2017-07-29 00:06:58 +00:00
Hugo Benichi
13df02f93c Merge "Logging improvements when NetworkCapabilities change" into oc-dr1-dev am: 5c55f974bf
am: 170cc51f45

Change-Id: I633d6347a7f852c27c03fc96b36ca2a60f70c73c
2017-07-29 00:03:33 +00:00