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

Commit 7d4134a1 authored by Romain Guy's avatar Romain Guy Committed by Android Git Automerger
Browse files

am 173a25f6: Merge change I0d74deb6 into eclair 

Merge commit '173a25f6' into eclair-mr2

* commit '173a25f6':
  Fix possible NPE in the code that restores widgets' state.
parents be3feda4 173a25f6

core/java/android/appwidget/AppWidgetHostView.java

+2 −1
Original line number Diff line number Diff line
@@ -123,7 +123,8 @@ public class AppWidgetHostView extends FrameLayout { 


    @Override

    protected void dispatchRestoreInstanceState(SparseArray<Parcelable> container) {

        final ParcelableSparseArray jail = (ParcelableSparseArray) container.get(generateId());

        ParcelableSparseArray jail = (ParcelableSparseArray) container.get(generateId());

        if (jail == null) jail = new ParcelableSparseArray();

        super.dispatchRestoreInstanceState(jail);

    }