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

Merge "Disable UI in Settings app when DISALLOW_CONFIG_LOCATION_MODE is set."

Browse Source
This commit is contained in:
Yueming Wang
2018-01-18 10:26:57 +00:00
committed by Android (Google) Code Review
parent 46a1cb747c 754ca51842
commit 66f9f64454
2 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tests/robotests/src/com/android/settings/location/LocationEnablerTest.java
View File

@@ -209,6 +209,23 @@ public class LocationEnablerTest {
assertThat(mEnabler.isManagedProfileRestrictedByBase()).isTrue();
}
@Test
public void setRestriction_getShareLocationEnforcedAdmin_shouldReturnEnforcedAdmin() {
int userId = UserHandle.myUserId();
List<UserManager.EnforcingUser> enforcingUsers = new ArrayList<>();
// Add two enforcing users so that RestrictedLockUtils.checkIfRestrictionEnforced returns
// non-null.
enforcingUsers.add(new UserManager.EnforcingUser(userId,
UserManager.RESTRICTION_SOURCE_DEVICE_OWNER));
enforcingUsers.add(new UserManager.EnforcingUser(userId,
UserManager.RESTRICTION_SOURCE_PROFILE_OWNER));
when(mUserManager.getUserRestrictionSources(
UserManager.DISALLOW_CONFIG_LOCATION_MODE, UserHandle.of(userId)))
.thenReturn(enforcingUsers);
assertThat(mEnabler.getShareLocationEnforcedAdmin(userId) != null).isTrue();
}
private void mockManagedProfile() {
final List<UserHandle> userProfiles = new ArrayList<>();
final UserHandle userHandle = mock(UserHandle.class);
@@ -223,4 +240,6 @@ public class LocationEnablerTest {
private static ArgumentMatcher<Intent> actionMatches(String expected) {
return intent -> TextUtils.equals(expected, intent.getAction());
}
}