Merge "AudioService: updates to death of focus requester" (3693be0b) · Commits · e / os / android_frameworks_base

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -140,6 +140,10 @@ public class FocusRequester {
		return (mFocusDispatcher != null) && mFocusDispatcher.equals(fd);
		}

		@NonNull String getPackageName() {
		return mPackageName;
		}

		boolean hasSamePackage(@NonNull String pack) {
		return mPackageName.compareTo(pack) == 0;
		}

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

+14 −2

Original line number	Diff line number	Diff line
		@@ -353,6 +353,13 @@ public class MediaFocusControl implements PlayerFocusEnforcer {
		FocusRequester fr = stackIterator.next();
		if(fr.hasSameBinder(cb)) {
		Log.i(TAG, "AudioFocus removeFocusStackEntryOnDeath(): removing entry for " + cb);
		mEventLogger.log(new AudioEventLogger.StringEvent(
		"focus requester:" + fr.getClientId()
		+ " in uid:" + fr.getClientUid()
		+ " pack:" + fr.getPackageName()
		+ " died"));
		notifyExtPolicyFocusLoss_syncAf(fr.toAudioFocusInfo(), false);

		stackIterator.remove();
		// stack entry not used anymore, clear references
		fr.release();
		@@ -371,7 +378,7 @@ public class MediaFocusControl implements PlayerFocusEnforcer {
		* it has died.
		*/
		@GuardedBy("mAudioFocusLock")
		private void removeFocusEntryForExtPolicy(IBinder cb) {
		private void removeFocusEntryForExtPolicyOnDeath(IBinder cb) {
		if (mFocusOwnersForFocusPolicy.isEmpty()) {
		return;
		}
		@@ -383,6 +390,11 @@ public class MediaFocusControl implements PlayerFocusEnforcer {
		final FocusRequester fr = owner.getValue();
		if (fr.hasSameBinder(cb)) {
		ownerIterator.remove();
		mEventLogger.log(new AudioEventLogger.StringEvent(
		"focus requester:" + fr.getClientId()
		+ " in uid:" + fr.getClientUid()
		+ " pack:" + fr.getPackageName()
		+ " died"));
		fr.release();
		notifyExtFocusPolicyFocusAbandon_syncAf(fr.toAudioFocusInfo());
		break;
		@@ -456,7 +468,7 @@ public class MediaFocusControl implements PlayerFocusEnforcer {
		public void binderDied() {
		synchronized(mAudioFocusLock) {
		if (mFocusPolicy != null) {
		removeFocusEntryForExtPolicy(mCb);
		removeFocusEntryForExtPolicyOnDeath(mCb);
		} else {
		removeFocusStackEntryOnDeath(mCb);
		if (mMultiAudioFocusEnabled && !mMultiAudioFocusList.isEmpty()) {