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

Commit 12c85c7f authored by Tyler Gunn's avatar Tyler Gunn
Browse files

Catch potential NPE in RingtoneFactory. 

This has been seen intermittently where RingtoneManager is throwing an
NPE while calling getRingtone.
Adding catch blocks to ensure in the worse case we don't crash telecom.
Bug: 178151542
Test: Compile; this is a speculative fix to an intermittent problem.

Change-Id: I88cb4314d65f7b4bfd383bf0e38dda6ff53a7a72
parent c01de52d

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

+12 −3
Original line number Diff line number Diff line
@@ -75,7 +75,12 @@ public class RingtoneFactory { 


        if(ringtoneUri != null && userContext != null) {

            // Ringtone URI is explicitly specified. First, try to create a Ringtone with that.

            ringtone = RingtoneManager.getRingtone(userContext, ringtoneUri, volumeShaperConfig);

            try {

                ringtone = RingtoneManager.getRingtone(userContext, ringtoneUri,

                        volumeShaperConfig);

            } catch (NullPointerException npe) {

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

            }

        }

        if(ringtone == null) {

            // Contact didn't specify ringtone or custom Ringtone creation failed. Get default
@@ -91,8 +96,12 @@ public class RingtoneFactory { 
            if (defaultRingtoneUri == null) {

                return null;

            }

            try {

                ringtone = RingtoneManager.getRingtone(

                        contextToUse, defaultRingtoneUri, volumeShaperConfig);

            } catch (NullPointerException npe) {

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

            }

        }

        if (ringtone != null) {

            ringtone.setAudioAttributes(new AudioAttributes.Builder()