Merge "Audio focus: fix delayed focus request during locked focus behavior" (ea3257d7) · Commits · e / os / android_frameworks_base

media/java/android/media/AudioManager.java

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -4003,8 +4003,7 @@ public class AudioManager {
	* @hide		* @hide
	* flag set on test API calls,		* flag set on test API calls,
	* see {@link #requestAudioFocusForTest(AudioFocusRequest, String, int, int)},		* see {@link #requestAudioFocusForTest(AudioFocusRequest, String, int, int)},
	* note that it isn't used in conjunction with other flags, it is passed as the single		*/
	* value for flags */
	public static final int AUDIOFOCUS_FLAG_TEST = 0x1 << 3;		public static final int AUDIOFOCUS_FLAG_TEST = 0x1 << 3;
	/** @hide */		/** @hide */
	public static final int AUDIOFOCUS_FLAGS_APPS = AUDIOFOCUS_FLAG_DELAY_OK		public static final int AUDIOFOCUS_FLAGS_APPS = AUDIOFOCUS_FLAG_DELAY_OK
	@@ -4187,7 +4186,9 @@ public class AudioManager {
	afr.getFocusGain(),		afr.getFocusGain(),
	mICallBack,		mICallBack,
	mAudioFocusDispatcher,		mAudioFocusDispatcher,
	clientFakeId, "com.android.test.fakeclient", clientFakeUid, clientTargetSdk);		clientFakeId, "com.android.test.fakeclient",
			afr.getFlags() \| AudioManager.AUDIOFOCUS_FLAG_TEST,
			clientFakeUid, clientTargetSdk);
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowFromSystemServer();
	}		}

media/java/android/media/IAudioService.aidl

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -384,7 +384,7 @@ interface IAudioService {

	int requestAudioFocusForTest(in AudioAttributes aa, int durationHint, IBinder cb,		int requestAudioFocusForTest(in AudioAttributes aa, int durationHint, IBinder cb,
	in IAudioFocusDispatcher fd, in String clientId, in String callingPackageName,		in IAudioFocusDispatcher fd, in String clientId, in String callingPackageName,
	int uid, int sdk);		int flags, int uid, int sdk);

	int abandonAudioFocusForTest(in IAudioFocusDispatcher fd, in String clientId,		int abandonAudioFocusForTest(in IAudioFocusDispatcher fd, in String clientId,
	in AudioAttributes aa, in String callingPackageName);		in AudioAttributes aa, in String callingPackageName);

services/core/java/com/android/server/audio/AudioService.java

+5 −2

services/core/java/com/android/server/audio/MediaFocusControl.java

+36 −7

Original line number	Original line	Diff line number	Diff line
	@@ -461,11 +461,17 @@ public class MediaFocusControl implements PlayerFocusEnforcer {
	* at the top of the focus stack		* at the top of the focus stack
	* Push the focus requester onto the audio focus stack at the first position immediately		* Push the focus requester onto the audio focus stack at the first position immediately
	* following the locked focus owners.		* following the locked focus owners.
			* Propagate through the stack the changes that the new (future) focus owner causes.
			* @param nfr the future focus owner that will gain focus when the locked focus owners are
			* removed from the stack
	* @return {@link AudioManager#AUDIOFOCUS_REQUEST_GRANTED} or		* @return {@link AudioManager#AUDIOFOCUS_REQUEST_GRANTED} or
	* {@link AudioManager#AUDIOFOCUS_REQUEST_DELAYED}		* {@link AudioManager#AUDIOFOCUS_REQUEST_DELAYED}
	*/		*/
	@GuardedBy("mAudioFocusLock")		@GuardedBy("mAudioFocusLock")
	private int pushBelowLockedFocusOwners(FocusRequester nfr) {		private int pushBelowLockedFocusOwnersAndPropagate(FocusRequester nfr) {
			if (DEBUG) {
			Log.v(TAG, "pushBelowLockedFocusOwnersAndPropagate client=" + nfr.getClientId());
			}
	int lastLockedFocusOwnerIndex = mFocusStack.size();		int lastLockedFocusOwnerIndex = mFocusStack.size();
	for (int index = mFocusStack.size() - 1; index >= 0; index--) {		for (int index = mFocusStack.size() - 1; index >= 0; index--) {
	if (isLockedFocusOwner(mFocusStack.elementAt(index))) {		if (isLockedFocusOwner(mFocusStack.elementAt(index))) {
	@@ -480,10 +486,33 @@ public class MediaFocusControl implements PlayerFocusEnforcer {
	propagateFocusLossFromGain_syncAf(nfr.getGainRequest(), nfr, false /forceDuck/);		propagateFocusLossFromGain_syncAf(nfr.getGainRequest(), nfr, false /forceDuck/);
	mFocusStack.push(nfr);		mFocusStack.push(nfr);
	return AudioManager.AUDIOFOCUS_REQUEST_GRANTED;		return AudioManager.AUDIOFOCUS_REQUEST_GRANTED;
	} else {		}

			if (DEBUG) {
			Log.v(TAG, "> lastLockedFocusOwnerIndex=" + lastLockedFocusOwnerIndex);
			}
	mFocusStack.insertElementAt(nfr, lastLockedFocusOwnerIndex);		mFocusStack.insertElementAt(nfr, lastLockedFocusOwnerIndex);
	return AudioManager.AUDIOFOCUS_REQUEST_DELAYED;
			// propagate potential focus loss (and removal from stack) after the newly
			// inserted FocusRequester (at index lastLockedFocusOwnerIndex-1)
			final List<String> clientsToRemove = new LinkedList<String>();
			for (int index = lastLockedFocusOwnerIndex - 1; index >= 0; index--) {
			final boolean isDefinitiveLoss =
			mFocusStack.elementAt(index).handleFocusLossFromGain(
			nfr.getGainRequest(), nfr, false /forceDuck/);
			if (isDefinitiveLoss) {
			clientsToRemove.add(mFocusStack.elementAt(index).getClientId());
			}
			}
			for (String clientToRemove : clientsToRemove) {
			if (DEBUG) {
			Log.v(TAG, "> removing focus client " + clientToRemove);
	}		}
			removeFocusStackEntry(clientToRemove, false /signal/,
			true /notifyFocusFollowers/);
			}

			return AudioManager.AUDIOFOCUS_REQUEST_DELAYED;
	}		}

	/**		/**
	@@ -868,7 +897,7 @@ public class MediaFocusControl implements PlayerFocusEnforcer {
	* @param forceDuck only true if		* @param forceDuck only true if
	* {@link android.media.AudioFocusRequest.Builder#setFocusGain(int)} was set to true for		* {@link android.media.AudioFocusRequest.Builder#setFocusGain(int)} was set to true for
	* accessibility.		* accessibility.
	* @param testUid ignored if flags is not AudioManager.AUDIOFOCUS_FLAG_TEST (strictly equals to)		* @param testUid ignored if flags doesn't contain AudioManager.AUDIOFOCUS_FLAG_TEST
	* otherwise the UID being injected for testing		* otherwise the UID being injected for testing
	* @return		* @return
	*/		*/
	@@ -1029,7 +1058,7 @@ public class MediaFocusControl implements PlayerFocusEnforcer {
	if (focusGrantDelayed) {		if (focusGrantDelayed) {
	// focusGrantDelayed being true implies we can't reassign focus right now		// focusGrantDelayed being true implies we can't reassign focus right now
	// which implies the focus stack is not empty.		// which implies the focus stack is not empty.
	final int requestResult = pushBelowLockedFocusOwners(nfr);		final int requestResult = pushBelowLockedFocusOwnersAndPropagate(nfr);
	if (requestResult != AudioManager.AUDIOFOCUS_REQUEST_FAILED) {		if (requestResult != AudioManager.AUDIOFOCUS_REQUEST_FAILED) {
	notifyExtPolicyFocusGrant_syncAf(nfr.toAudioFocusInfo(), requestResult);		notifyExtPolicyFocusGrant_syncAf(nfr.toAudioFocusInfo(), requestResult);
	}		}