Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bdc23654 authored Feb 07, 2017 by Jean-Michel Trivi Committed by Android (Google) Code Review Feb 07, 2017

Merge "Audio player delayed start: don't throw exception"

parents 49ddb3d5 10ffc783

media/java/android/media/AudioTrack.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -1956,7 +1956,13 @@ public class AudioTrack extends PlayerBase
		e.printStackTrace();
		}
		baseSetStartDelayMs(0);
		try {
		startImpl();
		} catch (IllegalStateException e) {
		// fail silently for a state exception when it is happening after
		// a delayed start, as the player state could have changed between the
		// call to start() and the execution of startImpl()
		}
		}
		}.start();
		}

media/java/android/media/MediaPlayer.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -1258,7 +1258,13 @@ public class MediaPlayer extends PlayerBase
		e.printStackTrace();
		}
		baseSetStartDelayMs(0);
		try {
		startImpl();
		} catch (IllegalStateException e) {
		// fail silently for a state exception when it is happening after
		// a delayed start, as the player state could have changed between the
		// call to start() and the execution of startImpl()
		}
		}
		}.start();
		}