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

Commit 42180638 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Un-deprecate Activity#onRetainNonConfigurationInstance" into nyc-dev

parents 0b312332 c4df6bc4

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -3442,7 +3442,7 @@ package android.app { 
    method public android.view.View getCurrentFocus();

    method public android.app.FragmentManager getFragmentManager();

    method public android.content.Intent getIntent();

    method public deprecated java.lang.Object getLastNonConfigurationInstance();

    method public java.lang.Object getLastNonConfigurationInstance();

    method public android.view.LayoutInflater getLayoutInflater();

    method public android.app.LoaderManager getLoaderManager();

    method public java.lang.String getLocalClassName();
@@ -3543,7 +3543,7 @@ package android.app { 
    method protected void onRestoreInstanceState(android.os.Bundle);

    method public void onRestoreInstanceState(android.os.Bundle, android.os.PersistableBundle);

    method protected void onResume();

    method public deprecated java.lang.Object onRetainNonConfigurationInstance();

    method public java.lang.Object onRetainNonConfigurationInstance();

    method protected void onSaveInstanceState(android.os.Bundle);

    method public void onSaveInstanceState(android.os.Bundle, android.os.PersistableBundle);

    method public boolean onSearchRequested(android.view.SearchEvent);

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -3557,7 +3557,7 @@ package android.app { 
    method public android.view.View getCurrentFocus();

    method public android.app.FragmentManager getFragmentManager();

    method public android.content.Intent getIntent();

    method public deprecated java.lang.Object getLastNonConfigurationInstance();

    method public java.lang.Object getLastNonConfigurationInstance();

    method public android.view.LayoutInflater getLayoutInflater();

    method public android.app.LoaderManager getLoaderManager();

    method public java.lang.String getLocalClassName();
@@ -3660,7 +3660,7 @@ package android.app { 
    method protected void onRestoreInstanceState(android.os.Bundle);

    method public void onRestoreInstanceState(android.os.Bundle, android.os.PersistableBundle);

    method protected void onResume();

    method public deprecated java.lang.Object onRetainNonConfigurationInstance();

    method public java.lang.Object onRetainNonConfigurationInstance();

    method protected void onSaveInstanceState(android.os.Bundle);

    method public void onSaveInstanceState(android.os.Bundle, android.os.PersistableBundle);

    method public boolean onSearchRequested(android.view.SearchEvent);

api/test-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -3442,7 +3442,7 @@ package android.app { 
    method public android.view.View getCurrentFocus();

    method public android.app.FragmentManager getFragmentManager();

    method public android.content.Intent getIntent();

    method public deprecated java.lang.Object getLastNonConfigurationInstance();

    method public java.lang.Object getLastNonConfigurationInstance();

    method public android.view.LayoutInflater getLayoutInflater();

    method public android.app.LoaderManager getLoaderManager();

    method public java.lang.String getLocalClassName();
@@ -3543,7 +3543,7 @@ package android.app { 
    method protected void onRestoreInstanceState(android.os.Bundle);

    method public void onRestoreInstanceState(android.os.Bundle, android.os.PersistableBundle);

    method protected void onResume();

    method public deprecated java.lang.Object onRetainNonConfigurationInstance();

    method public java.lang.Object onRetainNonConfigurationInstance();

    method protected void onSaveInstanceState(android.os.Bundle);

    method public void onSaveInstanceState(android.os.Bundle, android.os.PersistableBundle);

    method public boolean onSearchRequested(android.view.SearchEvent);

core/java/android/app/Activity.java

+9 −11
Original line number Diff line number Diff line
@@ -1976,15 +1976,13 @@ public class Activity extends ContextThemeWrapper 
     * normal {@link #onSaveInstanceState(Bundle)} mechanism) even if this

     * function returns null.

     *

     * @return Returns the object previously returned by

     * {@link #onRetainNonConfigurationInstance()}.

     *

     * @deprecated Use the new {@link Fragment} API

     * <p><strong>Note:</strong> For most cases you should use the {@link Fragment} API

     * {@link Fragment#setRetainInstance(boolean)} instead; this is also

     * available on older platforms through the Android compatibility package.

     * available on older platforms through the Android support libraries.

     *

     * @return the object previously returned by {@link #onRetainNonConfigurationInstance()}

     */

    @Nullable

    @Deprecated

    public Object getLastNonConfigurationInstance() {

        return mLastNonConfigurationInstances != null

                ? mLastNonConfigurationInstances.activity : null;
@@ -2035,12 +2033,12 @@ public class Activity extends ContextThemeWrapper 
     * guarantee for {@link android.os.AsyncTask#doInBackground} since that is

     * running in a separate thread.)

     *

     * @return Return any Object holding the desired state to propagate to the

     * next activity instance.

     *

     * @deprecated Use the new {@link Fragment} API

     * <p><strong>Note:</strong> For most cases you should use the {@link Fragment} API

     * {@link Fragment#setRetainInstance(boolean)} instead; this is also

     * available on older platforms through the Android compatibility package.

     * available on older platforms through the Android support libraries.

     *

     * @return any Object holding the desired state to propagate to the

     *         next activity instance

     */

    public Object onRetainNonConfigurationInstance() {

        return null;