am 015ec39d: am 5985d106: am c7dd6640: Merge "Fix audio focus evaluation order... (05729545) · Commits · e / os / android_frameworks_base

media/java/android/media/AudioService.java

+14 −8

Original line number	Diff line number	Diff line
		@@ -5088,19 +5088,24 @@ public class AudioService extends IAudioService.Stub implements OnFinished {
		// top of the stack for the media button event receivers : simply using the top of the
		// stack would make the entry disappear from the RemoteControlDisplay in conditions such as
		// notifications playing during music playback.
		// crawl the AudioFocus stack until an entry is found with the following characteristics:
		// Crawl the AudioFocus stack from the top until an entry is found with the following
		// characteristics:
		// - focus gain on STREAM_MUSIC stream
		// - non-transient focus gain on a stream other than music
		FocusStackEntry af = null;
		Iterator<FocusStackEntry> stackIterator = mFocusStack.iterator();
		while(stackIterator.hasNext()) {
		FocusStackEntry fse = (FocusStackEntry)stackIterator.next();
		try {
		for (int index = mFocusStack.size()-1; index >= 0; index--) {
		FocusStackEntry fse = mFocusStack.elementAt(index);
		if ((fse.mStreamType == AudioManager.STREAM_MUSIC)
		\|\| (fse.mFocusChangeType == AudioManager.AUDIOFOCUS_GAIN)) {
		af = fse;
		break;
		}
		}
		} catch (ArrayIndexOutOfBoundsException e) {
		Log.e(TAG, "Wrong index accessing audio focus stack when updating RCD: " + e);
		af = null;
		}
		if (af == null) {
		clearRemoteControlDisplay_syncAfRcs();
		return;
		@@ -5120,6 +5125,7 @@ public class AudioService extends IAudioService.Stub implements OnFinished {
		clearRemoteControlDisplay_syncAfRcs();
		return;
		}

		// refresh conditions were verified: update the remote controls
		// ok to call: synchronized mAudioFocusLock then on mRCStack, mRCStack is not empty
		updateRemoteControlDisplay_syncAfRcs(infoChangedFlags);