Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix: Missed parcel recycling in MediaPlayer." into jb-dev

Browse Source
This commit is contained in:
James Dong
2012-05-08 18:29:44 -07:00
committed by Android (Google) Code Review
parent 2aaa6bbd53 be0ea968bf
commit 3b5fdf510b
1 changed files with 39 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
media/java/android/media/MediaPlayer.java
View File

@@ -743,9 +743,14 @@ public class MediaPlayer
}
Parcel request = Parcel.obtain();
Parcel reply = Parcel.obtain();
request.writeInterfaceToken(IMEDIA_PLAYER);
request.writeInt(INVOKE_ID_SET_VIDEO_SCALE_MODE);
invoke(request, reply);
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();
request.writeInterfaceToken(IMEDIA_PLAYER);
request.writeInt(INVOKE_ID_GET_TRACK_INFO);
invoke(request, reply);
TrackInfo trackInfo[] = reply.createTypedArray(TrackInfo.CREATOR);
return trackInfo;
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,13 +1801,18 @@ public class MediaPlayer
Parcel request = Parcel.obtain();
Parcel reply = Parcel.obtain();
request.writeInterfaceToken(IMEDIA_PLAYER);
request.writeInt(INVOKE_ID_ADD_EXTERNAL_SOURCE_FD);
request.writeFileDescriptor(fd);
request.writeLong(offset);
request.writeLong(length);
request.writeString(mimeType);
invoke(request, reply);
try {
request.writeInterfaceToken(IMEDIA_PLAYER);
request.writeInt(INVOKE_ID_ADD_EXTERNAL_SOURCE_FD);
request.writeFileDescriptor(fd);
request.writeLong(offset);
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();
request.writeInterfaceToken(IMEDIA_PLAYER);
request.writeInt(select? INVOKE_ID_SELECT_TRACK: INVOKE_ID_DESELECT_TRACK);
request.writeInt(index);
invoke(request, reply);
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();
}
}