am skip reason: Change-Id I3e4ff990c0d4825b21c7679be29a482a2d1324ec with SHA-1 fbd6a2c012 is in history
Change-Id: I65e82972439bd524fedd0906596aeaaf2dac83fa
am skip reason: Change-Id Id7d8bba486bada1a7ba5b0f152d2aa02e407f249 with SHA-1 d568791283 is in history
Change-Id: I4c1667bda67f3c8cf19c5407963e2a28e0443ece
As NetworkAgent is in a transition where all agents need
to include the NOT_SUSPENDED capability as part of their
migration to the system API, ConnectivityService adds it
forcefully to all agents that don't have the CELLULAR
transport. This doesn't include VPNs when VPNs have some
cellular network as their underlying network.
The best way to solve this is to make sure the VPN
capabilities reflect those of the underlying networks as
far as the NOT_SUSPENDED capability is concerned. This
is how they work for other similar capabilities.
This also happens to contain a drive-by fix for an issue
with a spurious capabilities callback is triggered when
a VPN connects and it has any underlying network (which
means almost always, because it will take the default
network if it doesn't declare any). Fixing this was
necessary to have a cogent test of this issue, but it
could be moved to another patch or it could stay unfixed
with some minor ajustment to the tests if judged too
dangerous to include in R at this point.
Test: New tests in this patch. Also manually tested with
tcpdump as described in b/150570873.
Bug: 150570873
Original-Change: https://android-review.googlesource.com/1301317
Merged-In: I3e4ff990c0d4825b21c7679be29a482a2d1324ec
Change-Id: I3e4ff990c0d4825b21c7679be29a482a2d1324ec
When a VPN connects and it has any underlying network (which
means almost always, because it will take the default network
if it doesn't declare any), it has default capabilities and
will only take the capabilities of its underlying network
as part of an update happening after making the network
available but before the rematch can take place. This in turn
causes the capabilities callback sent as part of the rematch
to be spuriously sent.
Test: FrameworksNetTests. Also tested together with a
followup that adds tests with drive-by coverage for this.
Bug: 150570873
Original-Change: https://android-review.googlesource.com/1305393
Merged-In: Id7d8bba486bada1a7ba5b0f152d2aa02e407f249
Change-Id: Id7d8bba486bada1a7ba5b0f152d2aa02e407f249
Add a test to verify the ConnectivityService / NetworkMonitor
integration around the captive portal API.
Test: atest ConnectivityServiceIntegrationTest
Bug: 156062304
Change-Id: I4eed02e09fc4943c011d871c58ba97ec572c7763
(partial cherry-pick of internal change:
I4457ff2bd466a4c56fed2570e110f251031c2385)
With b/150232615, we will need an explicit value set for the exported
flag when intent filters are present, as the default behavior is
changing for S+. This change adds the value reflecting the previous
default to the manifest.
These changes were made using an automated tool, the xml file may be
reformatted slightly creating a larger diff. The only "real" change is
the addition of "android:exported" to activities, services, and
receivers that have one or more intent-filters.
Bug: 150232615
Test: TH
Merged-In: I4457ff2bd466a4c56fed2570e110f251031c2385
Change-Id: I65a1ca1678048bbf09edc9a0485b673644c8109d
am skip reason: Change-Id Icad439efa2ab4c872c21d3ee6ceaae8c5b49f18d with SHA-1 9ddf8a5953 is in history
Change-Id: Icdad1a09f60a11cbf9dc8e49dd4565f370da8ec5
am skip reason: Change-Id I3a974700aa1d83cb285295ed1de0aa263e2e5b58 with SHA-1 a9b761d261 is in history
Change-Id: I9aaa2b99a80d7589f7e34a4543aa0ba73109889e
am skip reason: Change-Id Icad439efa2ab4c872c21d3ee6ceaae8c5b49f18d with SHA-1 9ddf8a5953 is in history
Change-Id: I3e4262c358cf911c637dd518730ce4274efab587
am skip reason: Change-Id I3a974700aa1d83cb285295ed1de0aa263e2e5b58 with SHA-1 a9b761d261 is in history
Change-Id: I5a40a74c489c782151a20f07a23177500b76e2fa
am skip reason: Change-Id Icad439efa2ab4c872c21d3ee6ceaae8c5b49f18d with SHA-1 9ddf8a5953 is in history
Change-Id: I1d5f1c2a7059dfc15348126213f620666fdab83a
am skip reason: Change-Id I3a974700aa1d83cb285295ed1de0aa263e2e5b58 with SHA-1 a9b761d261 is in history
Change-Id: Ibdd6d03a7e98bcc30be1832321a3cfe434cd1082
am skip reason: Change-Id Icad439efa2ab4c872c21d3ee6ceaae8c5b49f18d with SHA-1 f53a075913 is in history
Change-Id: Idb6ea8087b39242e1bab79d7227107303a81f59d
am skip reason: Change-Id I3a974700aa1d83cb285295ed1de0aa263e2e5b58 with SHA-1 fc7cad313d is in history
Change-Id: I378c8d86396f0a8ddb803b86ef8426b4dca1c153
am skip reason: Change-Id Icad439efa2ab4c872c21d3ee6ceaae8c5b49f18d with SHA-1 f53a075913 is in history
Change-Id: I9dd9b553b718182482e270776f9ec5a2a163a6cc
am skip reason: Change-Id I3a974700aa1d83cb285295ed1de0aa263e2e5b58 with SHA-1 fc7cad313d is in history
Change-Id: Ibc079b93fe6a2183220fdd57d0d41cbda772c400
am skip reason: Change-Id Icad439efa2ab4c872c21d3ee6ceaae8c5b49f18d with SHA-1 f53a075913 is in history
Change-Id: I92ebe59e56a221d9f998286dc9a6d8d1993b12a0
am skip reason: Change-Id I3a974700aa1d83cb285295ed1de0aa263e2e5b58 with SHA-1 fc7cad313d is in history
Change-Id: I7009a06d57286347c5fae2355132d2f217863383
am skip reason: Change-Id I46f247268310e12d420531745a22e93cf3550e89 with SHA-1 05c7af6c7c is in history
Change-Id: I901d2b1c78b526a470bce67b3c935195758bc06d
