Snap for 6664824 from 51f634384555fc99ef5ed3e708efaba18be0f1de to mainline-releaseandroid-mainline-11.0.0_r1

Change-Id: I643e757cac4835834c0a542dcc7b634a58e996ee

6 files changed, 39 insertions, 2 deletions

diff --git a/common/device-side/util-axt/src/com/android/compatibility/common/util/BlockedNumberService.java b/common/device-side/util-axt/src/com/android/compatibility/common/util/BlockedNumberService.java
index bb273609409..08ae77e1d06 100644
--- a/common/device-side/util-axt/src/com/android/compatibility/common/util/BlockedNumberService.java
+++ b/common/device-side/util-axt/src/com/android/compatibility/common/util/BlockedNumberService.java
@@ -94,8 +94,12 @@ public class BlockedNumberService extends IntentService {
 
         // Wait for the content provider to be updated.
         try {
-            blockedNumberLatch.await(ASYNC_TIMEOUT, TimeUnit.MILLISECONDS);
+            if (!blockedNumberLatch.await(ASYNC_TIMEOUT, TimeUnit.MILLISECONDS)) {
+                Log.e(TAG, "Timed out waiting for blocked number update");
+                bundle.putBoolean(FAIL_EXTRA, true);
+            }
         } catch (InterruptedException e) {
+            Log.e(TAG, "Interrupted while waiting for blocked number update");
             bundle.putBoolean(FAIL_EXTRA, true);
         }
         return bundle;
diff --git a/tests/tests/media/res/raw/tags.mp4 b/tests/tests/media/res/raw/tags.mp4
new file mode 100644
index 00000000000..4e7dc434cef
--- /dev/null
+++ b/tests/tests/media/res/raw/tags.mp4
diff --git a/tests/tests/media/src/android/media/cts/MediaMetadataRetrieverTest.java b/tests/tests/media/src/android/media/cts/MediaMetadataRetrieverTest.java
index 48208d9f63e..79a68181a9d 100644
--- a/tests/tests/media/src/android/media/cts/MediaMetadataRetrieverTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaMetadataRetrieverTest.java
@@ -380,6 +380,31 @@ public class MediaMetadataRetrieverTest extends AndroidTestCase {
                 mRetriever.getEmbeddedPicture());
     }
 
+    public void testMp4Metadata() {
+        setDataSourceFd(R.raw.tags);
+        assertEquals("Wrong title",
+                "the title",
+                mRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_TITLE));
+        assertEquals("Wrong artist",
+                "the artist",
+                mRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_ARTIST));
+        assertEquals("Wrong album",
+                "the album",
+                mRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_ALBUM));
+        assertEquals("Wrong album artist",
+                "the album artist",
+                mRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_ALBUMARTIST));
+        assertEquals("Wrong composer",
+                "the composer",
+                mRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_COMPOSER));
+        assertEquals("Wrong genre",
+                "custom genre",
+                mRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_GENRE));
+        assertEquals("Wrong year",
+                "2020",
+                mRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_YEAR));
+    }
+
     public void testMp4AlbumArt() {
         setDataSourceFd(R.raw.swirl_128x128_h264_albumart);
         assertEquals("Mime type was other than expected",
diff --git a/tests/tests/permission/AppThatDefinesUndefinedPermissionGroupElement/AndroidManifest.xml b/tests/tests/permission/AppThatDefinesUndefinedPermissionGroupElement/AndroidManifest.xml
index 171d331ee47..ab2ef79b234 100644
--- a/tests/tests/permission/AppThatDefinesUndefinedPermissionGroupElement/AndroidManifest.xml
+++ b/tests/tests/permission/AppThatDefinesUndefinedPermissionGroupElement/AndroidManifest.xml
@@ -31,7 +31,8 @@
     <application android:label="CtsPermissionUnknownGroup">
         <activity
             android:name=".RequestPermissions"
-            android:exported="true"/>
+            android:exported="true"
+            android:visibleToInstantApps="true"/>
     </application>
 </manifest>
 
diff --git a/tests/tests/telecom/src/android/telecom/cts/ExtendedInCallServiceTest.java b/tests/tests/telecom/src/android/telecom/cts/ExtendedInCallServiceTest.java
index 8185462ab9d..e6a9c059712 100644
--- a/tests/tests/telecom/src/android/telecom/cts/ExtendedInCallServiceTest.java
+++ b/tests/tests/telecom/src/android/telecom/cts/ExtendedInCallServiceTest.java
@@ -382,6 +382,7 @@ public class ExtendedInCallServiceTest extends BaseTelecomTestWithMockServices {
         Uri blockedUri = null;
 
         try {
+            TestUtils.executeShellCommand(getInstrumentation(), "telecom stop-block-suppression");
             Uri testNumberUri = createTestNumber();
             blockedUri = blockNumber(testNumberUri);
 
diff --git a/tests/tests/telecom/src/android/telecom/cts/PhoneAccountOperationsTest.java b/tests/tests/telecom/src/android/telecom/cts/PhoneAccountOperationsTest.java
index ebdbf8993c3..5815aed349f 100644
--- a/tests/tests/telecom/src/android/telecom/cts/PhoneAccountOperationsTest.java
+++ b/tests/tests/telecom/src/android/telecom/cts/PhoneAccountOperationsTest.java
@@ -27,6 +27,7 @@ import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
 import android.test.InstrumentationTestCase;
+import android.text.TextUtils;
 
 import com.android.compatibility.common.util.ShellIdentityUtils;
 
@@ -113,6 +114,10 @@ public class PhoneAccountOperationsTest extends InstrumentationTestCase {
         if (!TestUtils.shouldTestTelecom(mContext)) {
             return;
         }
+        // We do not expect CTS to be the default dialer, since it confers some permissions that we
+        // explicitly assume that we don't hold during testing.
+        TestUtils.setDefaultDialer(getInstrumentation(), "");
+
         mTelecomManager = (TelecomManager) mContext.getSystemService(Context.TELECOM_SERVICE);
         mPhoneAccountRegisteredLatch = new TestUtils.InvokeCounter("registerPhoneAcct");
         mPhoneAccountUnRegisteredLatch = new TestUtils.InvokeCounter("unRegisterPhoneAcct");
@@ -127,6 +132,7 @@ public class PhoneAccountOperationsTest extends InstrumentationTestCase {
         PhoneAccount retrievedPhoneAccount = mTelecomManager.getPhoneAccount(
                 TEST_PHONE_ACCOUNT_HANDLE);
         assertNull("Test account not deregistered.", retrievedPhoneAccount);
+
         super.tearDown();
     }