diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-04-20 18:34:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-20 18:34:05 +0000 |
| commit | 7b55b8f0563d540804b14c1643b0adfea19a71b1 (patch) | |
| tree | b125d5ecb3604d49f529ac96546d5cc4a2d474d9 | |
| parent | fea08ccdffdf3d56276f84cf5b01165e6b2bb85f (diff) | |
| parent | c77c14c23d5617b7e4d69dccff890f3b1b55b567 (diff) | |
| download | frameworks_base-7b55b8f0563d540804b14c1643b0adfea19a71b1.zip frameworks_base-7b55b8f0563d540804b14c1643b0adfea19a71b1.tar.gz frameworks_base-7b55b8f0563d540804b14c1643b0adfea19a71b1.tar.bz2 | |
am c77c14c2: Merge "Make MediaPlayer fail fast on UnknownServiceException."
* commit 'c77c14c23d5617b7e4d69dccff890f3b1b55b567':
Make MediaPlayer fail fast on UnknownServiceException.
| -rw-r--r-- | media/java/android/media/MediaHTTPConnection.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/media/java/android/media/MediaHTTPConnection.java b/media/java/android/media/MediaHTTPConnection.java index b2886bb..541d871 100644 --- a/media/java/android/media/MediaHTTPConnection.java +++ b/media/java/android/media/MediaHTTPConnection.java @@ -32,6 +32,7 @@ import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.NoRouteToHostException; import java.net.ProtocolException; +import java.net.UnknownServiceException; import java.util.HashMap; import java.util.Map; @@ -337,7 +338,10 @@ public class MediaHTTPConnection extends IMediaHTTPConnection.Stub { } catch (NoRouteToHostException e) { Log.w(TAG, "readAt " + offset + " / " + size + " => " + e); return MEDIA_ERROR_UNSUPPORTED; - } catch (IOException e) { + } catch (UnknownServiceException e) { + Log.w(TAG, "readAt " + offset + " / " + size + " => " + e); + return MEDIA_ERROR_UNSUPPORTED; + }catch (IOException e) { if (VERBOSE) { Log.d(TAG, "readAt " + offset + " / " + size + " => -1"); } |