Merge "Fix bug 2659754 ConcurrentModificationException in audio focus changes" (2c3bf8e9) · Commits · e / os / android_frameworks_base

media/java/android/media/AudioService.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -2496,7 +2496,7 @@ public class AudioService extends IAudioService.Stub {
		if(fse.mClientId.equals(clientToRemove)) {
		Log.i(TAG, " AudioFocus abandonAudioFocus(): removing entry for "
		+ fse.mClientId);
		mFocusStack.remove(fse);
		stackIterator.remove();
		}
		}
		}
		@@ -2516,7 +2516,7 @@ public class AudioService extends IAudioService.Stub {
		if(fse.mSourceRef.equals(cb)) {
		Log.i(TAG, " AudioFocus abandonAudioFocus(): removing entry for "
		+ fse.mClientId);
		mFocusStack.remove(fse);
		stackIterator.remove();
		}
		}
		if (isTopOfStackForClientToRemove) {
		@@ -2789,7 +2789,7 @@ public class AudioService extends IAudioService.Stub {
		while(stackIterator.hasNext()) {
		RemoteControlStackEntry rcse = (RemoteControlStackEntry)stackIterator.next();
		if(rcse.mReceiverComponent.equals(newReceiver)) {
		mRCStack.remove(rcse);
		stackIterator.remove();
		break;
		}
		}
		@@ -2809,7 +2809,7 @@ public class AudioService extends IAudioService.Stub {
		while(stackIterator.hasNext()) {
		RemoteControlStackEntry rcse = (RemoteControlStackEntry)stackIterator.next();
		if(rcse.mReceiverComponent.equals(newReceiver)) {
		mRCStack.remove(rcse);
		stackIterator.remove();
		break;
		}
		}