Merge "Fix race condition in MediaHTTPConnection" into pi-dev (7a72844f) · Commits · e / os / android_frameworks_base

media/java/android/media/MediaHTTPConnection.java

+6 −4

Original line number	Diff line number	Diff line
		@@ -323,9 +323,11 @@ public class MediaHTTPConnection extends IMediaHTTPConnection.Stub {
		StrictMode.setThreadPolicy(policy);

		try {
		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);