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

Commit 1c25a21f authored by Oscar Rydhé's avatar Oscar Rydhé Committed by Henrik Baard
Browse files

Fallback to fallbackring if ringtone can't be played. 

If the specified ringtone file exists but cannot be played
the Ringtone will try to play the ringtone in a remote player.
But since the file is corrupt it will not be played in the
remote player either.
According to the documentation it should attempt to
fallback on another sound. This commit will do that.

Change-Id: I0216d61ca874eef0f168ad4d5bfb07491e01e654
parent e4163e96

media/java/android/media/Ringtone.java

+45 −2
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ package android.media; 


import android.content.ContentResolver;

import android.content.Context;

import android.content.res.AssetFileDescriptor;

import android.content.res.Resources.NotFoundException;

import android.database.Cursor;

import android.net.Uri;

import android.os.Binder;
@@ -229,12 +231,16 @@ public class Ringtone { 
            try {

                mRemotePlayer.play(mRemoteToken, canonicalUri, mStreamType);

            } catch (RemoteException e) {

                if (!playFallbackRingtone()) {

                    Log.w(TAG, "Problem playing ringtone: " + e);

                }

            }

        } else {

            if (!playFallbackRingtone()) {

                Log.w(TAG, "Neither local nor remote playback available");

            }

        }

    }



    /**

     * Stops a playing ringtone.
@@ -280,6 +286,43 @@ public class Ringtone { 
        }

    }



    private boolean playFallbackRingtone() {

        if (mAudioManager.getStreamVolume(mStreamType) != 0) {

            int ringtoneType = RingtoneManager.getDefaultType(mUri);

            if (ringtoneType != -1 &&

                    RingtoneManager.getActualDefaultRingtoneUri(mContext, ringtoneType) != null) {

                // Default ringtone, try fallback ringtone.

                try {

                    AssetFileDescriptor afd = mContext.getResources().openRawResourceFd(

                            com.android.internal.R.raw.fallbackring);

                    if (afd != null) {

                        mLocalPlayer = new MediaPlayer();

                        if (afd.getDeclaredLength() < 0) {

                            mLocalPlayer.setDataSource(afd.getFileDescriptor());

                        } else {

                            mLocalPlayer.setDataSource(afd.getFileDescriptor(),

                                    afd.getStartOffset(),

                                    afd.getDeclaredLength());

                        }

                        mLocalPlayer.setAudioStreamType(mStreamType);

                        mLocalPlayer.prepare();

                        mLocalPlayer.start();

                        afd.close();

                        return true;

                    } else {

                        Log.e(TAG, "Could not load fallback ringtone");

                    }

                } catch (IOException ioe) {

                    destroyLocalPlayer();

                    Log.e(TAG, "Failed to open fallback ringtone");

                } catch (NotFoundException nfe) {

                    Log.e(TAG, "Fallback ringtone does not exist");

                }

            }

        }

        return false;

    }



    void setTitle(String title) {

        mTitle = title;

    }