Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36cce830 authored by Ricky Wai's avatar Ricky Wai
Browse files

Fix work profile screen timeout policy 

Settings screen should apply both primary and managed maximum
timeout policy, even separate profile challenge is enabled.

Bug: 27493348
Change-Id: I09e815d6c6ae6ecd554316cfac82daf0ad0b0cdf
parent 751de372

src/com/android/settings/DevelopmentSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -566,7 +566,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment 
            return;

        }



        if (mDpm.getMaximumTimeToLock(null) > 0) {

        if (mDpm.getMaximumTimeToLockForUserAndProfiles(UserHandle.myUserId()) > 0) {

            // A DeviceAdmin has specified a maximum time until the device

            // will lock...  in this case we can't allow the user to turn

            // on "stay awake when plugged in" because that would defeat the

src/com/android/settings/DisplaySettings.java

+3 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.hardware.SensorManager; 
import android.os.Build;

import android.os.Bundle;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.provider.SearchIndexableResource;

import android.provider.Settings;

import android.support.v14.preference.SwitchPreference;
@@ -302,7 +303,8 @@ public class DisplaySettings extends SettingsPreferenceFragment implements 
        if (dpm != null) {

            final EnforcedAdmin admin = RestrictedLockUtils.checkIfMaximumTimeToLockIsSet(

                    getActivity());

            final long maxTimeout = dpm.getMaximumTimeToLock(null);

            final long maxTimeout = dpm

                    .getMaximumTimeToLockForUserAndProfiles(UserHandle.myUserId());

            mScreenTimeoutPreference.removeUnusableTimeouts(maxTimeout, admin);

        }

        updateTimeoutPreferenceDescription(currentTimeout);

src/com/android/settings/SecuritySettings.java

+2 −1
Original line number Diff line number Diff line
@@ -1116,7 +1116,8 @@ public class SecuritySettings extends SettingsPreferenceFragment 
            if (mDPM != null) {

                final EnforcedAdmin admin = RestrictedLockUtils.checkIfMaximumTimeToLockIsSet(

                        getActivity());

                final long adminTimeout = mDPM.getMaximumTimeToLock(null);

                final long adminTimeout = mDPM

                        .getMaximumTimeToLockForUserAndProfiles(UserHandle.myUserId());

                final long displayTimeout = Math.max(0,

                        Settings.System.getInt(getContentResolver(), SCREEN_OFF_TIMEOUT, 0));

                // This setting is a slave to display timeout when a device policy is enforced.