[RESTRICT AUTOMERGE]Revert "Add test to enforce component name belongs to caller app"
This reverts commit e701a82ea33d55f3299a338a273c227f9b7999e5.
Reason for revert: this test is a dup of ag/20262430
bug: 243696025
Test: sts-tradefed
Change-Id: I80a5ce892d730e278e9a8a65361e0f6062218e26
(cherry picked from commit 9bb4a5e04482d96a68c8bb72b03fdae6e42df460)
diff --git a/tests/tests/media/Android.bp b/tests/tests/media/Android.bp
index fccba68..61a2596 100644
--- a/tests/tests/media/Android.bp
+++ b/tests/tests/media/Android.bp
@@ -96,7 +96,6 @@
"cts",
"general-tests",
"mts-media",
- "sts",
],
host_required: ["cts-dynamic-config"],
min_sdk_version: "29",
diff --git a/tests/tests/media/src/android/media/cts/MediaSessionTest.java b/tests/tests/media/src/android/media/cts/MediaSessionTest.java
index 3e54306..016c9ba 100644
--- a/tests/tests/media/src/android/media/cts/MediaSessionTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaSessionTest.java
@@ -29,7 +29,6 @@
import android.app.PendingIntent;
import android.content.ComponentName;
import android.content.Context;
-import android.content.ContextWrapper;
import android.content.Intent;
import android.media.AudioAttributes;
import android.media.AudioManager;
@@ -50,7 +49,6 @@
import android.os.Parcel;
import android.os.Process;
import android.platform.test.annotations.AppModeFull;
-import android.platform.test.annotations.AsbSecurityTest;
import android.test.AndroidTestCase;
import android.text.TextUtils;
import android.view.KeyEvent;
@@ -80,11 +78,6 @@
private static final long TEST_ACTION = 55L;
private static final int TEST_TOO_MANY_SESSION_COUNT = 1000;
- private static final String TEST_SESSION_TAG_FOREIGN_PACKAGE =
- "test-session-tag-foreign-package";
- private static final String TEST_FOREIGN_PACKAGE_NAME = "fakepackage";
- private static final String TEST_FOREIGN_PACKAGE_CLASS = "com.fakepackage.media.FakeReceiver";
-
private AudioManager mAudioManager;
private Handler mHandler = new Handler(Looper.getMainLooper());
private Object mWaitLock = new Object();
@@ -312,46 +305,6 @@
}
}
- @AsbSecurityTest(cveBugId = 238177121)
- public void testSetMediaButtonBroadcastReceiver_withForeignPackageName_fails()
- throws Exception {
- Utils.assertMediaPlaybackStarted(getContext());
-
- // Create Media Session
- MyContextWrapper contextWrapper = new MyContextWrapper(getContext());
- MediaSession mediaSession =
- new MediaSession(contextWrapper, TEST_SESSION_TAG_FOREIGN_PACKAGE);
-
- // Bypass client-side check
- contextWrapper.mOverridePackageName = TEST_FOREIGN_PACKAGE_NAME;
-
- try {
- mediaSession.setMediaButtonBroadcastReceiver(
- new ComponentName(TEST_FOREIGN_PACKAGE_NAME, TEST_FOREIGN_PACKAGE_CLASS));
- fail("Component name with different package name was registered.");
- } catch (IllegalArgumentException ex) {
- // Expected.
- } finally {
- mediaSession.release();
- }
- }
-
- static class MyContextWrapper extends ContextWrapper {
- String mOverridePackageName;
-
- MyContextWrapper(Context base) {
- super(base);
- }
-
- @Override
- public String getPackageName() {
- if (mOverridePackageName != null) {
- return mOverridePackageName;
- }
- return super.getPackageName();
- }
- }
-
/**
* Test whether media button receiver can be a explicit broadcast receiver via
* MediaSession.setMediaButtonReceiver(PendingIntent).
