From 100af0b2de1846ebca489fa56daa0c8485c0eeca Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Wed, 6 Sep 2023 03:21:27 -0700
Subject: [PATCH] Fix `test_session_current` to be consistent with other test
 packages

This change ensures that a different package is used for
`test_session_current/src/main:support_app` and
`test_session_current/src/androidTest:test_app` - previously they used
the same package which was unusual (and possibly led to some confusing
behaviour).

PiperOrigin-RevId: 563051818
---
 .../src/androidTest/AndroidManifest.xml             | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/libraries/test_session_current/src/androidTest/AndroidManifest.xml b/libraries/test_session_current/src/androidTest/AndroidManifest.xml
index 80315796e7..e2263fbec1 100644
--- a/libraries/test_session_current/src/androidTest/AndroidManifest.xml
+++ b/libraries/test_session_current/src/androidTest/AndroidManifest.xml
@@ -14,6 +14,17 @@
      limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="androidx.media3.test.session.test">
-  <uses-sdk android:minSdkVersion="16"/>
+  <uses-sdk />
+
+  <application
+      android:name="androidx.multidex.MultiDexApplication"
+      android:allowBackup="false"
+      tools:ignore="MissingApplicationIcon,HardcodedDebugMode"
+      android:usesCleartextTraffic="true" >
+
+  <activity android:name="androidx.media3.test.session.common.SurfaceActivity"
+    android:configChanges="keyboardHidden|orientation|screenSize"/>
+  </application>
 </manifest>