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

Commit 83fa22d8 authored by Zemiao Zhu's avatar Zemiao Zhu
Browse files

Fix potential crash in SearchFragment#dismiss(). 

Bug: 160113706
Test: atest DocumentsUIGoogleTests
Change-Id: I9202dd5b6d26c89919565fec3b4948380f344fd4
parent fa95e257

src/com/android/documentsui/queries/SearchFragment.java

+6 −1
Original line number Original line Diff line number Diff line
@@ -72,7 +72,7 @@ public class SearchFragment extends Fragment{ 




    public static void dismissFragment(FragmentManager fm) {

    public static void dismissFragment(FragmentManager fm) {

        SearchFragment fragment = get(fm);

        SearchFragment fragment = get(fm);

        if (fragment != null) {

        if (fragment != null && fragment.getActivity() != null) {

            fragment.dismiss();

            fragment.dismiss();

        }

        }

    }

    }
@@ -154,6 +154,11 @@ public class SearchFragment extends Fragment{ 
    }

    }





    private void dismiss() {

    private void dismiss() {

        if (getActivity() == null) {

            // Fragment has already been detached from activity.

            return;

        }



        updateDirectoryVisibility(View.VISIBLE);

        updateDirectoryVisibility(View.VISIBLE);





        FragmentTransaction ft = getParentFragmentManager().beginTransaction();

        FragmentTransaction ft = getParentFragmentManager().beginTransaction();