am b0d22528: am bc7f678c: Merge "Fix crash in Settings > Security" into jb-mr1-dev

* commit 'b0d2252897fcc6a0e80b99a3bf856a4a13ab06b8': Fix crash in Settings > Security
2012-09-17 11:29:24 -07:00
parent 418f4dda9c b0d2252897
commit 999e91559d
1 changed files with 15 additions and 13 deletions
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -254,6 +254,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
        }

        mUserSelectedWidget = root.findPreference(KEY_CHOOSE_USER_SELECTED_LOCKSCREEN_WIDGET);
+        if (mUserSelectedWidget != null) {
            AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(getActivity());
            int appWidgetId = -1;
            String appWidgetIdString = Settings.Secure.getString(
@@ -269,6 +270,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
                    mUserSelectedWidget.setSummary(appWidget.label);
                }
            }
+        }

        return root;
    }