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

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

Merge changes Ia6640b76,Ia37a8712 

* changes:
  Permit setRetainInstance(true) on nested fragments, framework edition
  FragmentTransaction.commitNow, framework edition
parents 315b0e35 7466be66

api/current.txt

+9 −2
Original line number Diff line number Diff line
@@ -4531,10 +4531,12 @@ package android.app { 
    method public void noteStateNotSaved();

    method public android.view.View onCreateView(android.view.View, java.lang.String, android.content.Context, android.util.AttributeSet);

    method public void reportLoaderStart();

    method public void restoreAllState(android.os.Parcelable, java.util.List<android.app.Fragment>);

    method public deprecated void restoreAllState(android.os.Parcelable, java.util.List<android.app.Fragment>);

    method public void restoreAllState(android.os.Parcelable, android.app.FragmentManagerNonConfig);

    method public void restoreLoaderNonConfig(android.util.ArrayMap<java.lang.String, android.app.LoaderManager>);

    method public android.util.ArrayMap<java.lang.String, android.app.LoaderManager> retainLoaderNonConfig();

    method public java.util.List<android.app.Fragment> retainNonConfig();

    method public android.app.FragmentManagerNonConfig retainNestedNonConfig();

    method public deprecated java.util.List<android.app.Fragment> retainNonConfig();

    method public android.os.Parcelable saveAllState();

  }










@@ -4594,6 +4596,9 @@ package android.app {













    method public abstract void onBackStackChanged();















  }



























  public class FragmentManagerNonConfig {













  }



























  public abstract class FragmentTransaction {















    ctor public FragmentTransaction();















    method public abstract android.app.FragmentTransaction add(android.app.Fragment, java.lang.String);









@@ -4604,6 +4609,8 @@ package android.app {













    method public abstract android.app.FragmentTransaction attach(android.app.Fragment);















    method public abstract int commit();















    method public abstract int commitAllowingStateLoss();













    method public abstract void commitNow();













    method public abstract void commitNowAllowingStateLoss();















    method public abstract android.app.FragmentTransaction detach(android.app.Fragment);















    method public abstract android.app.FragmentTransaction disallowAddToBackStack();















    method public abstract android.app.FragmentTransaction hide(android.app.Fragment);

























api/system-current.txt



+9
−2




























Original line number
Diff line number
Diff line








@@ -4664,10 +4664,12 @@ package android.app {













    method public void noteStateNotSaved();















    method public android.view.View onCreateView(android.view.View, java.lang.String, android.content.Context, android.util.AttributeSet);















    method public void reportLoaderStart();













    method public void restoreAllState(android.os.Parcelable, java.util.List<android.app.Fragment>);













    method public deprecated void restoreAllState(android.os.Parcelable, java.util.List<android.app.Fragment>);













    method public void restoreAllState(android.os.Parcelable, android.app.FragmentManagerNonConfig);















    method public void restoreLoaderNonConfig(android.util.ArrayMap<java.lang.String, android.app.LoaderManager>);















    method public android.util.ArrayMap<java.lang.String, android.app.LoaderManager> retainLoaderNonConfig();













    method public java.util.List<android.app.Fragment> retainNonConfig();













    method public android.app.FragmentManagerNonConfig retainNestedNonConfig();













    method public deprecated java.util.List<android.app.Fragment> retainNonConfig();















    method public android.os.Parcelable saveAllState();















  }
























@@ -4727,6 +4729,9 @@ package android.app {













    method public abstract void onBackStackChanged();















  }



























  public class FragmentManagerNonConfig {













  }



























  public abstract class FragmentTransaction {















    ctor public FragmentTransaction();















    method public abstract android.app.FragmentTransaction add(android.app.Fragment, java.lang.String);









@@ -4737,6 +4742,8 @@ package android.app {













    method public abstract android.app.FragmentTransaction attach(android.app.Fragment);















    method public abstract int commit();















    method public abstract int commitAllowingStateLoss();













    method public abstract void commitNow();













    method public abstract void commitNowAllowingStateLoss();















    method public abstract android.app.FragmentTransaction detach(android.app.Fragment);















    method public abstract android.app.FragmentTransaction disallowAddToBackStack();















    method public abstract android.app.FragmentTransaction hide(android.app.Fragment);

























api/test-current.txt



+9
−2




























Original line number
Diff line number
Diff line








@@ -4531,10 +4531,12 @@ package android.app {













    method public void noteStateNotSaved();















    method public android.view.View onCreateView(android.view.View, java.lang.String, android.content.Context, android.util.AttributeSet);















    method public void reportLoaderStart();













    method public void restoreAllState(android.os.Parcelable, java.util.List<android.app.Fragment>);













    method public deprecated void restoreAllState(android.os.Parcelable, java.util.List<android.app.Fragment>);













    method public void restoreAllState(android.os.Parcelable, android.app.FragmentManagerNonConfig);















    method public void restoreLoaderNonConfig(android.util.ArrayMap<java.lang.String, android.app.LoaderManager>);















    method public android.util.ArrayMap<java.lang.String, android.app.LoaderManager> retainLoaderNonConfig();













    method public java.util.List<android.app.Fragment> retainNonConfig();













    method public android.app.FragmentManagerNonConfig retainNestedNonConfig();













    method public deprecated java.util.List<android.app.Fragment> retainNonConfig();















    method public android.os.Parcelable saveAllState();















  }
























@@ -4594,6 +4596,9 @@ package android.app {













    method public abstract void onBackStackChanged();















  }



























  public class FragmentManagerNonConfig {













  }



























  public abstract class FragmentTransaction {















    ctor public FragmentTransaction();















    method public abstract android.app.FragmentTransaction add(android.app.Fragment, java.lang.String);









@@ -4604,6 +4609,8 @@ package android.app {













    method public abstract android.app.FragmentTransaction attach(android.app.Fragment);















    method public abstract int commit();















    method public abstract int commitAllowingStateLoss();













    method public abstract void commitNow();













    method public abstract void commitNowAllowingStateLoss();















    method public abstract android.app.FragmentTransaction detach(android.app.Fragment);















    method public abstract android.app.FragmentTransaction disallowAddToBackStack();















    method public abstract android.app.FragmentTransaction hide(android.app.Fragment);

























core/java/android/app/Activity.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -753,7 +753,7 @@ public class Activity extends ContextThemeWrapper













    static final class NonConfigurationInstances {















        Object activity;















        HashMap<String, Object> children;













        List<Fragment> fragments;













        FragmentManagerNonConfig fragments;















        ArrayMap<String, LoaderManager> loaders;















        VoiceInteractor voiceInteractor;















    }










@@ -2070,7 +2070,7 @@ public class Activity extends ContextThemeWrapper













    NonConfigurationInstances retainNonConfigurationInstances() {















        Object activity = onRetainNonConfigurationInstance();















        HashMap<String, Object> children = onRetainNonConfigurationChildInstances();













        List<Fragment> fragments = mFragments.retainNonConfig();













        FragmentManagerNonConfig fragments = mFragments.retainNestedNonConfig();















        ArrayMap<String, LoaderManager> loaders = mFragments.retainLoaderNonConfig();















        if (activity == null && children == null && fragments == null && loaders == null















                && mVoiceInteractor == null) {

































core/java/android/app/BackStackRecord.java



+12
−0




























Original line number
Diff line number
Diff line








@@ -667,6 +667,18 @@ final class BackStackRecord extends FragmentTransaction implements













        return commitInternal(true);















    }





























    @Override













    public void commitNow() {













        disallowAddToBackStack();













        mManager.execSingleAction(this, false);













    }



























    @Override













    public void commitNowAllowingStateLoss() {













        disallowAddToBackStack();













        mManager.execSingleAction(this, true);













    }





























    int commitInternal(boolean allowStateLoss) {















        if (mCommitted) {















            throw new IllegalStateException("commit already called");