PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'bc7f678cc9334ef9d45a220fd0ef2db9c31019dc':
  Fix crash in Settings > Security
This commit is contained in:
Michael Jurka
2012-09-14 14:13:55 -07:00
committed by Android Git Automerger
parent d477204da5 bc7f678cc9
commit b0d2252897
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/SecuritySettings.java
View File

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