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

Commit 927605a4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix "always" option in ResolverActivity" into tm-dev am: 926db2d6 am:... 

Merge "Fix "always" option in ResolverActivity" into tm-dev am: 926db2d6 am: 97ac38de am: 09644a6e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17943621



Change-Id: I133aabcbfe48eb8888bc94112a08ffdd39535920
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7e45bd46 09644a6e

core/java/com/android/internal/app/ResolverListAdapter.java

+8 −2
Original line number Diff line number Diff line
@@ -233,8 +233,14 @@ public class ResolverListAdapter extends BaseAdapter { 
        // copied the original unfiltered items to a separate List instance and can now filter

        // the remainder in-place without any further bookkeeping.

        boolean needsCopyOfUnfiltered = (mUnfilteredResolveList == currentResolveList);

        mUnfilteredResolveList = performSecondaryResolveListFiltering(

        List<ResolvedComponentInfo> originalList = performSecondaryResolveListFiltering(

                currentResolveList, needsCopyOfUnfiltered);

        if (originalList != null) {

            // Only need the originalList value if there was a modification (otherwise it's null

            // and shouldn't overwrite mUnfilteredResolveList).

            mUnfilteredResolveList = originalList;

        }





        return finishRebuildingListWithFilteredResults(currentResolveList, doPostProcessing);

    }
@@ -293,7 +299,7 @@ public class ResolverListAdapter extends BaseAdapter { 
     * appearing in the rebuilt-list results, while still considering those items for the "other

     * profile" special-treatment described in {@code rebuildList()}.

     *

     * @return the same (possibly null) List reference as {@code currentResolveList}, if the list is

     * @return the same (possibly null) List reference as {@code currentResolveList} if the list is

     * unmodified as a result of filtering; or, if some item(s) were removed, then either a copy of

     * the original {@code currentResolveList} (if {@code returnCopyOfOriginalListIfModified} is

     * true), or null (otherwise).