summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjunjiez <junjiez@codeaurora.org>2016-07-19 11:10:32 +0800
committerAdrian DC <radian.dc@gmail.com>2016-12-03 20:18:33 +0100
commit6bd08c4b797453b31fa49ee6e94b4ca62c993f91 (patch)
treeb6cc8726c5923af7a79cd37887d043bd6d9323b8
parent7e1acf9f689e39b1018212de966057ba1f1afe70 (diff)
downloadandroid_packages_providers_MediaProvider-stable/cm-13.0-ZNH5Y.tar.gz
android_packages_providers_MediaProvider-stable/cm-13.0-ZNH5Y.tar.bz2
android_packages_providers_MediaProvider-stable/cm-13.0-ZNH5Y.zip
MediaProvider: catch data exception to avoid crashstable/cm-13.0-ZNH5Y
catch StaleDataException and IllegalStateException when use ringtonManger to get rington to avoid crash. RM-290 Change-Id: I6db82fd61de5dcb799efdd51c39b0433dcdb60a0 CRs-Fixed: 1042275
-rwxr-xr-x[-rw-r--r--]src/com/android/providers/media/RingtonePickerActivity.java10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/com/android/providers/media/RingtonePickerActivity.java b/src/com/android/providers/media/RingtonePickerActivity.java
index c96a647b..b1c3d15e 100644..100755
--- a/src/com/android/providers/media/RingtonePickerActivity.java
+++ b/src/com/android/providers/media/RingtonePickerActivity.java
@@ -22,6 +22,7 @@ import android.content.pm.PackageManager.NameNotFoundException;
import android.content.res.Resources;
import android.content.res.Resources.Theme;
import android.database.Cursor;
+import android.database.StaleDataException;
import android.media.AudioAttributes;
import android.media.Ringtone;
import android.media.RingtoneManager;
@@ -356,7 +357,14 @@ public final class RingtonePickerActivity extends AlertActivity implements
ringtone = mDefaultRingtone;
mCurrentRingtone = null;
} else {
- ringtone = mRingtoneManager.getRingtone(getRingtoneManagerPosition(mSampleRingtonePos));
+ try {
+ ringtone =mRingtoneManager.getRingtone(
+ getRingtoneManagerPosition(mSampleRingtonePos));
+ } catch (StaleDataException staleDataException) {
+ ringtone = null;
+ } catch (IllegalStateException illegalStateException) {
+ ringtone = null;
+ }
mCurrentRingtone = ringtone;
}