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

Commit d0267d5f authored by Yu-Han Yang's avatar Yu-Han Yang Committed by Android (Google) Code Review
Browse files

Merge "Add showSystem to RecentLocationAccess (Settings)" into sc-dev

parents 18ae34ec f7513d98

src/com/android/settings/location/RecentLocationAccessPreferenceController.java

+2 −1
Original line number Diff line number Diff line
@@ -85,7 +85,8 @@ public class RecentLocationAccessPreferenceController extends LocationBasePrefer 
        final Context prefContext = mCategoryRecentLocationRequests.getContext();

        final List<RecentLocationAccesses.Access> recentLocationAccesses = new ArrayList<>();

        final UserManager userManager = UserManager.get(mContext);

        for (RecentLocationAccesses.Access access : mRecentLocationApps.getAppListSorted()) {

        for (RecentLocationAccesses.Access access : mRecentLocationApps.getAppListSorted(

                /* showSystemApps= */ false)) {

            if (isRequestMatchesProfileType(userManager, access, mType)) {

                recentLocationAccesses.add(access);

            }

tests/robotests/src/com/android/settings/location/RecentLocationAccessPreferenceControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ public class RecentLocationAccessPreferenceControllerTest { 
    @Test

    @Ignore

    public void updateState_whenAppListIsEmpty_shouldDisplayTitleTextAndDetailsText() {

        doReturn(new ArrayList<>()).when(mRecentLocationApps).getAppListSorted();

        doReturn(new ArrayList<>()).when(mRecentLocationApps).getAppListSorted(false);

        mController.displayPreference(mScreen);

        mController.updateState(mLayoutPreference);