summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Aurimas Liutikas <aurimas@google.com> 2016-02-26 15:27:31 -0800
committer Aurimas Liutikas <aurimas@google.com> 2016-02-26 15:27:31 -0800
commit7849a3d785b5fc2a990424e90a6872e19e819f26 (patch)
tree5e93141727bd7b1f3f78459f37965618731d7bd1
parent768d81374ba50d215064ca11ed3ca34cf46d087c (diff)
Fix crash when restoring SearchView.
I forgot to include Parcelable.Creator when I added SearchView iconified state saving. Bug: 27357167 Change-Id: Ia96490aa9c12c4042f50ba4b1aeb7422b37a1d4c
-rw-r--r--core/java/android/widget/SearchView.java11
1 files changed, 11 insertions, 0 deletions
diff --git a/core/java/android/widget/SearchView.java b/core/java/android/widget/SearchView.java
index 3796df78ff7f..9a4d69fd4e9a 100644
--- a/core/java/android/widget/SearchView.java
+++ b/core/java/android/widget/SearchView.java
@@ -1358,6 +1358,17 @@ public class SearchView extends LinearLayout implements CollapsibleActionView {
+ Integer.toHexString(System.identityHashCode(this))
+ " isIconified=" + isIconified + "}";
}
+
+ public static final Parcelable.Creator<SavedState> CREATOR =
+ new Parcelable.Creator<SavedState>() {
+ public SavedState createFromParcel(Parcel in) {
+ return new SavedState(in);
+ }
+
+ public SavedState[] newArray(int size) {
+ return new SavedState[size];
+ }
+ };
}
@Override