Merge "Add showSystem to RecentLocationAccess (Settings)" into sc-dev
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
@@ -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);
|
||||
|
||||
|
Reference in New Issue
Block a user