am skip reason: Change-Id If5e5439b22f05e08a293fd83da4d54f6a4363ca5 with SHA-1 1f9e9ce3d5 is in history
Change-Id: I3937b76aee04cd94c4c41c51eb443703b3343cc4
am skip reason: Change-Id Id7d8bba486bada1a7ba5b0f152d2aa02e407f249 with SHA-1 1112dd3d83 is in history
Change-Id: I47c91c553f8a576948f295825681667ba25597d4
am skip reason: Change-Id I3e4ff990c0d4825b21c7679be29a482a2d1324ec with SHA-1 91a1beddcc is in history
Change-Id: I80c864919c9c66535c78bc3a23e3542d874fd0ab
am skip reason: Change-Id Id7d8bba486bada1a7ba5b0f152d2aa02e407f249 with SHA-1 8c5e45895d is in history
Change-Id: I85981411877ad515e086a7dab37b9e3c4fb4cc4c
am skip reason: Change-Id If5e5439b22f05e08a293fd83da4d54f6a4363ca5 with SHA-1 1f9e9ce3d5 is in history
Change-Id: Iea04465f5b85e642324222d9e2fa8152a9f213ba
am skip reason: Change-Id Id7d8bba486bada1a7ba5b0f152d2aa02e407f249 with SHA-1 1112dd3d83 is in history
Change-Id: I6366c3d76e0a5f61fa90eb93d8ed2323f87e8504
am skip reason: Change-Id I3e4ff990c0d4825b21c7679be29a482a2d1324ec with SHA-1 91a1beddcc is in history
Change-Id: I65e82972439bd524fedd0906596aeaaf2dac83fa
am skip reason: Change-Id Id7d8bba486bada1a7ba5b0f152d2aa02e407f249 with SHA-1 8c5e45895d is in history
Change-Id: I4c1667bda67f3c8cf19c5407963e2a28e0443ece
am skip reason: Change-Id Id7d8bba486bada1a7ba5b0f152d2aa02e407f249 with SHA-1 8c5e45895d is in history
Change-Id: Id070eb419a57aa6c7eddacf8266a40eebdbc415b
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
am skip reason: Change-Id I4457ff2bd466a4c56fed2570e110f251031c2385 with SHA-1 17e3df1968 is in history
Change-Id: I983d298a0ffdc717e50a6ea645afb3d144439712
(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 f4a7e96585 is in history
Change-Id: Icd261ba1d6757a4f9cc40171a4bf00a734854326
am skip reason: Change-Id I3a974700aa1d83cb285295ed1de0aa263e2e5b58 with SHA-1 ccfd0ff534 is in history
Change-Id: Ia8a43927cf5a3abdfcd95206cefcae849db39d2c
am skip reason: Change-Id Icad439efa2ab4c872c21d3ee6ceaae8c5b49f18d with SHA-1 f4a7e96585 is in history
Change-Id: Icdad1a09f60a11cbf9dc8e49dd4565f370da8ec5
am skip reason: Change-Id I3a974700aa1d83cb285295ed1de0aa263e2e5b58 with SHA-1 ccfd0ff534 is in history
Change-Id: I9aaa2b99a80d7589f7e34a4543aa0ba73109889e
am skip reason: Change-Id Icad439efa2ab4c872c21d3ee6ceaae8c5b49f18d with SHA-1 f4a7e96585 is in history
Change-Id: I66862dd70867f0869fab420b8268cd56c2057182
am skip reason: Change-Id I3a974700aa1d83cb285295ed1de0aa263e2e5b58 with SHA-1 ccfd0ff534 is in history
Change-Id: Idffc0cb9e9948138529be2fbc1febb531ad7c7f2
am skip reason: Change-Id Icad439efa2ab4c872c21d3ee6ceaae8c5b49f18d with SHA-1 f4a7e96585 is in history
Change-Id: I3e4262c358cf911c637dd518730ce4274efab587
am skip reason: Change-Id I3a974700aa1d83cb285295ed1de0aa263e2e5b58 with SHA-1 ccfd0ff534 is in history
Change-Id: I5a40a74c489c782151a20f07a23177500b76e2fa
am skip reason: Change-Id Icad439efa2ab4c872c21d3ee6ceaae8c5b49f18d with SHA-1 f4a7e96585 is in history
Change-Id: I1d5f1c2a7059dfc15348126213f620666fdab83a
am skip reason: Change-Id Icad439efa2ab4c872c21d3ee6ceaae8c5b49f18d with SHA-1 b5c7abd071 is in history
Change-Id: I97f084d61d250ef6e84d513199f190d58b1e3c08
am skip reason: Change-Id I3a974700aa1d83cb285295ed1de0aa263e2e5b58 with SHA-1 ccfd0ff534 is in history
Change-Id: Ibdd6d03a7e98bcc30be1832321a3cfe434cd1082
am skip reason: Change-Id I3a974700aa1d83cb285295ed1de0aa263e2e5b58 with SHA-1 ba3433669a is in history
Change-Id: Ied2249806d6e67a3fe1ceaca6a161d3eae6311d1
am skip reason: Change-Id Icad439efa2ab4c872c21d3ee6ceaae8c5b49f18d with SHA-1 b5c7abd071 is in history
Change-Id: Idb6ea8087b39242e1bab79d7227107303a81f59d
