am 12a7f76c: Merge "Fix system server crash when uninstalling paid LS widget that has been added (issue 8647398)" into jb-mr2-dev

* commit '12a7f76c8687053d139d670631e7cef7031f8c48':
  Fix system server crash when uninstalling paid LS widget that has been added (issue 8647398)
This commit is contained in:
Adam Cohen
2013-04-19 13:30:05 -07:00
committed by Android Git Automerger

View File

@@ -1589,7 +1589,13 @@ public class KeyguardHostView extends KeyguardViewBase {
@Override
public void cleanUp() {
// Make sure we let go of all widgets and their package contexts promptly. If we don't do
// this, and the associated application is uninstalled, it can cause a soft reboot.
int count = mAppWidgetContainer.getChildCount();
for (int i = 0; i < count; i++) {
KeyguardWidgetFrame frame = mAppWidgetContainer.getWidgetPageAt(i);
frame.removeAllViews();
}
}
/**
@@ -1609,8 +1615,6 @@ public class KeyguardHostView extends KeyguardViewBase {
return !configDisabled || isTestHarness || fileOverride;
}
public void goToUserSwitcher() {
mAppWidgetContainer.setCurrentPage(getWidgetPosition(R.id.keyguard_multi_user_selector));
}