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

Commit 89d98d34 authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by android-build-merger
Browse files

Merge "Not specify return val of View#onSaveInstanceState" into oc-dev 

am: 1454afce

Change-Id: I070b96a2220c88e40b2d274ca03f5ea6fca04396
parents f0cf3a95 1454afce

core/java/android/view/View.java

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