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

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

@@ -65,7 +65,7 @@ public class TimeoutPreferenceController extends AbstractPreferenceController im
final RestrictedLockUtils.EnforcedAdmin admin =
RestrictedLockUtils.checkIfMaximumTimeToLockIsSet(mContext);
final long maxTimeout =
dpm.getMaximumTimeToLockForUserAndProfiles(UserHandle.myUserId());
dpm.getMaximumTimeToLock(null /* admin */, UserHandle.myUserId());
timeoutListPreference.removeUnusableTimeouts(maxTimeout, admin);
}
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) {
final RestrictedLockUtils.EnforcedAdmin admin =
RestrictedLockUtils.checkIfMaximumTimeToLockIsSet(mContext);
final long adminTimeout = mDPM
.getMaximumTimeToLockForUserAndProfiles(UserHandle.myUserId());
final long adminTimeout =
mDPM.getMaximumTimeToLock(null /* admin */, UserHandle.myUserId());
final long displayTimeout = Math.max(0,
Settings.System.getInt(mContext.getContentResolver(), SCREEN_OFF_TIMEOUT, 0));
// 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)
*/
public long getMaximumTimeToLockForUserAndProfiles(@UserIdInt int userHandle) {
return mDpm.getMaximumTimeToLockForUserAndProfiles(userHandle);
public long getMaximumTimeToLock(@Nullable ComponentName admin, @UserIdInt int userHandle) {
return mDpm.getMaximumTimeToLock(admin, userHandle);
}
}