* changes:
Improve robustness of MediaSyncTest
Handle inconsistent values for PR_SET_TIMERSLACK_PID in android.os.cts.SeccompTest.
Fix a memory corruption (NativeCodeTest testPipeReadV)
Add option logcat-on-failure-size to CTS and GTS
Require android.software.device_admin for certain CtsVerifier tests
Make "done" phase of ScreenPinningTestActivity reentrant.
MediaSyncTest: increase ramp up time due to initial latency in AudioTrack.
DO NOT MERGE ANYWHERE: CameraITS: allow each scene to be ran independently
CameraITS scene4 should be skipped if read_3a is not supported
CameraITS scene5 should be skipped if read_3a is not supported
BUG:31504066 Reset to 94b4be7 with history
Put an app in standby, make it show a toast and ensure
that it doesn't come out of standby. This is to test
for a bug fix for the same behavior.
Bug: 31544592
Test: cts-tradefed run commandAndExit cts -m CtsHostsideNetworkTests -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testAppIdle_toast
Change-Id: I796ecde8e346c308a27969d873e3ce384414fee3
I did this manually first, but came up with a much better way that
produced a slightly better result (verified the diffs against the next
branch). Sequence of commands:
# Checkout the last good commit (right before the first bad merge)
git checkout aa76e8b6fc8515bfc65d4b75456b74c26ee32f1e^
# Reset the HEAD pointer to the last bad merge, but not the worktree
git reset 3c197891b50d9ac5e5016f55551b6dff82f62f33
# Update the index
git add -A
# Apply all the changes that mattered between the above to commits
git cherry-pick -n 29cb19b774b6e0cb73851feb6877da5e42bba78e
git cherry-pick -n 0e9d107fcfbd3421b7988a4252a9965896019aba
git cherry-pick -n f19496887beb974c3bc9df9a57f6214a696417b1
git cherry-pick -n 939e2b253b798386ce53954626fd8044ecb18db6
git cherry-pick -n 02f07b5d5994b8345ebc86546e5f66524ac04dac
# Commit the changes
git commit
# Rebase the diffs on top of the latest nyc-dev-plus-aosp, since some
# changes have been manually applied, there will be a few merge
# conflicts
git rebase goog/nyc-dev-plus-aosp
All the SHA-1s above were discovered using a combination of this command
to find the changes actually submitted into nyc-dev-plus-aosp itself:
git log --oneline --first-parent goog/nyc-dev-plus-aosp
and then to find the original commits (that weren't marked as DO NOT
MERGE ANYWHERE):
git log --oneline --no-merges --stat aa76e8b..goog/nyc-dev-plus-aosp
Change-Id: Iec12619678cb8d011d2c6df26a34ce26e042b854
Make sure that when switching between idle, paroled
and battery saver, the network availability of the app
is correctly updated.
Bug: 31399882
Test: cts-tradefed run commandAndExit cts -m CtsHostsideNetworkTests -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testAppIdleNonMetered_whenCharging
Test: cts-tradefed run commandAndExit cts -m CtsHostsideNetworkTests -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testAppIdleMetered_whenCharging
Change-Id: I060a0d5f9c3297430b5b623b389c1afdf6abde87
* commit '9be9d5865ba2584a251642359710c074061dee5e': (75 commits)
CameraITS scene5 should be skipped if read_3a is not supported
Added Bluetooth LE tests
Add CTS tests for LocalSocket read/write timeouts
Replace libziparchive-host with libziparchive
Fix clang-tidy warnings in libjnitest.
Fix clang-tidy warnings in librscpptest.
Fix clang-tidy warnings in openglperf2.
Fix clang-tidy warnings in audio_quality.
Replaces pcre with pcre2
Add Mockito to deps for Conscrypt tests and remove core-tests
simpleperf_cts_test: link libevent.
Add the new android kernel path to includes.
FileSystemPermisionTest: Drop unused method
Use mockito-target-minus-junit4.
android.core.tests.libcore.package.tests: add mockito to the dependencies
Fix misc-macro-parentheses warnings in cts.
[RenderScript] Fix refocus test to accommodate different rounding behavior for half_sqrt().
Remove data race from refocus test
Remove one test from MediaCodecTest#testCreateInputSurfaceErrors.
Return all errors, not only the first one.
...
