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

Merge "Fix race condition in MediaHTTPConnection" into pi-dev

Browse Source 
am: d7c87b74d9

Change-Id: I65de507c2b98b81a25141994baba38831aea9142
This commit is contained in:
Marco Nelissen
2018-06-20 15:28:32 -07:00
committed by android-build-merger
parent e6ac04e010 d7c87b74d9
commit 7a72844fd5
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
media/java/android/media/MediaHTTPConnection.java
View File

@@ -323,8 +323,10 @@ public class MediaHTTPConnection extends IMediaHTTPConnection.Stub {
StrictMode.setThreadPolicy(policy);
try {
if (offset != mCurrentOffset) {
seekTo(offset);
synchronized(this) {
if (offset != mCurrentOffset) {
seekTo(offset);
}
}
int n = mInputStream.read(data, 0, size);
@@ -366,7 +368,7 @@ public class MediaHTTPConnection extends IMediaHTTPConnection.Stub {
}
@Override
public long getSize() {
public synchronized long getSize() {
if (mConnection == null) {
try {
seekTo(0);
@@ -379,7 +381,7 @@ public class MediaHTTPConnection extends IMediaHTTPConnection.Stub {
}
@Override
public String getMIMEType() {
public synchronized String getMIMEType() {
if (mConnection == null) {
try {
seekTo(0);