Merge "catch fatal exception when fetching rintone that doesnt exist" (9710b9f8) · Commits · e / os / android_packages_services_Telecomm

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;