Hugo Benichi
6703a93808
Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities" am: b35719a057 am: c11d6eafe9 am: e3d15057af
...
am: 69853a322c
2017-08-16 12:23:25 +00:00
Hugo Benichi
69853a322c
Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities" am: b35719a057 am: c11d6eafe9
...
am: e3d15057af
2017-08-16 12:14:09 +00:00
Hugo Benichi
e3d15057af
Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities" am: b35719a057
...
am: c11d6eafe9
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
Hugo Benichi
638504f152
Merge "Fix flaky IpPrefixTest." am: 47ce6588f3 -s ours am: 44033e347d -s ours am: eace017214 -s ours
...
am: 0bb20bd56a
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
2017-08-08 07:40:11 +00:00
Hugo Benichi
eace017214
Merge "Fix flaky IpPrefixTest." am: 47ce6588f3 -s ours
...
am: 44033e347d
2017-08-08 07:34:42 +00:00
Hugo Benichi
44033e347d
Merge "Fix flaky IpPrefixTest."
...
am: 47ce6588f3
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
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
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
2017-08-05 11:37:10 +09:00
Hugo Benichi
d8284017db
Merge "NetworkCapabilities: fix describeImmutableDifferences" am: 7575ec2240 am: ec11d07dc0 am: ad0a1b3c2b
...
am: ae6ff2ba0f
2017-08-05 01:28:01 +00:00
Hugo Benichi
ae6ff2ba0f
Merge "NetworkCapabilities: fix describeImmutableDifferences" am: 7575ec2240 am: ec11d07dc0
...
am: ad0a1b3c2b
2017-08-05 01:14:30 +00:00
Hugo Benichi
ad0a1b3c2b
Merge "NetworkCapabilities: fix describeImmutableDifferences" am: 7575ec2240
...
am: ec11d07dc0
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: fb8db88bd4c51fd37f55310a4c0cf89c5fe9b1886c8dd34abb
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
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
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
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
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
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
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
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
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
2017-08-01 14:37:06 +00:00
Hugo Benichi
c51fd37f55
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler
...
am: fb8db88bd4
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
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
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
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
2017-07-29 00:03:33 +00:00
Hugo Benichi
ec24f88225
Merge "Logging improvements when NetworkCapabilities change" into oc-dr1-dev am: 5c55f974bf
...
am: 6f245ad896
2017-07-29 00:03:27 +00:00
Hugo Benichi
170cc51f45
Merge "Logging improvements when NetworkCapabilities change" into oc-dr1-dev
...
am: 5c55f974bf
2017-07-28 23:54:05 +00:00
Hugo Benichi
6f245ad896
Merge "Logging improvements when NetworkCapabilities change" into oc-dr1-dev
...
am: 5c55f974bf
2017-07-28 23:54:03 +00:00
Hugo Benichi
5c55f974bf
Merge "Logging improvements when NetworkCapabilities change" into oc-dr1-dev
2017-07-28 23:42:59 +00:00
Hugo Benichi
8c92888a2d
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
Change-Id: I05c6e78891e1eac658f1cf883223af520a9a4f8f
2017-07-28 15:25:54 +09:00
Android Build Merger (Role)
ce423b8366
Merge "Merge "NetworkNotificationManager: correctly handle existing notifications" into oc-dr1-dev am: a03bf7acd1 -s ours am: 9b72d7581a -s ours" into oc-mr1-dev-plus-aosp
2017-07-28 04:49:25 +00:00
Hugo Benichi
39fb9abd35
Merge "NetworkNotificationManager: correctly handle existing notifications" into oc-dr1-dev am: a03bf7acd1
...
am: 8dc9e35371
2017-07-28 04:46:54 +00:00
Hugo Benichi
a117adfb70
Merge "NetworkNotificationManager: correctly handle existing notifications" into oc-dr1-dev am: a03bf7acd1 -s ours
...
am: 9b72d7581a
2017-07-28 04:46:54 +00:00
Hugo Benichi
8dc9e35371
Merge "NetworkNotificationManager: correctly handle existing notifications" into oc-dr1-dev
...
am: a03bf7acd1
Change-Id: I4ca3dcc293be5408a6f207e1ac1a7229a915723a
2017-07-28 04:39:14 +00:00
Hugo Benichi
9b72d7581a
Merge "NetworkNotificationManager: correctly handle existing notifications" into oc-dr1-dev
...
am: a03bf7acd1 -s ours
Change-Id: I13204ae131642c95df242245764689294b0fd85f
2017-07-28 04:38:25 +00:00
Hugo Benichi
fb8db88bd4
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler
...
This patch moves reportNetworkConnectivity onto the handler of
ConnectivityService.
This allows:
- to inspect NetworkAgentInfo on the ConnectivityService handler,
which is always more correct than doing so on a Binder thread.
- to improve locking policies around NetworkAgentInfo.
Test: $ runtest frameworks-net
Bug: 37119619, 36902662
Change-Id: I49a765826e65c29a1995242290e5e7544112c94e
2017-07-27 20:18:03 -07:00
