Merge "Fix: Missed parcel recycling in MediaPlayer." into jb-dev (3b5fdf51) · Commits · e / os / android_frameworks_base

media/java/android/media/MediaPlayer.java

+39 −19

Original line number	Diff line number	Diff line
		@@ -743,9 +743,14 @@ public class MediaPlayer
		}
		Parcel request = Parcel.obtain();
		Parcel reply = Parcel.obtain();
		try {
		request.writeInterfaceToken(IMEDIA_PLAYER);
		request.writeInt(INVOKE_ID_SET_VIDEO_SCALE_MODE);
		invoke(request, reply);
		} finally {
		request.recycle();
		reply.recycle();
		}
		}

		/**
		@@ -1642,11 +1647,16 @@ public class MediaPlayer
		public TrackInfo[] getTrackInfo() throws IllegalStateException {
		Parcel request = Parcel.obtain();
		Parcel reply = Parcel.obtain();
		try {
		request.writeInterfaceToken(IMEDIA_PLAYER);
		request.writeInt(INVOKE_ID_GET_TRACK_INFO);
		invoke(request, reply);
		TrackInfo trackInfo[] = reply.createTypedArray(TrackInfo.CREATOR);
		return trackInfo;
		} finally {
		request.recycle();
		reply.recycle();
		}
		}

		/* Do not change these values without updating their counterparts
		@@ -1791,6 +1801,7 @@ public class MediaPlayer

		Parcel request = Parcel.obtain();
		Parcel reply = Parcel.obtain();
		try {
		request.writeInterfaceToken(IMEDIA_PLAYER);
		request.writeInt(INVOKE_ID_ADD_EXTERNAL_SOURCE_FD);
		request.writeFileDescriptor(fd);
		@@ -1798,6 +1809,10 @@ public class MediaPlayer
		request.writeLong(length);
		request.writeString(mimeType);
		invoke(request, reply);
		} finally {
		request.recycle();
		reply.recycle();
		}
		}

		/**
		@@ -1854,10 +1869,15 @@ public class MediaPlayer
		throws IllegalStateException {
		Parcel request = Parcel.obtain();
		Parcel reply = Parcel.obtain();
		try {
		request.writeInterfaceToken(IMEDIA_PLAYER);
		request.writeInt(select? INVOKE_ID_SELECT_TRACK: INVOKE_ID_DESELECT_TRACK);
		request.writeInt(index);
		invoke(request, reply);
		} finally {
		request.recycle();
		reply.recycle();
		}
		}