Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eba1f998 authored Mar 07, 2021 by TreeHugger Robot Committed by Automerger Merge Worker Mar 07, 2021

Merge "Remove dispatchMediaKeyEvent API" into sc-dev am: 8b72f15a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13755765

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8b02672fce103cf6a31d746813925a5674916df9

parents 9e91a68e 8b72f15a

core/api/module-lib-current.txt

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -144,7 +144,6 @@ package android.media.session {

	public final class MediaSessionManager {		public final class MediaSessionManager {
	method public void addOnActiveSessionsChangedListener(@Nullable android.content.ComponentName, @NonNull android.os.UserHandle, @NonNull java.util.concurrent.Executor, @NonNull android.media.session.MediaSessionManager.OnActiveSessionsChangedListener);		method public void addOnActiveSessionsChangedListener(@Nullable android.content.ComponentName, @NonNull android.os.UserHandle, @NonNull java.util.concurrent.Executor, @NonNull android.media.session.MediaSessionManager.OnActiveSessionsChangedListener);
	method public void dispatchMediaKeyEvent(@NonNull android.view.KeyEvent);
	method public void dispatchMediaKeyEvent(@NonNull android.view.KeyEvent, boolean);		method public void dispatchMediaKeyEvent(@NonNull android.view.KeyEvent, boolean);
	method public void dispatchMediaKeyEventAsSystemService(@NonNull android.view.KeyEvent);		method public void dispatchMediaKeyEventAsSystemService(@NonNull android.view.KeyEvent);
	method public boolean dispatchMediaKeyEventToSessionAsSystemService(@NonNull android.view.KeyEvent, @NonNull android.media.session.MediaSession.Token);		method public boolean dispatchMediaKeyEventToSessionAsSystemService(@NonNull android.view.KeyEvent, @NonNull android.media.session.MediaSession.Token);

media/java/android/media/session/MediaSessionManager.java

+0 −11

Original line number	Original line	Diff line number	Diff line
	@@ -537,17 +537,6 @@ public final class MediaSessionManager {
	}		}
	}		}

	/**
	* Sends a media key event. The receiver will be selected automatically.
	*
	* @param keyEvent the key event to send
	* @hide
	*/
	@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
	public void dispatchMediaKeyEvent(@NonNull KeyEvent keyEvent) {
	dispatchMediaKeyEventInternal(keyEvent, /asSystemService=/false, /needWakeLock=/false);
	}

	/**		/**
	* Sends a media key event. The receiver will be selected automatically.		* Sends a media key event. The receiver will be selected automatically.
	*		*