See https://source.android.com/setup/contribute/respectful-code for reference

For this round, the fixes are only applied to the following to minimize breaking dependencies:
  * comments (excluding javaDoc annotations)
	* private constants
	* private functions
	* parameters within functions

BYPASS_INCLUSIVE_LANGUAGE_REASON=Just updating a few select inclusive language violations.
No-Typo-Check: Changes focused on inclusive language violations.
BUG: 295342157
Change-Id: I6591e94aab762f06df283435fcec75c410c5d176

Fix kotlin nullable errors that were exposed by setting the retention
of android.annotation.NonNull and android.annotation.Nullable to
class retention.

Bug: 294110802
Test: builds
Change-Id: I0736e8abf503c80b92e3762bed908400ffedb335

- Replace CarrierConfigChange receiver with listener
- Get subset of carrier configs with new API instead of private method

Bug: 265961787
Test: atest TelephonySubscriptionTrackerTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:628147b7a0e1f6126245ae702f31bb2cf5bd1d4d)
Merged-In: I93f14421624ac76bdf84c06cfd4c067bf2ccde7a
Change-Id: I93f14421624ac76bdf84c06cfd4c067bf2ccde7a

Change-Id: I9ebb972e551ab1a8bc3c77cefa7bda8df9a0b278
Fixes: 288146151
Bug: 288146151
Test: N/A

As part of the trunkstable migration, we need to add a component
to the OWNERS file of the InputTests module.

Bug: 288137971
Test: not needed
Change-Id: Ibab9174832b6cb98993b33543a3d0393248dbab9

IpSecTunnelInterface#setUnderlyingNetwork will throw IAE when the
underlying network is not functional and has null LinkProperties.
This commit updates VCN to explicitly handle this exception, instead
relying on the mechanism for handling all uncaught exceptions.

Bug: 240112879
Test: atest CtsVcnTestCases & FrameworksVcnTests
Change-Id: I2fdf1da542eb04d56a04e04c762f8c2c19828071

This reverts commit 2f8ca4af.

Reason for revert: This doesn't actually do what I thought it did. And b/286514492 has a more general fix.
Bug: 239817928

Change-Id: Iffaaf3d9aacc8bd42afb2756517eb91690e8ffe3

Allows IKE library metrics to identify and log the system clients

This commit also updates VcnManagementServiceTest to mock
out createAttributionContext

Bug: 278943609
Test: manually verified the metrics
Test: CtsVcnTestCases, FrameworksVcnTests, Ikev2VpnTest,
      VpnManagerServiceTest, VpnTest
Change-Id: I8b326de0484f9c97eb1b12f27a792c5ebf35ba1e
Merged-In: I8b326de0484f9c97eb1b12f27a792c5ebf35ba1e

This test, and the code it is testing, makes use of the event log -
looking for specific info in it, and writing to it.

Make sure we capture the event log during runs of the test so that we
have some chance of diagnosing falures.

Bug: 239817928
Test: N/A
Change-Id: I610c7ddd67381d04c35fd42343e21098c150beb5

This is useful in test suites that grant permissions on individual
tests, and then revoke all permissions in an @After method.

Bug: N/A
Test: TH
Change-Id: Ic3445f283702c7092c224bbe6f2340f5911b0541

* Remove unused dependencies.
* Replace "ub-uiautomator" (v2.2.0) with
  "androidx.test.uiautomator_uiautomator" (v2.3.0).

Bug: 235842600
Test: presubmit
Change-Id: I9c1e9ef626199470fb999ea02f60173d0ecac373

* Remove unused dependencies.
* Replace "ub-uiautomator" (v2.2.0) with
  "androidx.test.uiautomator_uiautomator" (v2.3.0).

Bug: 235842600
Test: presubmit
Change-Id: I3b7c6aed1d9cd0deee9deb7b8f284bd03508b66a

* Remove unused dependencies.
* Replace "ub-uiautomator" (v2.2.0) with
  "androidx.test.uiautomator_uiautomator" (v2.3.0).

Bug: 235842600
Test: presubmit
Change-Id: I15f0cd57b3da1d6b45276d7c2c36bd86d4ae2001

Commit 5aab83aa6130760ca5c76c5b6cd429f1b29668e8 means that double
spaces are no longer removed from audit log messages. Change the
parsing code to be tolerant of 1 or more spaces in the relevant
places.

Also modify the tests to fail more quickly (otherwise they just time out, which makes the failure hard to diagnose). Make sure we have one explicit test for a log message with multiple spaces.

Bug: 276686518
Test: atest DynamicCodeLoggerIntegrationTests
Change-Id: Ia08b90785aabb4db0f005587e2315893b561573a

Bug: 269138674
Test: Presubmit
Change-Id: Idf1c0703e619ab8d2aa9c8c9a32ffcc35327738e

Change-Id: I875ccab6e4956658ec7529fe2cfeae74f96efa93
Test: presubmit
Bug: 267521823

Bug: 269138674
Test: Presubmit
Change-Id: Ibd1a18f6369396c4ae7b0263baab84f25c88ce06

This commit updates VCN to be able to mark a test network
as restricted. Additionally, when VCN is in safe mode, VCN will
delegate to the Android system to decide the restriction policy of
the test network.

This commit allows CTS to verify VCN's ability of restricting
networks based on the transport type.

Bug: 263415068
Test: atest VcnManagerTest (new tests)
Change-Id: I5fe0be4ce445a4d9c20cbef5ee4a2eb55403b3c8

- Move SoundTrigger owners to reference authoritative file
- Add SoundTrigger ownership to top level services/voiceinteraction directory
to simplify maintenance.

Test: Compiles
Fixes: 275435310
Change-Id: I3fc8e98ef017f93f7208dc2fb5073beda6dcfb18

This patch changes the VcnManagementService policy matching from using
capabilities to match against underlying networks to using iface names.
This is significantly more precise than the network capability matching
logic, as that will not catch any new capabilities that were added (eg
ENTERPRISE, LOW_LATENCY, HIGH_BANDWIDTH, etc).

Bug: 274861645
Test: atest FrameworksVcnTests CtsVcnTestCases
Change-Id: Iea2f5afb242649517f83f85c77355cfdbbf1e202

This commit updates NetworkPriorityClassifier to also require
capabilty matching on test networks. This allows CTS to select
underlying test networks based on their capabilities. Previously
capability matching was only done cell networks.

To do that this commit adds an abstract method to
VcnUnderlyingNetworkTemplate to retrieve capability requirements
so that the capability match can be done before the matching logic
diverge to different transports.

Bug: 263415068
Test: atest VcnManagerTest (new tests)
Change-Id: I12377cbd1d721c4100a958fd9a0ea56d87351eec

This fake allows tests to mock permissions of AIDL clients.

Bug: 269684922
Test: atest FrameworksServicesTests:com.android.server.net.NetworkManagementServiceTest
Change-Id: Iea4ec02d4be27f8043c1a57db11cadfd6d90b3ba

Move to the 'device-tests' test suites to ensure the correct platform
certificate is used (see b/272181400).

Bug: 269721152
Bug: 272181400
Test: atest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1f635608637d76ad750e0a0675cb557c9fef3131)
Merged-In: Ibd84045b26efe2b46a33da9c220834e0f7c33fd8

Change-Id: I840d79e1132162b64f233979200309d53a39d36b

Added SPDX-license-identifier-Apache-2.0 to:
  tests/EnforcePermission/service-app/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:92d8fc09b565214bf44eaf4b1bdb2d7c3bd9455d)
Merged-In: I276cd2c4c2fb077165f21442230f30e2d8adbe76

Change-Id: I07021e0c1adade9d00a08ca2db71007413a8801b

ImeOpenCloseStressTest#testShowHideInSameFrame() is very flaky
on T. It's passing on T QPR, and rewritten in U (also passing).

This could be a real bug on Android side as the same test is passing on
T QPR. However, let's just ignore this test as T (not QPR) does not
accept general fix now.

I7a66fd84e4094be249714c2597706ee25938adbe is an unrelated change that's in T QPR to avoid merging this CL there.

Bug: 268556567
Test: m InputMethodStressTest
Change-Id: Ibcd01e0d722f5ebb846e75f72ba4e770f7030d32
Merged-In: I7a66fd84e4094be249714c2597706ee25938adbe

The current integration tests under system/tools/aidl mock
PermissionEnforcer and as such do not exercise the complete permission
checks. Set up a service app (service-app) which relies on the
annotation to protect its methods. A nested service is included to test
that permission checks propagate to same-process calls.

Bug: 269721152
Test: atest EnforcePermissionTests
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b404eee1c159bd4bc2d5c0500a1996cfbceb2799)
Merged-In: I2d14f10333eabc385007216038dc487f83a4d21a

Change-Id: I446406aa0e7ce6de5745d870599d37706cc52cf9

The events are sourced from ScreenLifecycle.

Bug: 267222890
Test: added unit tests, and manually verified the change

Change-Id: Iae8df1f1c4654f37db9a0ec450aa0516405769bc
Merged-In: Iae8df1f1c4654f37db9a0ec450aa0516405769bc

The protolog in wm/am is generally less than 1kb after being writtem to ProtoOutputStream,
but 'new ProtoOutputStream()' will at least create a byte array of 8kb each time.
This will cause each log to occupy at least 7kb of useless memory.
When the log cached by 'ProtoLogToFile' reaches BUFFER_CAPACITY(1MB), it will occupy 70MB of memory.
This has a greater impact on some low-memory devices.

Bug: 271179026
Bug: 262244460
Merged-In: I368278df6f801b2b2b67974089d4a7f4147d91cc
Change-Id: I368278df6f801b2b2b67974089d4a7f4147d91cc

The protolog in wm/am is generally less than 1kb after being writtem to ProtoOutputStream,
but 'new ProtoOutputStream()' will at least create a byte array of 8kb each time.
This will cause each log to occupy at least 7kb of useless memory.
When the log cached by 'ProtoLogToFile' reaches BUFFER_CAPACITY(1MB), it will occupy 70MB of memory.
This has a greater impact on some low-memory devices.

Bug: 271179026
Change-Id: I368278df6f801b2b2b67974089d4a7f4147d91cc

This directory will hosts end-to-end tests for @EnforcePermission.
Considered alternative location:
- core/tests/coretests (FrameworksCoreTests): broad ownership, see
  b/243401782.
- system/tools/aidl: our integration tests already exist there. The
  current tests setup for aidl does not install APKs but only raw jar
  files. We want to install a regular application to test the
  effective permissions.

The end-to-end tests will eventually be executed in presubmit via
TEST_MAPPING.

Bug: 269721152
Test: n/a
Change-Id: I6a87b50e794fc3a0ba7c8a48ef9f92b7d6ad5180

Fixes: 270035407
Test: atest FlickerTests
Change-Id: I9b21b87e82994dd438cf7b887d84a93b2c66bac7
Merged-In: I9b21b87e82994dd438cf7b887d84a93b2c66bac7

Test
`com.android.server.pm.BackgroundDexOptServiceIntegrationTests#testBackgroundDexOptDowngradeSuccessful`
has been failing for a long time; temporarily disable it while we
investigate this issue

Test: atest BackgroundDexOptServiceIntegrationTests
Bug: 251438180
Change-Id: I3584ed2fd49e673a2d9bb37aabb11577c52a6267

This patch adds an API to allow VCN providers to configure the UDP port
4500 hint to improve the power implications of a VPN over the VCN.

Bug: 259000745
Test: atest FrameworksVcnTests
Change-Id: Id464ab43fa15d5f6a693f73932d95d9822320acb

This commit updates IkeSessionParamsUtils to be able to encode/decode
IkeSessionParams with IKE_OPTION_AUTOMATIC_KEEPALIVE_ON_OFF.

Bug: 259000745
Test: atest IkeSessionParamsUtilsTest
Change-Id: I6dd24893cf3343df05ae41e657ff082145c1e8ff

This reverts commit 122768bf.

Reason for revert: reverting the revert with fix of RequiresPermissionChecker

Change-Id: I1f30e170aeef27b93a7229ec9fd2a3d09bc659c5

This reverts commit cff46f1f.

Reason for revert: errorprone broken with RequiresPermissionChecker, will revert the revert with the fix

Change-Id: I9366e6d5139c447b73d3479927a9350d7793a06f

This approach preserves the ability to run these tests with the previous ways and also having them executable with Robolectric test runner.

Bug: 266750663
Test: atest SystemUiRoboTests

Change-Id: I6453fcbcce3967d5da7e413b209896df13fe22a9

Fix an edge case happens on large-screen devices that
DisplayContent#updateImeParent may not be called to update IME surface
parent from the activity to the display area when the app actvitity is
letterboxed by
 1) activity handles configChange without being relaunched
    by window configuration change
 2) calling setRequestedOrientation to fix orientation as portrait

In this case, if the activity bounds size is not suitable to attach
IME surface, we need to recompute the IME surface parent in
WindowState#onConfigurationChanged to make IME surface can be placed on
the display area to avoid IME position being shifted by
letterboxed activity.

Fix: 249081451
Test: atest FlickerTests:OpenImeWindowToFixedPortraitAppTest
Merged-In: I7a66fd84e4094be249714c2597706ee25938adbe
Change-Id: I7a66fd84e4094be249714c2597706ee25938adbe

As part of renderscript deprecation/removal, of the two pieces of
renderscript in this app, one already had a Java alternative but the
heatmap code didn't. Rather than reimplement that, though, it appears
that this project has been obsoleted by CtsUiRenderingTestCases. So
let's remove it instead. (Even if we're wrong, this still gives us more
time to work out what, if anything, is actually needed.)

Bug: http://b/255624710
Test: treehugger
Change-Id: I7cf64a28bd3c7edea061fafc5e06d4134cc79b05

Bug: 258128535
Test: N/A
Change-Id: I4a27c08c421219f2af597059cc5dff5aadff0c28