PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13732560

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia69d0da674cd6e5ba2331cf6a593366747e5d4e4
This commit is contained in:
Yu-Han Yang
2021-03-03 21:41:50 +00:00
committed by Automerger Merge Worker
parent 419834be48 d0267d5f8d
commit ec189cc0da
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/location/RecentLocationAccessPreferenceController.java
View File

@@ -85,7 +85,8 @@ public class RecentLocationAccessPreferenceController extends LocationBasePrefer
final Context prefContext = mCategoryRecentLocationRequests.getContext(); final Context prefContext = mCategoryRecentLocationRequests.getContext();
final List<RecentLocationAccesses.Access> recentLocationAccesses = new ArrayList<>(); final List<RecentLocationAccesses.Access> recentLocationAccesses = new ArrayList<>();
final UserManager userManager = UserManager.get(mContext); 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)) { if (isRequestMatchesProfileType(userManager, access, mType)) {
recentLocationAccesses.add(access); recentLocationAccesses.add(access);
} }

2
tests/robotests/src/com/android/settings/location/RecentLocationAccessPreferenceControllerTest.java
View File

@@ -98,7 +98,7 @@ public class RecentLocationAccessPreferenceControllerTest {
@Test @Test
@Ignore @Ignore
public void updateState_whenAppListIsEmpty_shouldDisplayTitleTextAndDetailsText() { public void updateState_whenAppListIsEmpty_shouldDisplayTitleTextAndDetailsText() {
doReturn(new ArrayList<>()).when(mRecentLocationApps).getAppListSorted(); doReturn(new ArrayList<>()).when(mRecentLocationApps).getAppListSorted(false);
mController.displayPreference(mScreen); mController.displayPreference(mScreen);
mController.updateState(mLayoutPreference); mController.updateState(mLayoutPreference);