Charles He
f0dbb4aaa0
Merge "Unbreak VPN unit tests."
2017-08-16 19:05:49 +00:00
Hugo Benichi
1051ac1886
Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities" am: b35719a057 am: eea3a77efc am: 34ea4f9088 am: b77d06e971
...
am: 6ec484230b
2017-08-16 18:39:54 +00:00
Hugo Benichi
6ec484230b
Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities" am: b35719a057 am: eea3a77efc am: 34ea4f9088
...
am: b77d06e971
2017-08-16 12:23:25 +00:00
Charles He
5da89994b9
Unbreak VPN unit tests.
...
VpnTest was broken earlier due to a change to always-on VPN
notifications. This CL adds the corresponding mocks to the unit test to
fix it.
Bug: 36650087
Test: runtest frameworks-net
Change-Id: Icff57c7e927c135d75a7d70ff347a579c5d45134
2017-08-16 13:14:13 +01:00
Hugo Benichi
b77d06e971
Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities" am: b35719a057 am: eea3a77efc
...
am: 34ea4f9088
2017-08-16 12:14:09 +00:00
Hugo Benichi
34ea4f9088
Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities" am: b35719a057
...
am: eea3a77efc
2017-08-16 12:04:38 +00:00
Hugo Benichi
eea3a77efc
Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities"
...
am: b35719a057
Change-Id: I0ab76de59e87c46a6961229399ff7200bce49838
2017-08-16 11:50:55 +00:00
Hugo Benichi
1ebf219ed9
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
Hugo Benichi
4fe57ca65b
Merge "Fix flaky IpPrefixTest." am: 39a0b6b58e -s ours am: 9e59475003 -s ours am: 38e86ba9f4 -s ours am: deb9ca18aa -s ours
...
am: d988c1500b
2017-08-08 07:53:49 +00:00
Hugo Benichi
d988c1500b
Merge "Fix flaky IpPrefixTest." am: 39a0b6b58e -s ours am: 9e59475003 -s ours am: 38e86ba9f4 -s ours
...
am: deb9ca18aa
2017-08-08 07:47:07 +00:00
Hugo Benichi
deb9ca18aa
Merge "Fix flaky IpPrefixTest." am: 39a0b6b58e -s ours am: 9e59475003 -s ours
...
am: 38e86ba9f4
2017-08-08 07:40:11 +00:00
Hugo Benichi
38e86ba9f4
Merge "Fix flaky IpPrefixTest." am: 39a0b6b58e -s ours
...
am: 9e59475003
2017-08-08 07:34:42 +00:00
Hugo Benichi
9e59475003
Merge "Fix flaky IpPrefixTest."
...
am: 39a0b6b58e
2017-08-08 07:28:32 +00:00
Treehugger Robot
39a0b6b58e
Merge "Fix flaky IpPrefixTest."
2017-08-08 07:16:48 +00:00
Hugo Benichi
f9c61862cc
Fix flaky IpPrefixTest.
...
Test: IpPrefixTest passes
Bug: 32561414
Merged-In: Ib4bffe9d33a6d4f5c2bd97798073de0f66d77645
(cherry pick from commit f5ec69155d
2017-08-08 14:54:08 +09:00
Hugo Benichi
68455f3950
Merge "Merge "NetworkCapabilities: fix describeImmutableDifferences" into oc-dr1-dev am: 1b3877a965 -s ours" into oc-dr1-dev-plus-aosp am: 8047f7acad -s ours
...
am: 10d78759e3
2017-08-07 06:17:55 +00:00
Hugo Benichi
bfcefd4943
Merge "Merge "NetworkCapabilities: fix describeImmutableDifferences" into oc-dr1-dev am: 1b3877a965 am: 6ecf87a88a -s ours" into oc-mr1-dev-plus-aosp
...
am: e3e371fe1d -s ours
Change-Id: I08c8f8be01dbc136a344a1813758be31d21fec07
2017-08-07 06:08:53 +00:00
Hugo Benichi
10d78759e3
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
08b48ba699
Merge "NetworkCapabilities: fix describeImmutableDifferences" into oc-dr1-dev am: 1b3877a965
...
am: 6ecf87a88a
2017-08-07 05:57:27 +00:00
Hugo Benichi
6ecf87a88a
Merge "NetworkCapabilities: fix describeImmutableDifferences" into oc-dr1-dev
...
am: 1b3877a965
Change-Id: I50748aa0c9332787797f91265afccf82ceabf332
2017-08-07 05:49:25 +00:00
Hugo Benichi
4ba82b261f
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
dec642b9b3
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 2ecb9408f4102687f20f9ca19c13071ac6098cc6)
Change-Id: I74ecf34a2c079c74152d00caea2c220e9c6d1fa5
2017-08-05 11:37:10 +09:00
Hugo Benichi
1101d71942
Merge "NetworkCapabilities: fix describeImmutableDifferences" am: 7575ec2240 am: 9d951bf6f3 am: 7dac4ce465 am: 09cb221afb
...
am: 8112bf0dd4
2017-08-05 01:40:48 +00:00
Hugo Benichi
8112bf0dd4
Merge "NetworkCapabilities: fix describeImmutableDifferences" am: 7575ec2240 am: 9d951bf6f3 am: 7dac4ce465
...
am: 09cb221afb
2017-08-05 01:28:01 +00:00
Hugo Benichi
09cb221afb
Merge "NetworkCapabilities: fix describeImmutableDifferences" am: 7575ec2240 am: 9d951bf6f3
...
am: 7dac4ce465
2017-08-05 01:14:30 +00:00
Hugo Benichi
7dac4ce465
Merge "NetworkCapabilities: fix describeImmutableDifferences" am: 7575ec2240
...
am: 9d951bf6f3
2017-08-05 01:01:04 +00:00
Hugo Benichi
9d951bf6f3
Merge "NetworkCapabilities: fix describeImmutableDifferences"
...
am: 7575ec2240
Change-Id: If38efacdeec8476880835657938e435f9b598525
2017-08-05 00:54:43 +00:00
Hugo Benichi
99806e5606
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
Andriy Naborskyy
c3935e4ac3
Merge changes from topic 'am-94906183e52945938953177851714b42' into oc-mr1-dev-plus-aosp
...
am: 778a16ae34
2017-08-01 15:45:47 +00:00
Hugo Benichi
80778d56a1
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am: 1681f064ff -s ours am: 552b3aae6e -s ours am: e22c6cd56a -s ours am: ae00616f2f -s ours am: b1701a2d29 -s ours
...
am: 4e9604460f
2017-08-01 15:44:25 +00:00
Hugo Benichi
1b6fe4750c
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am: 1681f064ff -s ours am: 552b3aae6e -s ours am: e22c6cd56a -s ours am: ae00616f2f -s ours am: 9e1d815206 -s ours
...
am: bc1b8c2d6b
2017-08-01 15:39:53 +00:00
Android Build Merger (Role)
778a16ae34
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: 1681f064ff552b3aae6ee22c6cd56aae00616f2fb1701a2d29
2017-08-01 15:29:55 +00:00
Hugo Benichi
fad4f50f23
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am: 1681f064ff -s ours am: 552b3aae6e -s ours am: e22c6cd56a -s ours am: ef32008853 -s ours am: e7dcb3ad66 -s ours
...
am: 8b00864acf
2017-08-01 15:29:52 +00:00
Hugo Benichi
bc1b8c2d6b
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am: 1681f064ff -s ours am: 552b3aae6e -s ours am: e22c6cd56a -s ours am: ae00616f2f -s ours
...
am: 9e1d815206
2017-08-01 15:24:37 +00:00
Hugo Benichi
4e9604460f
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am: 1681f064ff -s ours am: 552b3aae6e -s ours am: e22c6cd56a -s ours am: ae00616f2f -s ours
...
am: b1701a2d29
2017-08-01 15:24:00 +00:00
Hugo Benichi
8b00864acf
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am: 1681f064ff -s ours am: 552b3aae6e -s ours am: e22c6cd56a -s ours am: ef32008853 -s ours
...
am: e7dcb3ad66
2017-08-01 15:14:02 +00:00
Hugo Benichi
9e1d815206
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am: 1681f064ff -s ours am: 552b3aae6e -s ours am: e22c6cd56a -s ours
...
am: ae00616f2f
2017-08-01 15:12:15 +00:00
Hugo Benichi
b1701a2d29
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am: 1681f064ff -s ours am: 552b3aae6e -s ours am: e22c6cd56a -s ours
...
am: ae00616f2f
2017-08-01 15:10:35 +00:00
Hugo Benichi
e7dcb3ad66
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am: 1681f064ff -s ours am: 552b3aae6e -s ours am: e22c6cd56a -s ours
...
am: ef32008853
2017-08-01 15:03:31 +00:00
Hugo Benichi
ae00616f2f
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am: 1681f064ff -s ours am: 552b3aae6e -s ours
...
am: e22c6cd56a
2017-08-01 14:55:26 +00:00
Hugo Benichi
ef32008853
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am: 1681f064ff -s ours am: 552b3aae6e -s ours
...
am: e22c6cd56a
2017-08-01 14:50:36 +00:00
Hugo Benichi
e22c6cd56a
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am: 1681f064ff -s ours
...
am: 552b3aae6e
2017-08-01 14:37:06 +00:00
Hugo Benichi
552b3aae6e
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler
...
am: 1681f064ff
2017-08-01 14:30:02 +00:00
Hugo Benichi
f8e88f5d34
Merge "Logging improvements when NetworkCapabilities change" am: 59e6fc6d27 am: ba6bae1db3 am: 88a572da7d -s ours am: ce2547965f -s ours
...
am: 43f7dfa3fc
2017-07-31 02:19:17 +00:00
Hugo Benichi
43f7dfa3fc
Merge "Logging improvements when NetworkCapabilities change" am: 59e6fc6d27 am: ba6bae1db3 am: 88a572da7d -s ours
...
am: ce2547965f
2017-07-31 02:13:17 +00:00
Hugo Benichi
ce2547965f
Merge "Logging improvements when NetworkCapabilities change" am: 59e6fc6d27 am: ba6bae1db3
...
am: 88a572da7d -s ours
Change-Id: I5f6e3a2109236f30d0e09bde8a2c63b32e62f772
2017-07-31 02:07:12 +00:00
Hugo Benichi
ba6bae1db3
Merge "Logging improvements when NetworkCapabilities change"
...
am: 59e6fc6d27
2017-07-31 01:50:38 +00:00
Treehugger Robot
59e6fc6d27
Merge "Logging improvements when NetworkCapabilities change"
2017-07-31 01:38:29 +00:00
Hugo Benichi
e06963a7ff
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 d9806e8014
2017-07-31 09:25:37 +09:00
Hugo Benichi
51a77ff1da
Merge "Merge "Logging improvements when NetworkCapabilities change" into oc-dr1-dev am: 8a8c295879 am: 00709696a9" into oc-mr1-dev-plus-aosp
...
am: 8c92a383a7
2017-07-29 00:15:04 +00:00
