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

Managed profile lock timeout

Browse Source 
Test: make ROBOTEST_FILTER=TimeoutPreferenceControllerTest RunSettingsRoboTests
Test: make ROBOTEST_FILTER=LockAfterTimeoutPreferenceControllerTest RunSettingsRoboTests
Bug: 63908311
Change-Id: I7236ec4ca37353703145c3e75d508101ecc6ca80
This commit is contained in:
Pavel Grafov
2016-12-06 15:54:50 +00:00
parent 3abedefd38
commit 8e02f0e7e7
6 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/display/TimeoutPreferenceController.java
View File

@@ -65,7 +65,7 @@ public class TimeoutPreferenceController extends AbstractPreferenceController im
final RestrictedLockUtils.EnforcedAdmin admin = final RestrictedLockUtils.EnforcedAdmin admin =
RestrictedLockUtils.checkIfMaximumTimeToLockIsSet(mContext); RestrictedLockUtils.checkIfMaximumTimeToLockIsSet(mContext);
final long maxTimeout = final long maxTimeout =
dpm.getMaximumTimeToLockForUserAndProfiles(UserHandle.myUserId()); dpm.getMaximumTimeToLock(null /* admin */, UserHandle.myUserId());
timeoutListPreference.removeUnusableTimeouts(maxTimeout, admin); timeoutListPreference.removeUnusableTimeouts(maxTimeout, admin);
} }
updateTimeoutPreferenceDescription(timeoutListPreference, currentTimeout); updateTimeoutPreferenceDescription(timeoutListPreference, currentTimeout);

4
src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java
View File

@@ -107,8 +107,8 @@ public class LockAfterTimeoutPreferenceController extends AbstractPreferenceCont
if (mDPM != null) { if (mDPM != null) {
final RestrictedLockUtils.EnforcedAdmin admin = final RestrictedLockUtils.EnforcedAdmin admin =
RestrictedLockUtils.checkIfMaximumTimeToLockIsSet(mContext); RestrictedLockUtils.checkIfMaximumTimeToLockIsSet(mContext);
final long adminTimeout = mDPM final long adminTimeout =
.getMaximumTimeToLockForUserAndProfiles(UserHandle.myUserId()); mDPM.getMaximumTimeToLock(null /* admin */, UserHandle.myUserId());
final long displayTimeout = Math.max(0, final long displayTimeout = Math.max(0,
Settings.System.getInt(mContext.getContentResolver(), SCREEN_OFF_TIMEOUT, 0)); Settings.System.getInt(mContext.getContentResolver(), SCREEN_OFF_TIMEOUT, 0));
// This setting is a slave to display timeout when a device policy is enforced. // This setting is a slave to display timeout when a device policy is enforced.

4
src/com/android/settings/wrapper/DevicePolicyManagerWrapper.java
View File

@@ -223,7 +223,7 @@ public class DevicePolicyManagerWrapper {
* *
* @see DevicePolicyManager#getMaximumTimeToLock(ComponentName, int) * @see DevicePolicyManager#getMaximumTimeToLock(ComponentName, int)
*/ */
public long getMaximumTimeToLockForUserAndProfiles(@UserIdInt int userHandle) { public long getMaximumTimeToLock(@Nullable ComponentName admin, @UserIdInt int userHandle) {
return mDpm.getMaximumTimeToLockForUserAndProfiles(userHandle); return mDpm.getMaximumTimeToLock(admin, userHandle);
} }
} }

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 int profileUserId = UserHandle.myUserId();
final long timeout = 10000; final long timeout = 10000;
when(mUserManager.getProfiles(profileUserId)).thenReturn(Collections.emptyList()); when(mUserManager.getProfiles(profileUserId)).thenReturn(Collections.emptyList());
ShadowDevicePolicyManagerWrapper ShadowDevicePolicyManagerWrapper.setMaximumTimeToLock(profileUserId, timeout);
.setMaximumTimeToLockForUserAndProfiles(profileUserId, timeout);
mController.updateState(mPreference); mController.updateState(mPreference);
verify(mPreference).removeUnusableTimeouts(timeout, null); 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"} ); when(mPreference.getEntryValues()).thenReturn(new CharSequence[] {"10000"} );
Settings.System.putInt(mContext.getContentResolver(), SCREEN_OFF_TIMEOUT, displayTimeout); Settings.System.putInt(mContext.getContentResolver(), SCREEN_OFF_TIMEOUT, displayTimeout);
ShadowDevicePolicyManagerWrapper ShadowDevicePolicyManagerWrapper.setMaximumTimeToLock(userId, adminTimeout);
.setMaximumTimeToLockForUserAndProfiles(userId, adminTimeout);
mController.updateState((Preference) mPreference); 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 @Implementation
public long getMaximumTimeToLockForUserAndProfiles(@UserIdInt int userHandle) { public long getMaximumTimeToLock(ComponentName admin, @UserIdInt int userHandle) {
return profileTimeouts.getOrDefault(userHandle, 0L); return profileTimeouts.getOrDefault(userHandle, 0L);
} }
@@ -59,8 +59,7 @@ public class ShadowDevicePolicyManagerWrapper {
ShadowDevicePolicyManagerWrapper.deviceOwnerUserId = deviceOwnerUserId; ShadowDevicePolicyManagerWrapper.deviceOwnerUserId = deviceOwnerUserId;
} }
public static void setMaximumTimeToLockForUserAndProfiles( public static void setMaximumTimeToLock(@UserIdInt int userHandle, Long timeout) {
@UserIdInt int userHandle, Long timeout) {
profileTimeouts.put(userHandle, timeout); profileTimeouts.put(userHandle, timeout);
} }
} }