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

Commit 690694f7 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Change getFragments() to return a List." into oc-dev am: 1b2bedcd am: b71472d2"

parents b8fcbe06 a6ea4e64

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -4772,7 +4772,7 @@ package android.app { 
    method public abstract android.app.FragmentManager.BackStackEntry getBackStackEntryAt(int);

    method public abstract int getBackStackEntryCount();

    method public abstract android.app.Fragment getFragment(android.os.Bundle, java.lang.String);

    method public abstract java.util.Collection<android.app.Fragment> getFragments();

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

    method public abstract android.app.Fragment getPrimaryNavigationFragment();

    method public void invalidateOptionsMenu();

    method public abstract boolean isDestroyed();

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -4932,7 +4932,7 @@ package android.app { 
    method public abstract android.app.FragmentManager.BackStackEntry getBackStackEntryAt(int);

    method public abstract int getBackStackEntryCount();

    method public abstract android.app.Fragment getFragment(android.os.Bundle, java.lang.String);

    method public abstract java.util.Collection<android.app.Fragment> getFragments();

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

    method public abstract android.app.Fragment getPrimaryNavigationFragment();

    method public void invalidateOptionsMenu();

    method public abstract boolean isDestroyed();

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -4784,7 +4784,7 @@ package android.app { 
    method public abstract android.app.FragmentManager.BackStackEntry getBackStackEntryAt(int);

    method public abstract int getBackStackEntryCount();

    method public abstract android.app.Fragment getFragment(android.os.Bundle, java.lang.String);

    method public abstract java.util.Collection<android.app.Fragment> getFragments();

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

    method public abstract android.app.Fragment getPrimaryNavigationFragment();

    method public void invalidateOptionsMenu();

    method public abstract boolean isDestroyed();

core/java/android/app/FragmentManager.java

+8 −5
Original line number Diff line number Diff line
@@ -314,14 +314,17 @@ public abstract class FragmentManager { 
    public abstract Fragment getFragment(Bundle bundle, String key);



    /**

     * Get a collection of all fragments that are currently added to the FragmentManager.

     * Get a list of all fragments that are currently added to the FragmentManager.

     * This may include those that are hidden as well as those that are shown.

     * This will not include any fragments only in the back stack, or fragments that

     * are detached or removed.

     * <p>

     * The order of the fragments in the list is the order in which they were

     * added or attached.

     *

     * @return A collection of all fragments that are added to the FragmentManager.

     * @return A list of all fragments that are added to the FragmentManager.

     */

    public abstract Collection<Fragment> getFragments();

    public abstract List<Fragment> getFragments();



    /**

     * Save the current instance state of the given Fragment.  This can be
@@ -907,12 +910,12 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate 
    }



    @Override

    public Collection<Fragment> getFragments() {

    public List<Fragment> getFragments() {

        if (mAdded == null) {

            return Collections.EMPTY_LIST;

        }

        synchronized (mAdded) {

            return (Collection<Fragment>) mAdded.clone();

            return (List<Fragment>) mAdded.clone();

        }

    }