Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519669

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9d02f8200d5379f2f062d8192acfbdd8454b0cff

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519499

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e8f3a0b38776196c58d1d4cc818b19a7b4906c9

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1526742

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0ef84efc0be2ee930db97ed6682f23bf8366e1c0

Test: None
Change-Id: Ib6fe305a1091201bbb80c14a57e04c93912e2342

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519906

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I52528fb231a5f2385187a7d06ffb49de89c74155

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513052

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia252eb29dbccb0105c3f4a46c7597abb56de0c21

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527538

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I245a8498d89e73fefa448a23d71a30d3f34b56ca

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495869

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e55c3c4bed3d71eb48242428c179809aae00a1f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519791

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I849ac5c7d88cbde748881d4aa85f5bacf9345d91

CAPTIVE_PORTAL is a CS-managed capability, and causes CS to log a wtf.
When this test is run on an eng build, this sends SIGSEGV to the test,
which is pretty difficult to debug.

Test: FrameworksNetTests NetworkStackTests
Change-Id: I72fc46a6daa4e886425b4dc967318cca9f1a5302

Currently, ConnectivityService assumes that only VPNs can have
underlying networks. Make the code decide this based only on the
return value of NetworkAgentInfo#supportsUnderlyingNetworks.
This allows non-VPN network types to support underlying networks
in the future.

This requires storing the original agent's capabilities in
NetworkAgentInfo so that applyUnderlyingCapabilities can mix in
the underlying network capabilities without overwriting the
capabilities of the network itself. Currently, the only
information that applyUnderlyingCapabilities takes from the
original agent's capabilities are the metered bit (stored in
NetworkAgentInfo#declaredMetered) and the transports (assumed to
be exactly {TRANSPORT_VPN}. Store the full capabilities instead.
This is more state than needed but it ensures that we do not need
to make any changes if in the future we want to propagate new
types of information from the underlying networks.

This should have no impact on current use cases (i.e., VPNs).

There is a change in ordering: in disconnectAndDestroyNetwork,
the new code propagates underlying network capabilities before
removing the network from LegacyTypeTracker, instead of after.

This is done to simplify the new code. When the new code
propagates underlying network capabilities in response to a
change for a particular network (e.g., connect, disconnect,
capabilities change), it only considers networks that have the
changed network as underlying. Because determining the
underlying networks requires knowing the default network,
the new code runs before the default network is changed and
LegacyTypeTracker is updated.

This shouldn't have app implications because the connectivity
broadcasts sent by LegacyTypeTracker and the callbacks cannot be
ordered, since they run on separate threads with unpredictable
delays. The capability change callbacks resulting from
propagation of underlying network capabilities were already
sent before the rematch, so the callbacks themselves are not
reordered in any way.

Bug: 173331190
Test: atest FrameworksNetTests \
            CtsNetTestCases:NetworkAgentTest \
	    CtsNetTestCases:Ikev2VpnTest \
	    CtsNetTestCases:VpnServiceTest \
	    CtsNetTestCases:android.net.cts.ConnectivityDiagnosticsManagerTest \
	    HostsideVpnTests com.android.server.connectivity.VpnTest
Change-Id: Ic5353a928a3a3541dcf953c35f47277c5e295db8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1525813

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4b85f391e4634fa2596f7469cfb58d7917c9a8a7

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1525189

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I48cb973018ef4f81b088232894c9ae087bd2d431

Due to the limited virtual memory address space it is not practical
to advertise support for more than 4K for 32-bit processes.

Bug: 173488434
Test: atest CtsMediaTestCases -- --module-arg CtsMediaTestCases:size:small
Change-Id: Ibcd7f70f4efd8d696d831769bafe932207640830

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513195

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8e2d1e1b669e2e27dc3449cfb7ee4b2fcb9715d7

Revert "Revert "Keystore 2.0: Move keymint spec to security name..."

Revert "Revert "Keystore 2.0: Move keymint spec to security name..."

Revert^2 "Remove references to keymint1"

34536a352803a08776cc4f373d93a94e1fcbf98e

Bug: 175345910
Bug: 171429297
Change-Id: I694e677e4e20419440f12cb7981f0c0c4ca29e08

If IWLAN connection or handover failure occurs
with specific fail cause as specified in the standard.

Frameworks supports error handling for each IWLAN error cause.

Bug: 165778020
Change-Id: Iefd3c2b1a042d70c411f020b5e67792bac95abb4
Signed-off-by: Jinseok Kim <jinseok83.kim@lge.com>

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1524638

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I30180ec8e75f6c619dbe8492e74324d2e38d6a3f

Use mState instead of mEnable to check Bluetooth server status.

mEnable is used to indicate whether the next action is enabling or
disabling the Bluetooth stack, whereas mState indicates the current
state.

Test: atest FrameworksServicesTests
Bug: 173941366
Change-Id: Id85494f7f40a0201061e74fbf3f08f70a632a62c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1522299

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I88e10902ac8e05b49e9036a1304e808c82baa406

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519794

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I11e8912fee836209a9f09786362257c4363c7d76

Test: n/a
Change-Id: Ib1ec672f872a3b1faf65c3583e300f473bac8f0c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1525999

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I134bbb61735b03e177636df56b9d28e4b41fb624

API current.txt files are already covered by the API-Review label through
https://android.git.corp.google.com/All-Projects/+/refs/meta/config/rules.pl#226.

Test: n/a
Change-Id: Ib0f8272cc4dfe58b41804ef8c0951b7026cd0a59

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1525805

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I41900ac6d25d2c97b9222f116675ef0834e7196d