diff options
5 files changed, 0 insertions, 47 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 043278aa0fd2..eb2ba0e247b7 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -10619,7 +10619,6 @@ package android.content { field public static final String ACTION_SEND_MULTIPLE = "android.intent.action.SEND_MULTIPLE"; field public static final String ACTION_SET_WALLPAPER = "android.intent.action.SET_WALLPAPER"; field public static final String ACTION_SHOW_APP_INFO = "android.intent.action.SHOW_APP_INFO"; - field public static final String ACTION_SHOW_OUTPUT_SWITCHER = "android.intent.action.SHOW_OUTPUT_SWITCHER"; field public static final String ACTION_SHOW_WORK_APPS = "android.intent.action.SHOW_WORK_APPS"; field public static final String ACTION_SHUTDOWN = "android.intent.action.ACTION_SHUTDOWN"; field public static final String ACTION_SYNC = "android.intent.action.SYNC"; diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 4318c3993b13..77cf49daa772 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -3587,17 +3587,6 @@ public class Intent implements Parcelable, Cloneable { public static final String ACTION_MEDIA_BUTTON = "android.intent.action.MEDIA_BUTTON"; /** - * Broadcast action: Launch System output switcher. Includes a single extra field, - * {@link #EXTRA_PACKAGE_NAME}, which specifies the package name of the calling app - * so that the system can get the corresponding MediaSession for the output switcher. - * - * @see #EXTRA_PACKAGE_NAME - */ - @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) - public static final String ACTION_SHOW_OUTPUT_SWITCHER = - "android.intent.action.SHOW_OUTPUT_SWITCHER"; - - /** * Broadcast Action: The "Camera Button" was pressed. Includes a single * extra field, {@link #EXTRA_KEY_EVENT}, containing the key event that * caused the broadcast. diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index 4e620cd178b2..90d34880d78c 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -1004,7 +1004,6 @@ <action android:name="com.android.systemui.action.LAUNCH_MEDIA_OUTPUT_DIALOG" /> <action android:name="com.android.systemui.action.LAUNCH_MEDIA_OUTPUT_BROADCAST_DIALOG" /> <action android:name="com.android.systemui.action.DISMISS_MEDIA_OUTPUT_DIALOG" /> - <action android:name="android.intent.action.SHOW_OUTPUT_SWITCHER" /> </intent-filter> </receiver> diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialogReceiver.kt b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialogReceiver.kt index 55fce592a409..760a42cc512c 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialogReceiver.kt +++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialogReceiver.kt @@ -36,10 +36,6 @@ class MediaOutputDialogReceiver @Inject constructor( ) : BroadcastReceiver() { override fun onReceive(context: Context, intent: Intent) { when { - TextUtils.equals(Intent.ACTION_SHOW_OUTPUT_SWITCHER, intent.action) -> { - val packageName: String? = intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME) - launchMediaOutputDialogIfPossible(packageName) - } TextUtils.equals( MediaOutputConstants.ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG, intent.action) -> { val packageName: String? = diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputDialogReceiverTest.java b/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputDialogReceiverTest.java index 771b986d1c1e..3d5dba3b9efc 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputDialogReceiverTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputDialogReceiverTest.java @@ -54,36 +54,6 @@ public class MediaOutputDialogReceiverTest extends SysuiTestCase { } @Test - public void showOutputSwitcher_ExtraPackageName_DialogFactoryCalled() { - Intent intent = new Intent(Intent.ACTION_SHOW_OUTPUT_SWITCHER); - intent.putExtra(Intent.EXTRA_PACKAGE_NAME, getContext().getPackageName()); - mMediaOutputDialogReceiver.onReceive(getContext(), intent); - - verify(mMockMediaOutputDialogFactory, times(1)) - .create(getContext().getPackageName(), false, null); - verify(mMockMediaOutputBroadcastDialogFactory, never()).create(any(), anyBoolean(), any()); - } - - @Test - public void showOutputSwitcher_WrongExtraKey_DialogFactoryNotCalled() { - Intent intent = new Intent(Intent.ACTION_SHOW_OUTPUT_SWITCHER); - intent.putExtra("Wrong Package Name Key", getContext().getPackageName()); - mMediaOutputDialogReceiver.onReceive(getContext(), intent); - - verify(mMockMediaOutputDialogFactory, never()).create(any(), anyBoolean(), any()); - verify(mMockMediaOutputBroadcastDialogFactory, never()).create(any(), anyBoolean(), any()); - } - - @Test - public void showOutputSwitcher_NoExtra_DialogFactoryNotCalled() { - Intent intent = new Intent(Intent.ACTION_SHOW_OUTPUT_SWITCHER); - mMediaOutputDialogReceiver.onReceive(getContext(), intent); - - verify(mMockMediaOutputDialogFactory, never()).create(any(), anyBoolean(), any()); - verify(mMockMediaOutputBroadcastDialogFactory, never()).create(any(), anyBoolean(), any()); - } - - @Test public void launchMediaOutputDialog_ExtraPackageName_DialogFactoryCalled() { Intent intent = new Intent(MediaOutputConstants.ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG); intent.putExtra(MediaOutputConstants.EXTRA_PACKAGE_NAME, getContext().getPackageName()); |