Merge "Eleven: Fix crash when launching a song from file manager" into cm-12.0 (78e67f2f) · Commits · e / os / android_packages_apps_Eleven

src/com/cyanogenmod/eleven/MusicPlaybackService.java

+87 −85

Original line number	Diff line number	Diff line
		@@ -1089,7 +1089,7 @@ public class MusicPlaybackService extends Service {
		return c;
		}

		private void closeCursor() {
		private synchronized void closeCursor() {
		if (mCursor != null) {
		mCursor.close();
		mCursor = null;
		@@ -2735,6 +2735,7 @@ public class MusicPlaybackService extends Service {
		return;
		}

		synchronized (service) {
		switch (msg.what) {
		case FADEDOWN:
		mCurrentVolume -= .05f;
		@@ -2766,6 +2767,7 @@ public class MusicPlaybackService extends Service {
		service.setNextTrack();
		if (service.mCursor != null) {
		service.mCursor.close();
		service.mCursor = null;
		}
		service.updateCursor(service.mPlaylist.get(service.mPlayPos).mId);
		service.notifyChange(META_CHANGED);
		@@ -2821,6 +2823,7 @@ public class MusicPlaybackService extends Service {
		}
		}
		}
		}

		private static final class Shuffler {

		@@ -3058,7 +3061,6 @@ public class MusicPlaybackService extends Service {
		* Releases resources associated with this MediaPlayer object.
		*/
		public void release() {
		stop();
		mCurrentMediaPlayer.release();
		mSrtManager.release();
		mSrtManager = null;

+7 −10

Original line number	Diff line number	Diff line
		@@ -61,16 +61,13 @@ public abstract class SrtManager implements Handler.Callback {
		}

		public synchronized void release() {
		reset();
		if (mHandlerThread != null) {
		mHandler.removeMessages(POST_TEXT_MSG);
		mHandler.removeCallbacks(mLoader);
		mHandler = null;
		mHandlerThread.quit();
		mHandlerThread = null;
		}

		@Override
		protected void finalize() throws Throwable {
		super.finalize();
		mHandlerThread.quit();
		mHandlerThread = null;
		}

		public synchronized void initialize(final MediaPlayer player, final File f) {