OSDN Git Service

Fix work profile screen timeout policy
authorRicky Wai <rickywai@google.com>
Fri, 18 Mar 2016 16:26:35 +0000 (16:26 +0000)
committerRicky Wai <rickywai@google.com>
Thu, 7 Apr 2016 16:18:04 +0000 (17:18 +0100)
commit36cce830b9319985b138432b89ea1022acf68785
treee56b85e71b884a9c3df39d95c990c529fb082493
parent751de372750336c2dbc6ed656de84b881ede0858
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
src/com/android/settings/DevelopmentSettings.java
src/com/android/settings/DisplaySettings.java
src/com/android/settings/SecuritySettings.java