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

Commit c2feecb2 authored by Thomas Stuart's avatar Thomas Stuart
Browse files

catch fatal exception when fetching rintone that doesnt exist 

A user proved it was possible to cause the device to reboot when
the current ringtone file no longer exists but is still the default.
Ideally, if there is an issue fetching the ringtone, this shouldnt
cause the device to reboot and catch any exception that may occur.

bug: 264344702
Test: manual
Change-Id: I0def15a905c4cfd31b51cad910852fac414b6a36
parent f3d6c6d3

src/com/android/server/telecom/RingtoneFactory.java

+10 −10
Original line number Diff line number Diff line
@@ -80,8 +80,8 @@ public class RingtoneFactory { 
            try {

                ringtone = RingtoneManager.getRingtone(

                        userContext, ringtoneUri, volumeShaperConfig, audioAttrs);

            } catch (NullPointerException npe) {

                Log.e(this, npe, "getRingtone: NPE while getting ringtone.");

            } catch (Exception e) {

                Log.e(this, e, "getRingtone: exception while getting ringtone.");

            }

        }

        if (ringtone == null) {
@@ -109,8 +109,8 @@ public class RingtoneFactory { 
            try {

                ringtone = RingtoneManager.getRingtone(

                        contextToUse, defaultRingtoneUri, volumeShaperConfig, audioAttrs);

            } catch (NullPointerException npe) {

                Log.e(this, npe, "getRingtone: NPE while getting ringtone.");

            } catch (Exception e) {

                Log.e(this, e, "getRingtone: exception while getting ringtone.");

            }

        }

        return ringtone;