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

Commit 37a8e0e0 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

am f14e4435: am 0fa2a56c: am 71780e79: Merge "Better logging of MediaPlayer... 

am f14e4435: am 0fa2a56c: am 71780e79: Merge "Better logging of MediaPlayer failure reason." into mnc-dev

* commit 'f14e4435':
  Better logging of MediaPlayer failure reason.
parents 498985e0 f14e4435

media/java/android/media/MediaPlayer.java

+2 −4
Original line number Original line Diff line number Diff line
@@ -1017,16 +1017,14 @@ public class MediaPlayer implements SubtitleController.Listener 
                setDataSource(fd.getFileDescriptor(), fd.getStartOffset(), fd.getDeclaredLength());

                setDataSource(fd.getFileDescriptor(), fd.getStartOffset(), fd.getDeclaredLength());

            }

            }

            return;

            return;

        } catch (SecurityException ex) {

        } catch (SecurityException | IOException ex) {

        } catch (IOException ex) {

            Log.w(TAG, "Couldn't open file on client side; trying server side: " + ex);

        } finally {

        } finally {

            if (fd != null) {

            if (fd != null) {

                fd.close();

                fd.close();

            }

            }

        }

        }





        Log.d(TAG, "Couldn't open file on client side, trying server side");



        setDataSource(uri.toString(), headers);

        setDataSource(uri.toString(), headers);

    }

    }