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

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

@@ -254,19 +254,21 @@ public class SecuritySettings extends SettingsPreferenceFragment
} }
mUserSelectedWidget = root.findPreference(KEY_CHOOSE_USER_SELECTED_LOCKSCREEN_WIDGET); mUserSelectedWidget = root.findPreference(KEY_CHOOSE_USER_SELECTED_LOCKSCREEN_WIDGET);
AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(getActivity()); if (mUserSelectedWidget != null) {
int appWidgetId = -1; AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(getActivity());
String appWidgetIdString = Settings.Secure.getString( int appWidgetId = -1;
getContentResolver(), Settings.Secure.LOCK_SCREEN_USER_SELECTED_APPWIDGET_ID); String appWidgetIdString = Settings.Secure.getString(
if (appWidgetIdString != null) {; getContentResolver(), Settings.Secure.LOCK_SCREEN_USER_SELECTED_APPWIDGET_ID);
appWidgetId = (int) Integer.decode(appWidgetIdString); if (appWidgetIdString != null) {;
} appWidgetId = (int) Integer.decode(appWidgetIdString);
if (appWidgetId == -1) { }
mUserSelectedWidget.setSummary(getResources().getString(R.string.widget_none)); if (appWidgetId == -1) {
} else { mUserSelectedWidget.setSummary(getResources().getString(R.string.widget_none));
AppWidgetProviderInfo appWidget = appWidgetManager.getAppWidgetInfo(appWidgetId); } else {
if (appWidget != null) { AppWidgetProviderInfo appWidget = appWidgetManager.getAppWidgetInfo(appWidgetId);
mUserSelectedWidget.setSummary(appWidget.label); if (appWidget != null) {
mUserSelectedWidget.setSummary(appWidget.label);
}
} }
} }