From f7513d982166d06713aa0c813ceeb3105579c24e Mon Sep 17 00:00:00 2001 From: Yu-Han Yang Date: Tue, 2 Mar 2021 14:01:28 -0800 Subject: [PATCH] Add showSystem to RecentLocationAccess (Settings) Bug: 180533061 Test: on device Change-Id: Ie232bc84d7875897316e978ed3deac9656ebec5f --- .../location/RecentLocationAccessPreferenceController.java | 3 ++- .../location/RecentLocationAccessPreferenceControllerTest.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/location/RecentLocationAccessPreferenceController.java b/src/com/android/settings/location/RecentLocationAccessPreferenceController.java index 245118d31fb..f4ef0ebc1e8 100644 --- a/src/com/android/settings/location/RecentLocationAccessPreferenceController.java +++ b/src/com/android/settings/location/RecentLocationAccessPreferenceController.java @@ -85,7 +85,8 @@ public class RecentLocationAccessPreferenceController extends LocationBasePrefer final Context prefContext = mCategoryRecentLocationRequests.getContext(); final List 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); } diff --git a/tests/robotests/src/com/android/settings/location/RecentLocationAccessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/RecentLocationAccessPreferenceControllerTest.java index 5feee6002e0..32c86276559 100644 --- a/tests/robotests/src/com/android/settings/location/RecentLocationAccessPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/RecentLocationAccessPreferenceControllerTest.java @@ -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);