diff options
| author | 2017-05-12 20:27:57 +0000 | |
|---|---|---|
| committer | 2017-05-12 20:27:57 +0000 | |
| commit | 15a028c9292a173f8e3b0fdc85746a4dad2036a9 (patch) | |
| tree | 46ec175ea021724b5dfc462069d28186497aa5f1 | |
| parent | 406abd27f137553258531838bc4beba2f4b604ad (diff) | |
| parent | 89d98d34cb0e19ad74d7a009ffc7cf127989d992 (diff) | |
Merge "Not specify return val of View#onSaveInstanceState" into oc-dev am: 1454afce82
am: 89d98d34cb
Change-Id: I93d3cbb6e0b6e7bbc7a535c0ebf437c16319075f
| -rw-r--r-- | core/java/android/view/View.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index cea3263f3c72..64e82639bf29 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -17306,15 +17306,14 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * item in a list view. * * @return Returns a Parcelable object containing the view's current dynamic - * state, or null if there is nothing interesting to save. The - * default implementation returns null. + * state, or null if there is nothing interesting to save. * @see #onRestoreInstanceState(android.os.Parcelable) * @see #saveHierarchyState(android.util.SparseArray) * @see #dispatchSaveInstanceState(android.util.SparseArray) * @see #setSaveEnabled(boolean) */ @CallSuper - protected Parcelable onSaveInstanceState() { + @Nullable protected Parcelable onSaveInstanceState() { mPrivateFlags |= PFLAG_SAVE_STATE_CALLED; if (mStartActivityRequestWho != null || isAutofilled() || mAccessibilityViewId > LAST_APP_ACCESSIBILITY_ID) { |