Merge changes I22d799f8,I1bc14e7a into nyc-dev

* changes: Guard against crash in dev options Switch to whitelist for animations
2016-03-28 14:14:01 +00:00
parent 2d17f93122 aa864953b7
commit 2de6a287ca
7 changed files with 16 additions and 8 deletions
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -209,14 +209,6 @@ public class SecuritySettings extends SettingsPreferenceFragment
        return resid;
    }

-    @Override
-    public void setPreferenceScreen(PreferenceScreen preferenceScreen) {
-        if (!preferenceScreen.isAttached()) {
-            preferenceScreen.setShouldUseGeneratedIds(false);
-        }
-        super.setPreferenceScreen(preferenceScreen);
-    }
-
    /**
     * Important!
     *