commit 1a8df26a51be8878e344a3401b56900e9efcef24
author Karsten Tausche <karsten@fairphone.com> Wed Dec 08 11:06:39 2021 +0100
committer Karsten Tausche <karsten@fairphone.com> Wed Dec 08 11:06:39 2021 +0100
tree bc6d8ad1b14429e17b06e0ab83d981f62ec5ac17
parent 56dff1f57a47df62d3514daafb2532eaa9dae02e
parent a9b799933ac0ac3bb88ad4006de45b3bae2f8042

Merge tag 'android-11.0.0_r48' into int/11/fp3

Android 11.0.0 Release 48 (RD2A.211001.002)

* tag 'android-11.0.0_r48':
  Check READ_PRIVILEGED_PHONE_STATE in getAvailableSubscriptionInfoList CTS
  Verify SAF blocks directory access to /sdcard/Android
  [security] SubscriptionGroup is exposed to unprivileged callers

Change-Id: If34724b390a7aa75a8b40b63dcea972915db497e

tests/tests/media/AndroidManifest.xml

diff --git a/tests/tests/media/AndroidManifest.xml b/tests/tests/media/AndroidManifest.xml
index c24f26b..3825d8f 100644
--- a/tests/tests/media/AndroidManifest.xml
+++ b/tests/tests/media/AndroidManifest.xml
@@ -123,7 +123,7 @@
             </intent-filter>
         </activity>
         <activity android:name="android.media.cts.MockActivity" />
-        <activity android:name="android.media.cts.MediaRouter2TestActivity" />
+        <activity android:name="android.media.cts.MediaRouter2TestActivity"/>
         <service android:name="android.media.cts.RemoteVirtualDisplayService"
             android:process=":remoteService" >
             <intent-filter>