Merge "Merge cherrypicks of [1888496, 1901811, 1915079, 1914248] into sparse-7961824-L64200000952243501." into sparse-7961824-L64200000952243501sparse-7987081-L11200000952236851

4 files changed, 23 insertions, 10 deletions

diff --git a/tests/framework/base/windowmanager/src/android/server/wm/KeyguardTests.java b/tests/framework/base/windowmanager/src/android/server/wm/KeyguardTests.java
index dc7c30870c2..d4d2905f4ed 100755
--- a/tests/framework/base/windowmanager/src/android/server/wm/KeyguardTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/KeyguardTests.java
@@ -443,6 +443,8 @@ public class KeyguardTests extends KeyguardTestBase {
     }
 
     @Test
+    @Ignore("For the initial android 12, activity with turnScreenOn flag can unlock device if "
+            + "keyguard is insecure. Ignore this test regardless the OEM has resolved the issue")
     public void testTurnScreenOnActivityOnAod() {
         final AodSession aodSession = createManagedAodSession();
         assumeTrue(aodSession.isAodAvailable());
diff --git a/tests/tests/animation/src/android/animation/cts/ObjectAnimatorTest.java b/tests/tests/animation/src/android/animation/cts/ObjectAnimatorTest.java
index 700510d091b..270b3af3798 100644
--- a/tests/tests/animation/src/android/animation/cts/ObjectAnimatorTest.java
+++ b/tests/tests/animation/src/android/animation/cts/ObjectAnimatorTest.java
@@ -162,7 +162,7 @@ public class ObjectAnimatorTest {
         mActivityRule.runOnUiThread(intAnimator::start);
 
         verify(mockListener, timeout(2000)).onAnimationRepeat(intAnimator);
-        verify(mockListener, timeout(2000)).onAnimationEnd(intAnimator, false);
+        verify(mockListener, timeout(3000)).onAnimationEnd(intAnimator, false);
     }
 
     @Test
@@ -196,7 +196,7 @@ public class ObjectAnimatorTest {
         mActivityRule.runOnUiThread(colorAnimator::start);
 
         verify(mockListener, timeout(2000)).onAnimationRepeat(colorAnimator);
-        verify(mockListener, timeout(2000)).onAnimationEnd(colorAnimator, false);
+        verify(mockListener, timeout(3000)).onAnimationEnd(colorAnimator, false);
     }
 
     @Test
diff --git a/tests/tests/media/src/android/media/cts/AudioFocusTest.java b/tests/tests/media/src/android/media/cts/AudioFocusTest.java
index 1cfa1ffe9eb..a7a7b0079ec 100644
--- a/tests/tests/media/src/android/media/cts/AudioFocusTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioFocusTest.java
@@ -20,11 +20,13 @@ import android.Manifest;
 import android.annotation.Nullable;
 import android.content.Context;
 import android.content.pm.PackageManager;
+import android.content.res.AssetFileDescriptor;
 import android.media.AudioAttributes;
 import android.media.AudioFocusRequest;
 import android.media.AudioManager;
 import android.media.AudioManager.OnAudioFocusChangeListener;
 import android.media.MediaPlayer;
+import android.media.cts.R;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Handler;
@@ -270,9 +272,7 @@ public class AudioFocusTest extends CtsAndroidTestCase {
         final String simFocusClientId = "fakeClientId";
         try {
             // set up the test conditions: a focus owner is playing media on a MediaPlayer
-            mp = createPreparedMediaPlayer(
-                    Uri.fromFile(new File(WorkDir.getMediaDirString() + "sine1khzs40dblong.mp3")),
-                    mediaAttributes);
+            mp = createPreparedMediaPlayer(R.raw.sine1khzs40dblong, mediaAttributes);
             int res = am.requestAudioFocus(focusRequests[FOCUS_UNDER_TEST]);
             assertEquals("real focus request failed",
                     AudioManager.AUDIOFOCUS_REQUEST_GRANTED, res);
@@ -406,9 +406,7 @@ public class AudioFocusTest extends CtsAndroidTestCase {
         final String simFocusClientId = "fakeClientId";
         try {
             // set up the test conditions: a focus owner is playing media on a MediaPlayer
-            mp = createPreparedMediaPlayer(
-                    Uri.fromFile(new File(WorkDir.getMediaDirString() + "sine1khzs40dblong.mp3")),
-                    playerAttributes);
+            mp = createPreparedMediaPlayer(R.raw.sine1khzs40dblong, playerAttributes);
             int res = am.requestAudioFocus(focusRequests[FOCUS_UNDER_TEST]);
             assertEquals("real focus request failed",
                     AudioManager.AUDIOFOCUS_REQUEST_GRANTED, res);
@@ -553,12 +551,18 @@ public class AudioFocusTest extends CtsAndroidTestCase {
     }
 
     private @Nullable MediaPlayer createPreparedMediaPlayer(
-            Uri uri, AudioAttributes aa) throws Exception {
+            int resid, AudioAttributes aa) throws Exception {
         final TestUtils.Monitor onPreparedCalled = new TestUtils.Monitor();
+        AssetFileDescriptor afd = getContext().getResources().openRawResourceFd(resid);
+        assertNotNull(afd);
 
         MediaPlayer mp = new MediaPlayer();
         mp.setAudioAttributes(aa);
-        mp.setDataSource(getContext(), uri);
+        try {
+            mp.setDataSource(afd.getFileDescriptor(), afd.getStartOffset(), afd.getLength());
+        } finally {
+            afd.close();
+        }
         mp.setOnPreparedListener(mp1 -> onPreparedCalled.signal());
         mp.prepare();
         onPreparedCalled.waitForSignal(MEDIAPLAYER_PREPARE_TIMEOUT_MS);
diff --git a/tools/cts-tradefed/res/config/cts-known-failures.xml b/tools/cts-tradefed/res/config/cts-known-failures.xml
index 731b0bcc80b..d0d0961a999 100644
--- a/tools/cts-tradefed/res/config/cts-known-failures.xml
+++ b/tools/cts-tradefed/res/config/cts-known-failures.xml
@@ -262,4 +262,11 @@
     <option name="compatibility:exclude-filter" value="CtsDevicePolicyManagerTestCases com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testSetCameraDisabledLogged" />
     <option name="compatibility:exclude-filter" value="CtsDevicePolicyManagerTestCases com.android.cts.devicepolicy.MixedProfileOwnerTest#testSetCameraDisabledLogged" />
 
+    <!-- b/204427048 -->
+    <option name="compatibility:exclude-filter" value="CtsTelephonyTestCases android.telephony.ims.cts.RcsUceAdapterTest#testRequestCapabilitiesWithUriFormatChanged" />
+    <option name="compatibility:exclude-filter" value="CtsTelephonyTestCases android.telephony.ims.cts.RcsUceAdapterTest#testCapabilitiesRequestWithResponseError" />
+    <option name="compatibility:exclude-filter" value="CtsTelephonyTestCases android.telephony.ims.cts.RcsUceAdapterTest#testRequestCapabilitiesWithPresenceMechanism" />
+    <option name="compatibility:exclude-filter" value="CtsTelephonyTestCases android.telephony.ims.cts.RcsUceAdapterTest#testForbidCapabilitiesRequest" />
+    <option name="compatibility:exclude-filter" value="CtsTelephonyTestCases android.telephony.ims.cts.RcsUceAdapterTest#testTimeoutToRequestCapabilitiesWithPresenceMechanism" />
+
 </configuration>