Merge "Audio service: always unduck focus requester when granted" into oc-dev am: 8e3a8a7027 (ac6fb79b) · Commits · e / os / android_frameworks_base

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

+10 −1

Original line number	Diff line number	Diff line
		@@ -322,14 +322,23 @@ public class FocusRequester {
		if (mFocusLossWasNotified) {
		fd.dispatchAudioFocusChange(focusGain, mClientId);
		}
		mFocusController.unduckPlayers(this);
		}
		mFocusController.unduckPlayers(this);
		mFocusLossWasNotified = false;
		} catch (android.os.RemoteException e) {
		Log.e(TAG, "Failure to signal gain of audio focus due to: ", e);
		}
		}

		/**
		* Called synchronized on MediaFocusControl.mAudioFocusLock
		*/
		void handleFocusGainFromRequest(int focusRequestResult) {
		if (focusRequestResult == AudioManager.AUDIOFOCUS_REQUEST_GRANTED) {
		mFocusController.unduckPlayers(this);
		}
		}

		/**
		* Called synchronized on MediaFocusControl.mAudioFocusLock
		*/

+1 −0

Original line number	Diff line number	Diff line
		@@ -752,6 +752,7 @@ public class MediaFocusControl implements PlayerFocusEnforcer {

		// push focus requester at the top of the audio focus stack
		mFocusStack.push(nfr);
		nfr.handleFocusGainFromRequest(AudioManager.AUDIOFOCUS_REQUEST_GRANTED);
		}
		notifyExtPolicyFocusGrant_syncAf(nfr.toAudioFocusInfo(),
		AudioManager.AUDIOFOCUS_REQUEST_GRANTED);