am 2be38ba7: am dddef157: Merge "Fix bug: allow users to select "none" for lockscreen widget" into jb-mr1-dev

* commit '2be38ba7c1af98f2a4d5de7175bd62ca4a559a35':
  Fix bug: allow users to select "none" for lockscreen widget
This commit is contained in:
Michael Jurka
2012-09-18 17:16:33 -07:00
committed by Android Git Automerger

View File

@@ -593,9 +593,8 @@ public class SecuritySettings extends SettingsPreferenceFragment
// If we selected "none", delete the allocated id
AppWidgetHost.deleteAppWidgetIdForSystem(appWidgetId);
data.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, -1);
} else {
onActivityResult(REQUEST_CREATE_APPWIDGET, Activity.RESULT_OK, data);
}
onActivityResult(REQUEST_CREATE_APPWIDGET, Activity.RESULT_OK, data);
}
} else if (
requestCode == REQUEST_CREATE_APPWIDGET && resultCode == Activity.RESULT_OK) {