Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b2ad857 authored by Adam Cohen's avatar Adam Cohen Committed by Android Git Automerger
Browse files

am 12a7f76c: Merge "Fix system server crash when uninstalling paid LS widget... 

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

* commit '12a7f76c':
  Fix system server crash when uninstalling paid LS widget that has been added (issue 8647398)
parents dd240d9a 12a7f76c

policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java

+7 −3
Original line number Diff line number Diff line
@@ -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));

    }