Merge "Fix NPE crash in TextToSpeechSettings" into tm-qpr-dev
diff --git a/src/com/android/settings/tts/TextToSpeechSettings.java b/src/com/android/settings/tts/TextToSpeechSettings.java
index 30e9967..6db5710 100644
--- a/src/com/android/settings/tts/TextToSpeechSettings.java
+++ b/src/com/android/settings/tts/TextToSpeechSettings.java
@@ -228,7 +228,9 @@
// them to resize, which results in the recyclerview smoothly animating them at inopportune
// times. Disable the animation so widgets snap to their positions rather than sliding
// around while the user is interacting with it.
- getListView().getItemAnimator().setMoveDuration(0);
+ if (getListView().getItemAnimator() != null) {
+ getListView().getItemAnimator().setMoveDuration(0);
+ }
if (mTts == null || mCurrentDefaultLocale == null) {
return;