From be606d6d0e9e1567b3cb3fea94bf6cd553831765 Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Thu, 10 Mar 2011 16:49:45 -0800
Subject: [PATCH] Fix possible NPE when Screen settings is launched quickly in
 succession.

Bug: 3368440
Change-Id: Icbcd0474978e20a055ec27f5960e9a4b98f4a68a
---
 src/com/android/settings/DisplaySettings.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index 6cf2b16c42d..68d449516cc 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -76,6 +76,12 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
 
         addPreferencesFromResource(R.xml.display_settings);
 
+        // Fetch this once before attaching a listener for changes.
+        try {
+            mAnimationScales = mWindowManager.getAnimationScales();
+        } catch (RemoteException e) {
+            // Shouldn't happen and not much can be done anyway.
+        }
         mAnimations = (ListPreference) findPreference(KEY_ANIMATIONS);
         mAnimations.setOnPreferenceChangeListener(this);
         mAccelerometer = (CheckBoxPreference) findPreference(KEY_ACCELEROMETER);
@@ -189,6 +195,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
         try {
             mAnimationScales = mWindowManager.getAnimationScales();
         } catch (RemoteException e) {
+            // Shouldn't happen and not much can be done anyway.
         }
         if (mAnimationScales != null) {
             if (mAnimationScales.length >= 1) {