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

Merge "Managed profile lock timeout"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-12-21 13:37:36 +00:00
committed by Android (Google) Code Review
parent 330551779d 8e02f0e7e7
commit de70dcf282
6 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java
View File

@@ -88,8 +88,7 @@ public class TimeoutPreferenceControllerTest {
final int profileUserId = UserHandle.myUserId();
final long timeout = 10000;
when(mUserManager.getProfiles(profileUserId)).thenReturn(Collections.emptyList());
ShadowDevicePolicyManagerWrapper
.setMaximumTimeToLockForUserAndProfiles(profileUserId, timeout);
ShadowDevicePolicyManagerWrapper.setMaximumTimeToLock(profileUserId, timeout);
mController.updateState(mPreference);
verify(mPreference).removeUnusableTimeouts(timeout, null);

3
tests/robotests/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceControllerTest.java
View File

@@ -129,8 +129,7 @@ public class LockAfterTimeoutPreferenceControllerTest {
when(mPreference.getEntryValues()).thenReturn(new CharSequence[] {"10000"} );
Settings.System.putInt(mContext.getContentResolver(), SCREEN_OFF_TIMEOUT, displayTimeout);
ShadowDevicePolicyManagerWrapper
.setMaximumTimeToLockForUserAndProfiles(userId, adminTimeout);
ShadowDevicePolicyManagerWrapper.setMaximumTimeToLock(userId, adminTimeout);
mController.updateState((Preference) mPreference);

5
tests/robotests/src/com/android/settings/testutils/shadow/ShadowDevicePolicyManagerWrapper.java
View File

@@ -47,7 +47,7 @@ public class ShadowDevicePolicyManagerWrapper {
}
@Implementation
public long getMaximumTimeToLockForUserAndProfiles(@UserIdInt int userHandle) {
public long getMaximumTimeToLock(ComponentName admin, @UserIdInt int userHandle) {
return profileTimeouts.getOrDefault(userHandle, 0L);
}
@@ -59,8 +59,7 @@ public class ShadowDevicePolicyManagerWrapper {
ShadowDevicePolicyManagerWrapper.deviceOwnerUserId = deviceOwnerUserId;
}
public static void setMaximumTimeToLockForUserAndProfiles(
@UserIdInt int userHandle, Long timeout) {
public static void setMaximumTimeToLock(@UserIdInt int userHandle, Long timeout) {
profileTimeouts.put(userHandle, timeout);
}
}