Merge "Catch RingtoneManager#getCursor exceptions - DO NOT MERGE" into ub-deskclock-gatling (9794d446) · Commits · e / os / android_packages_apps_DeskClock

src/com/android/deskclock/RingtonePickerDialogFragment.java

+15 −3

Original line number	Diff line number	Diff line
		@@ -336,7 +336,11 @@ public final class RingtonePickerDialogFragment extends DialogFragment implement

		// Force the ringtone manager to load its ringtones. The cursor will be cached
		// internally by the ringtone manager.
		try {
		ringtoneManager.getCursor();
		} catch (Exception e) {
		LogUtils.e("Error getting Ringtone Manager cursor", e);
		}

		return ringtoneManager;
		}
		@@ -348,7 +352,11 @@ public final class RingtonePickerDialogFragment extends DialogFragment implement
		mRingtoneCursor.close();
		}
		mRingtoneManager = ringtoneManager;
		try {
		mRingtoneCursor = mRingtoneManager.getCursor();
		} catch (Exception e) {
		LogUtils.e("Error getting Ringtone Manager cursor", e);
		}
		}
		super.deliverResult(ringtoneManager);
		}
		@@ -413,7 +421,11 @@ public final class RingtonePickerDialogFragment extends DialogFragment implement
		*/
		public RingtoneAdapter setRingtoneManager(RingtoneManager ringtoneManager) {
		mRingtoneManager = ringtoneManager;
		try {
		mRingtoneCursor = ringtoneManager == null ? null : ringtoneManager.getCursor();
		} catch (Exception e) {
		LogUtils.e("Error getting Ringtone Manager cursor", e);
		}
		notifyDataSetChanged();

		return this;