Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 363cbe5f authored by Alex Klyubin's avatar Alex Klyubin Committed by Android Git Automerger
Browse files

am 132617de: am 7b55b8f0: am c77c14c2: Merge "Make MediaPlayer fail fast on... 

am 132617de: am 7b55b8f0: am c77c14c2: Merge "Make MediaPlayer fail fast on UnknownServiceException."

* commit '132617de':
  Make MediaPlayer fail fast on UnknownServiceException.
parents f1fb3976 132617de

media/java/android/media/MediaHTTPConnection.java

+5 −1
Original line number Diff line number Diff line
@@ -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,6 +338,9 @@ public class MediaHTTPConnection extends IMediaHTTPConnection.Stub { 
        } catch (NoRouteToHostException e) {

            Log.w(TAG, "readAt " + offset + " / " + size + " => " + e);

            return MEDIA_ERROR_UNSUPPORTED;

        } 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");