| commit | 5cda3aefd995dc873fb93aa4b829b33b0a040d48 | [log] [tgz] |
|---|---|---|
| author | yuemingw <yuemingw@google.com> | Mon Jan 15 10:26:19 2018 +0000 |
| committer | yuemingw <yuemingw@google.com> | Mon Jan 15 12:48:58 2018 +0000 |
| tree | e43846a11974f0a2e8e593ab631b01ef76e85447 | |
| parent | a178144906fa7e2241715779f866d22b8b92a250 [diff] [blame] |
Add DISALLOW_CONFIG_SCREEN_TIMEOUT. Bug: 67675734 Test: cts test will be added in b/67675743. Change-Id: I75df384acdfe4cb9c259f68ff78214c4fad6410c
diff --git a/services/core/java/com/android/server/pm/UserRestrictionsUtils.java b/services/core/java/com/android/server/pm/UserRestrictionsUtils.java index 50690cb..8dd7105 100644 --- a/services/core/java/com/android/server/pm/UserRestrictionsUtils.java +++ b/services/core/java/com/android/server/pm/UserRestrictionsUtils.java
@@ -119,7 +119,8 @@ UserManager.DISALLOW_AIRPLANE_MODE, UserManager.DISALLOW_CONFIG_BRIGHTNESS, UserManager.DISALLOW_SHARE_INTO_MANAGED_PROFILE, - UserManager.DISALLOW_AMBIENT_DISPLAY + UserManager.DISALLOW_AMBIENT_DISPLAY, + UserManager.DISALLOW_CONFIG_SCREEN_TIMEOUT }); /**